mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Remove QtMultimedia

merge-requests/5/head
Phil Taylor 2021-06-02 12:10:21 +01:00
rodzic 9df49d2a64
commit 22c5b5990f
4 zmienionych plików z 7 dodań i 18 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
audiohandler.h
Wyświetl plik

@ -3,7 +3,6 @@
#include <QObject>
#include <QtMultimedia/QAudioOutput>
#include <QByteArray>
#include <QMutex>
#include <QtEndian>

2
udphandler.h
Wyświetl plik

@ -16,7 +16,6 @@
#include <QtEndian>
// Needed for audio
#include <QtMultimedia/QAudioOutput>
#include <QBuffer>
#include <QThread>
@ -199,7 +198,6 @@ private:
void dataReceived();
void watchdog();
QAudioFormat format;
quint16 rxLatency;
quint16 txLatency;
quint16 rxSampleRate;

1
udpserversetup.h
Wyświetl plik

@ -4,7 +4,6 @@
#include <QDialog>
#include <QComboBox>
#include <QList>
#include <QAudioDeviceInfo>
#include <QDebug>

21
wfview.pro
Wyświetl plik

@ -4,7 +4,7 @@
#
#-------------------------------------------------
QT += core gui serialport network multimedia
QT += core gui serialport network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
@ -13,13 +13,15 @@ TEMPLATE = app
CONFIG(debug, release|debug) {
# For Debug builds only:
QMAKE_CXXFLAGS += -faligned-new
} else {
# For Release builds only:
linux:QMAKE_CXXFLAGS += -s
QMAKE_CXXFLAGS += -fvisibility=hidden
QMAKE_CXXFLAGS += -fvisibility-inlines-hidden
linux:QMAKE_LFLAGS += -O2 -s -faligned-new
QMAKE_CXXFLAGS += -faligned-new
linux:QMAKE_LFLAGS += -O2 -s
}
# The following define makes your compiler emit warnings if you use
@ -36,20 +38,11 @@ DEFINES += RANDOM_PREFIX=wf
# RTAudio defines
win32:DEFINES += __WINDOWS_WASAPI__
#win32:DEFINES += __WINDOWS_DS__ # Requires DirectSound libraries
linux:DEFINES += __LINUX_ALSA__
#linux:DEFINES += __LINUX_ALSA__
#linux:DEFINES += __LINUX_OSS__
#linux:DEFINES += __LINUX_PULSE__
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})
macx:INCLUDEPATH += /usr/local/include /opt/local/include
macx:LIBS += -L/usr/local/lib -L/opt/local/lib
@ -96,7 +89,7 @@ CONFIG(debug, release|debug) {
linux: QCPLIB = qcustomplot
}
linux:LIBS += -L./ -l$$QCPLIB -lasound
linux:LIBS += -L./ -l$$QCPLIB -lpulse -lpulse-simple
macx:LIBS += -framework CoreAudio -framework CoreFoundation -lpthread
!linux:SOURCES += ../qcustomplot/qcustomplot.cpp