diff --git a/rthandler.cpp b/rthandler.cpp index 96229f2..b7438f5 100644 --- a/rthandler.cpp +++ b/rthandler.cpp @@ -20,7 +20,7 @@ rtHandler::~rtHandler() audio->abortStream(); audio->closeStream(); } - catch (RtAudioError& e) { + catch (RtAudioError& e) { qInfo(logAudio()) << "Error closing stream:" << aParams.deviceId << ":" << QString::fromStdString(e.getMessage()); } delete audio; @@ -90,7 +90,7 @@ bool rtHandler::init(audioSetup setup) try { info = audio->getDeviceInfo(aParams.deviceId); } - catch (RtAudioError& e) { + catch (RtAudioError e) { qInfo(logAudio()) << (setup.isinput ? "Input" : "Output") << "Device exception:" << aParams.deviceId << ":" << QString::fromStdString(e.getMessage()); goto errorHandler; } diff --git a/rthandler.h b/rthandler.h index cbbd4b4..c48a2b4 100644 --- a/rthandler.h +++ b/rthandler.h @@ -6,7 +6,7 @@ #include #include -#ifdef Q_OS_WIN +#ifndef Q_OS_LINUX #include "RtAudio.h" #else #include "rtaudio/RtAudio.h" diff --git a/wfmain.h b/wfmain.h index 29bded4..e691258 100644 --- a/wfmain.h +++ b/wfmain.h @@ -41,7 +41,7 @@ #include #include -#ifdef Q_OS_WIN +#ifndef Q_OS_LINUX #include "RtAudio.h" #else #include "rtaudio/RtAudio.h" @@ -914,4 +914,4 @@ Q_DECLARE_METATYPE(rigstate*) #endif // WFMAIN_H -#endif \ No newline at end of file +#endif diff --git a/wfserver.pro b/wfserver.pro index d17f9eb..bbd4fee 100644 --- a/wfserver.pro +++ b/wfserver.pro @@ -41,8 +41,8 @@ win32:DEFINES += __WINDOWS_WASAPI__ #linux:DEFINES += __LINUX_OSS__ linux:DEFINES += __LINUX_PULSE__ macx:DEFINES += __MACOSX_CORE__ -win32:SOURCES += ../rtaudio/RTAudio.cpp -win32:HEADERS += ../rtaudio/RTAUdio.h +!linux:SOURCES += ../rtaudio/RTAudio.cpp +!linux:HEADERS += ../rtaudio/RTAUdio.h !linux:INCLUDEPATH += ../rtaudio linux:LIBS += -lpulse -lpulse-simple -lrtaudio -lpthread diff --git a/wfview.pro b/wfview.pro index ef0e2be..63d0391 100644 --- a/wfview.pro +++ b/wfview.pro @@ -38,9 +38,10 @@ win32:DEFINES += __WINDOWS_WASAPI__ #linux:DEFINES += __LINUX_OSS__ linux:DEFINES += __LINUX_PULSE__ macx:DEFINES += __MACOSX_CORE__ -win32:SOURCES += ../rtaudio/RTAudio.cpp -win32:HEADERS += ../rtaudio/RTAUdio.h +!linux:SOURCES += ../rtaudio/RTAudio.cpp +!linux:HEADERS += ../rtaudio/RTAUdio.h !linux:INCLUDEPATH += ../rtaudio + linux:LIBS += -lpulse -lpulse-simple -lrtaudio -lpthread win32:INCLUDEPATH += ../portaudio/include