kopia lustrzana https://gitlab.com/eliggett/wfview
Fix RT/PA builds on MacOs
rodzic
5ef50c9706
commit
079a50980d
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#include <QThread>
|
||||
#include <QMutex>
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
#ifndef Q_OS_LINUX
|
||||
#include "RtAudio.h"
|
||||
#else
|
||||
#include "rtaudio/RtAudio.h"
|
||||
|
|
4
wfmain.h
4
wfmain.h
|
@ -41,7 +41,7 @@
|
|||
#include <memory>
|
||||
|
||||
#include <portaudio.h>
|
||||
#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
|
||||
#endif
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Ładowanie…
Reference in New Issue