mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fixed some compilation issues

pull/442/head
f4exb 2019-10-24 22:18:36 +02:00
rodzic e2fd1384f7
commit d63f1a3ed5
11 zmienionych plików z 14 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
plugins/samplemimo/testmi/testmiplugin.cpp
Wyświetl plik

@ -64,7 +64,7 @@ void TestMIPlugin::enumOriginDevices(QStringList& listedHwIds, OriginDevices& or
originDevices.append(OriginDevice( originDevices.append(OriginDevice(
"TestMI", // Displayable name "TestMI", // Displayable name
m_hardwareID, // Hardware ID m_hardwareID, // Hardware ID
QString::null, // Serial QString(), // Serial
0, // Sequence 0, // Sequence
2, // Number of Rx streams 2, // Number of Rx streams
0 // Number of Tx streams 0 // Number of Tx streams

2
plugins/samplesink/filesink/filesinkplugin.cpp
Wyświetl plik

@ -63,7 +63,7 @@ void FileSinkPlugin::enumOriginDevices(QStringList& listedHwIds, OriginDevices&
originDevices.append(OriginDevice( originDevices.append(OriginDevice(
"FileSink", "FileSink",
m_hardwareID, m_hardwareID,
QString::null, QString(),
0, // Sequence 0, // Sequence
0, // nb Rx 0, // nb Rx
1 // nb Tx 1 // nb Tx

2
plugins/samplesink/localoutput/localoutputplugin.cpp
Wyświetl plik

@ -64,7 +64,7 @@ void LocalOutputPlugin::enumOriginDevices(QStringList& listedHwIds, OriginDevice
originDevices.append(OriginDevice( originDevices.append(OriginDevice(
"LocalOutput", "LocalOutput",
m_hardwareID, m_hardwareID,
QString::null, QString(),
0, // Sequence 0, // Sequence
0, // nb Rx 0, // nb Rx
1 // nb Tx 1 // nb Tx

2
plugins/samplesink/remoteoutput/remoteoutputplugin.cpp
Wyświetl plik

@ -64,7 +64,7 @@ void RemoteOutputPlugin::enumOriginDevices(QStringList& listedHwIds, OriginDevic
originDevices.append(OriginDevice( originDevices.append(OriginDevice(
"RemoteOutput", "RemoteOutput",
m_hardwareID, m_hardwareID,
QString::null, QString(),
0, // Sequence 0, // Sequence
0, // nb Rx 0, // nb Rx
1 // nb Tx 1 // nb Tx

2
plugins/samplesource/fileinput/fileinputplugin.cpp
Wyświetl plik

@ -64,7 +64,7 @@ void FileInputPlugin::enumOriginDevices(QStringList& listedHwIds, OriginDevices&
originDevices.append(OriginDevice( originDevices.append(OriginDevice(
"FileInput", "FileInput",
m_hardwareID, m_hardwareID,
QString::null, QString(),
0, 0,
1, // nb Rx 1, // nb Rx
0 // nb Tx 0 // nb Tx

2
plugins/samplesource/kiwisdr/kiwisdrplugin.cpp
Wyświetl plik

@ -65,7 +65,7 @@ void KiwiSDRPlugin::enumOriginDevices(QStringList& listedHwIds, OriginDevices& o
originDevices.append(OriginDevice( originDevices.append(OriginDevice(
"KiwiSDR", "KiwiSDR",
m_hardwareID, m_hardwareID,
QString::null, QString(),
0, 0,
1, // nb Rx 1, // nb Rx
0 // nb Tx 0 // nb Tx

2
plugins/samplesource/localinput/localinputplugin.cpp
Wyświetl plik

@ -64,7 +64,7 @@ void LocalInputPlugin::enumOriginDevices(QStringList& listedHwIds, OriginDevices
originDevices.append(OriginDevice( originDevices.append(OriginDevice(
"LocalInput", "LocalInput",
m_hardwareID, m_hardwareID,
QString::null, QString(),
0, 0,
1, // nb Rx 1, // nb Rx
0 // nb Tx 0 // nb Tx

2
plugins/samplesource/remoteinput/remoteinputplugin.cpp
Wyświetl plik

@ -64,7 +64,7 @@ void RemoteInputPlugin::enumOriginDevices(QStringList& listedHwIds, OriginDevice
originDevices.append(OriginDevice( originDevices.append(OriginDevice(
"RemoteInput", "RemoteInput",
m_hardwareID, m_hardwareID,
QString::null, QString(),
0, 0,
1, // nb Rx 1, // nb Rx
0 // nb Tx 0 // nb Tx

2
plugins/samplesource/testsource/testsourceplugin.cpp
Wyświetl plik

@ -64,7 +64,7 @@ void TestSourcePlugin::enumOriginDevices(QStringList& listedHwIds, OriginDevices
originDevices.append(OriginDevice( originDevices.append(OriginDevice(
"TestSource", "TestSource",
m_hardwareID, m_hardwareID,
QString::null, QString(),
0, 0,
1, // nb Rx 1, // nb Rx
0 // nb Tx 0 // nb Tx

4
sdrbase/dsp/dspdevicemimoengine.cpp
Wyświetl plik

@ -101,6 +101,8 @@ bool DSPDeviceMIMOEngine::initProcess(int subsystemIndex)
DSPGenerationInit cmd; DSPGenerationInit cmd;
return m_syncMessenger.sendWait(cmd) == StReady; return m_syncMessenger.sendWait(cmd) == StReady;
} }
return false;
} }
bool DSPDeviceMIMOEngine::startProcess(int subsystemIndex) bool DSPDeviceMIMOEngine::startProcess(int subsystemIndex)
@ -116,6 +118,8 @@ bool DSPDeviceMIMOEngine::startProcess(int subsystemIndex)
DSPGenerationStart cmd; DSPGenerationStart cmd;
return m_syncMessenger.sendWait(cmd) == StRunning; return m_syncMessenger.sendWait(cmd) == StRunning;
} }
return false;
} }
void DSPDeviceMIMOEngine::stopProcess(int subsystemIndex) void DSPDeviceMIMOEngine::stopProcess(int subsystemIndex)

2
sdrbase/util/simpleserializer.h
Wyświetl plik

@ -60,7 +60,7 @@ public:
bool readDouble(quint32 id, double* result, double def = 0) const; bool readDouble(quint32 id, double* result, double def = 0) const;
bool readReal(quint32 id, Real* result, Real def = 0) const; bool readReal(quint32 id, Real* result, Real def = 0) const;
bool readBool(quint32 id, bool* result, bool def = false) const; bool readBool(quint32 id, bool* result, bool def = false) const;
bool readString(quint32 id, QString* result, const QString& def = QString::null) const; bool readString(quint32 id, QString* result, const QString& def = QString()) const;
bool readBlob(quint32 id, QByteArray* result, const QByteArray& def = QByteArray()) const; bool readBlob(quint32 id, QByteArray* result, const QByteArray& def = QByteArray()) const;
bool isValid() const { return m_valid; } bool isValid() const { return m_valid; }