Includes, comments and bugfixes

- Fix includes
- Use common regex (Song::kCoverRemoveDisc) for removing Disc/CD from album
- Remove Disc/CD from album when creating hash
- Make imobiledevice support compile
- Fix setting device on windows
This commit is contained in:
Jonas Kvinge
2018-05-01 00:41:33 +02:00
parent fccbd6790c
commit e337b7933b
518 changed files with 7003 additions and 4693 deletions

View File

@@ -18,23 +18,24 @@
*
*/
//#ifdef HAVE_GIO
//#undef signals // Clashes with GIO, and not needed in this file
#include "config.h"
#include <gio/gio.h>
#include <QApplication>
#include <QCoreApplication>
#include <QDir>
#include <QByteArray>
#include <QString>
#include <QtDebug>
#include "core/logging.h"
//namespace {
void ScanGIOModulePath() {
QString gio_module_path;
#if defined(Q_OS_WIN32)
gio_module_path = QCoreApplication::applicationDirPath() + "/gio-modules";
gio_module_path = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + "/gio-modules");
#endif
if (!gio_module_path.isEmpty()) {
@@ -43,6 +44,3 @@ void ScanGIOModulePath() {
g_io_modules_scan_all_in_directory(bytes.data());
}
}
//} // namespace
//#endif // HAVE_GIO