From 6c47e2fa5ae180a5cf896751a80b7e0dd0f38f53 Mon Sep 17 00:00:00 2001 From: M0VSE Date: Sun, 23 May 2021 23:04:35 +0100 Subject: [PATCH] Fixes for linux build --- audiohandler.h | 2 -- wfmain.h | 2 +- wfview.pro | 20 ++++++++++---------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/audiohandler.h b/audiohandler.h index 6f3ffb9..1b3d3d9 100644 --- a/audiohandler.h +++ b/audiohandler.h @@ -810,8 +810,6 @@ private: void reinit(); quint16 getBuffer(int); - std::mutex mutex; - bool isInitialized; RtAudio audio; int audioDevice = 0; diff --git a/wfmain.h b/wfmain.h index de091e4..44e996a 100644 --- a/wfmain.h +++ b/wfmain.h @@ -26,7 +26,7 @@ #include "qledlabel.h" #include "rigctld.h" -#include <../qcustomplot/qcustomplot.h> +#include #include namespace Ui { diff --git a/wfview.pro b/wfview.pro index a01190f..fe9be6b 100644 --- a/wfview.pro +++ b/wfview.pro @@ -41,14 +41,14 @@ linux:DEFINES += __LINUX_ALSA__ #linux:DEFINES += __LINUX_PULSE__ macx:DEFINES += __MACOSX_CORE__ -option(RTAUDIO_API_DS "Build DirectSound API" OFF) -option(RTAUDIO_API_ASIO "Build ASIO API" OFF) -option(RTAUDIO_API_WASAPI "Build WASAPI API" ${WIN32}) -option(RTAUDIO_API_OSS "Build OSS4 API" ${xBSD}) -option(RTAUDIO_API_ALSA "Build ALSA API" ${LINUX}) -option(RTAUDIO_API_PULSE "Build PulseAudio API" ${pulse_FOUND}) -option(RTAUDIO_API_JACK "Build JACK audio server API" ${HAVE_JACK}) -option(RTAUDIO_API_CORE "Build CoreAudio API" ${APPLE}) +#option(RTAUDIO_API_DS "Build DirectSound API" OFF) +#option(RTAUDIO_API_ASIO "Build ASIO API" OFF) +#option(RTAUDIO_API_WASAPI "Build WASAPI API" ${WIN32}) +#option(RTAUDIO_API_OSS "Build OSS4 API" ${xBSD}) +#option(RTAUDIO_API_ALSA "Build ALSA API" ${LINUX}) +#option(RTAUDIO_API_PULSE "Build PulseAudio API" ${pulse_FOUND}) +#option(RTAUDIO_API_JACK "Build JACK audio server API" ${HAVE_JACK}) +#option(RTAUDIO_API_CORE "Build CoreAudio API" ${APPLE}) macx:INCLUDEPATH += /usr/local/include /opt/local/include macx:LIBS += -L/usr/local/lib -L/opt/local/lib @@ -121,7 +121,7 @@ SOURCES += main.cpp\ resampler/resample.c \ repeatersetup.cpp \ rigctld.cpp \ - rtaudio/RTAudio.cpp + rtaudio/RtAudio.cpp HEADERS += wfmain.h \ commhandler.h \ @@ -145,7 +145,7 @@ HEADERS += wfmain.h \ repeatersetup.h \ repeaterattributes.h \ rigctld.h \ - rtaudio/RTAudio.h + rtaudio/RtAudio.h FORMS += wfmain.ui \