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

Fix for mac compile

half-duplex
Phil Taylor 2023-01-14 00:17:53 +00:00
rodzic b285b81d72
commit 58f86f029b
8 zmienionych plików z 14 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
audiodevices.h
Wyświetl plik

@ -14,7 +14,6 @@
#include <portaudio.h> #include <portaudio.h>
#ifndef Q_OS_LINUX #ifndef Q_OS_LINUX
#include "RtAudio.h"
#else #else
#include "rtaudio/RtAudio.h" #include "rtaudio/RtAudio.h"
#endif #endif
@ -103,4 +102,4 @@ private:
}; };
#endif #endif

3
audiohandler.h
Wyświetl plik

@ -70,11 +70,12 @@ public slots:
virtual void incomingAudio(const audioPacket data); virtual void incomingAudio(const audioPacket data);
virtual void convertedInput(audioPacket audio); virtual void convertedInput(audioPacket audio);
virtual void convertedOutput(audioPacket audio); virtual void convertedOutput(audioPacket audio);
virtual void getNextAudioChunk();
private slots: private slots:
virtual void stateChanged(QAudio::State state); virtual void stateChanged(QAudio::State state);
virtual void clearUnderrun(); virtual void clearUnderrun();
virtual void getNextAudioChunk();
signals: signals:
void audioMessage(QString message); void audioMessage(QString message);

2
pahandler.h
Wyświetl plik

@ -36,7 +36,7 @@ public:
int getLatency(); int getLatency();
using audioHandler::getNextAudioChunk;
void getNextAudioChunk(QByteArray& data); void getNextAudioChunk(QByteArray& data);
quint16 getAmplitude(); quint16 getAmplitude();

2
rigcommander.cpp
Wyświetl plik

@ -889,7 +889,7 @@ void rigCommander::setPassband(quint16 pass)
calc = quint16((pass / 200) - 1); calc = quint16((pass / 200) - 1);
} }
else if (pass >= 600 || pass <=3600) // SSB/CW/PSK 10-40 (10-31 for RTTY) else if (pass >= 600 && pass <=3600) // SSB/CW/PSK 10-40 (10-31 for RTTY)
{ {
calc = quint16((pass / 100) + 4); calc = quint16((pass / 100) + 4);
} }

2
rthandler.h
Wyświetl plik

@ -42,7 +42,7 @@ public:
int getLatency(); int getLatency();
using audioHandler::getNextAudioChunk;
void getNextAudioChunk(QByteArray& data); void getNextAudioChunk(QByteArray& data);
quint16 getAmplitude(); quint16 getAmplitude();

4
usbcontroller.h
Wyświetl plik

@ -37,13 +37,13 @@ using namespace std;
#define HIDDATALENGTH 64 #define HIDDATALENGTH 64
#define MAX_STR 255 #define MAX_STR 255
enum commandType {normal,bandswitch,modeswitch}; enum commandType {normalCommand,bandswitch,modeswitch};
struct COMMAND { struct COMMAND {
COMMAND() {} COMMAND() {}
COMMAND(int index, QString text, int command, char suffix) : COMMAND(int index, QString text, int command, char suffix) :
index(index), text(text), command(command), suffix(suffix), type(normal){} index(index), text(text), command(command), suffix(suffix), type(normalCommand){}
COMMAND(int index, QString text, int command, bandType band) : COMMAND(int index, QString text, int command, bandType band) :
index(index), text(text), command(command), band(band), type(bandswitch) {} index(index), text(text), command(command), band(band), type(bandswitch) {}
COMMAND(int index, QString text, int command, mode_kind mode) : COMMAND(int index, QString text, int command, mode_kind mode) :

2
wfmain.cpp
Wyświetl plik

@ -1507,7 +1507,7 @@ void wfmain::doShuttle(bool up, unsigned char level)
void wfmain::buttonControl(const COMMAND* cmd) void wfmain::buttonControl(const COMMAND* cmd)
{ {
if (cmd->type==normal) { if (cmd->type==normalCommand) {
//qDebug() << "Other command"; //qDebug() << "Other command";
issueCmdUniquePriority((cmds)cmd->command, cmd->suffix); issueCmdUniquePriority((cmds)cmd->command, cmd->suffix);
} }

10
wfview.pro
Wyświetl plik

@ -134,8 +134,8 @@ INSTALLS += stylesheets
# CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT # CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
CONFIG(debug, release|debug) { CONFIG(debug, release|debug) {
linux: QCPLIB = qcustomplotd !win32: QCPLIB = qcustomplotd
!linux: QCPLIB = qcustomplotd2 win32: QCPLIB = qcustomplotd2
win32 { win32 {
contains(QMAKE_TARGET.arch, x86_64) { contains(QMAKE_TARGET.arch, x86_64) {
LIBS += -L../opus/win32/VS2015/x64/Debug/ LIBS += -L../opus/win32/VS2015/x64/Debug/
@ -152,8 +152,8 @@ CONFIG(debug, release|debug) {
} }
} }
} else { } else {
linux: QCPLIB = qcustomplot !win32: QCPLIB = qcustomplot
!linux: QCPLIB = qcustomplot2 win32: QCPLIB = qcustomplot2
win32 { win32 {
contains(QMAKE_TARGET.arch, x86_64) { contains(QMAKE_TARGET.arch, x86_64) {
LIBS += -L../opus/win32/VS2015/x64/Release/ LIBS += -L../opus/win32/VS2015/x64/Release/
@ -173,7 +173,7 @@ CONFIG(debug, release|debug) {
linux:LIBS += -L./ -l$$QCPLIB -lopus linux:LIBS += -L./ -l$$QCPLIB -lopus
!linux:LIBS += -l$$QCPLIB -lopus !linux:LIBS += -l$$QCPLIB -lopus
macx:LIBS += -framework CoreAudio -framework CoreFoundation -lpthread -lopus macx:LIBS += -framework CoreAudio -framework CoreFoundation -lpthread -lopus -lqcustomplot
contains(DEFINES,USB_CONTROLLER){ contains(DEFINES,USB_CONTROLLER){
linux:LIBS += -L./ -l$$QCPLIB -lhidapi-libusb linux:LIBS += -L./ -l$$QCPLIB -lhidapi-libusb