dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix macos build

Browse Source
This commit is contained in:
Jonas Kvinge
2018-07-01 22:26:46 +02:00
parent c4e75dea65
commit ada7325a04
51 changed files with 453 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/device/cddalister.cpp
View File

@@ -105,7 +105,7 @@ void CddaLister::UpdateDeviceFreeSpace(const QString&) {}
void CddaLister::Init() {
cdio_init();
#ifdef Q_OS_DARWIN
#ifdef Q_OS_MACOS
if (!cdio_have_driver(DRIVER_OSX)) {
qLog(Error) << "libcdio was compiled without support for OS X!";
}
@@ -121,7 +121,7 @@ void CddaLister::Init() {
if (device_info.isSymLink()) {
device = device_info.symLinkTarget();
}
#ifdef Q_OS_DARWIN
#ifdef Q_OS_MACOS
// Every track is detected as a separate device on Darwin. The raw disk looks like /dev/rdisk1
if (!device.contains(QRegExp("^/dev/rdisk[0-9]$"))) {
continue;

6
src/device/devicemanager.cpp
View File

@@ -68,7 +68,7 @@
# include "cddadevice.h"
#endif
#if defined(Q_OS_DARWIN) and defined(HAVE_LIBMTP)
#if defined(Q_OS_MACOS) and defined(HAVE_LIBMTP)
# include "macdevicelister.h"
#endif
#ifdef HAVE_LIBGPOD
@@ -220,7 +220,7 @@ DeviceManager::DeviceManager(Application *app, QObject *parent)
connected_devices_model_->setSourceModel(this);
// CD devices are detected via the DiskArbitration framework instead on Darwin.
#if defined(HAVE_AUDIOCD) && defined(HAVE_GSTREAMER) && !defined(Q_OS_DARWIN)
#if defined(HAVE_AUDIOCD) && defined(HAVE_GSTREAMER) && !defined(Q_OS_MACOS)
AddLister(new CddaLister);
#endif
#ifdef HAVE_DEVICEKIT
@@ -232,7 +232,7 @@ DeviceManager::DeviceManager(Application *app, QObject *parent)
#ifdef HAVE_GIO
AddLister(new GioLister);
#endif
#if defined(Q_OS_DARWIN) and defined(HAVE_LIBMTP)
#if defined(Q_OS_MACOS) and defined(HAVE_LIBMTP)
AddLister(new MacDeviceLister);
#endif