mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-06-01 21:54:55 -04:00
Merge pull request #2245 from DreamNik/fix_warnings_and_android_issues
Fix warnings and android issues
This commit is contained in:
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
|
||||
aaroniartsainputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputaaroniartsa)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputaaroniartsa)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputaaroniartsasrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputaaroniartsasrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
|
||||
airspygui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputairspy)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputairspy)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputairspysrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputairspysrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
|
||||
airspyhfgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputairspyhf)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputairspyhf)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputairspyhfsrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputairspyhfsrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -31,12 +31,12 @@ if(NOT SERVER_MODE)
|
||||
androidsdrdriverinputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputandroidsdrdriverinput)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputandroidsdrdriverinput)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputandroidsdrdriverinputsrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputandroidsdrdriverinputsrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -35,6 +35,9 @@
|
||||
|
||||
#include "androidsdrdriverinput.h"
|
||||
#include "androidsdrdriverinputtcphandler.h"
|
||||
#ifdef ANDROID
|
||||
#include "util/android.h"
|
||||
#endif
|
||||
|
||||
MESSAGE_CLASS_DEFINITION(AndroidSDRDriverInput::MsgConfigureAndroidSDRDriverInput, Message)
|
||||
MESSAGE_CLASS_DEFINITION(AndroidSDRDriverInput::MsgStartStop, Message)
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
#include <QDateTime>
|
||||
|
||||
#include "util/messagequeue.h"
|
||||
#include "util/message.h"
|
||||
#include "androidsdrdriverinputsettings.h"
|
||||
#include "../../channelrx/remotetcpsink/remotetcpprotocol.h"
|
||||
|
||||
|
||||
@@ -31,12 +31,12 @@ if(NOT SERVER_MODE)
|
||||
audioinputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputaudio)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputaudio)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputaudiosrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputaudiosrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
|
||||
bladerf1inputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputbladerf1)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputbladerf1)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputbladerf1srv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputbladerf1srv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
|
||||
bladerf2inputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputbladerf2)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputbladerf2)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputbladerf2srv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputbladerf2srv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
|
||||
fcdprogui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputfcdpro)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputfcdpro)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputfcdprosrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputfcdprosrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
|
||||
fcdproplusgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputfcdproplus)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputfcdproplus)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputfcdproplussrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputfcdproplussrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -40,8 +40,6 @@ const PluginDescriptor FCDProPlusPlugin::m_pluginDescriptor = {
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel")
|
||||
};
|
||||
|
||||
static constexpr const char* const m_deviceTypeID = FCDPROPLUS_DEVICE_TYPE_ID;
|
||||
|
||||
FCDProPlusPlugin::FCDProPlusPlugin(QObject* parent) :
|
||||
QObject(parent)
|
||||
{
|
||||
|
||||
@@ -30,12 +30,12 @@ if(NOT SERVER_MODE)
|
||||
${fileinput_HEADERS}
|
||||
fileinputgui.h
|
||||
)
|
||||
set(TARGET_NAME inputfileinput)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputfileinput)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputfileinputsrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputfileinputsrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -27,6 +27,9 @@
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <cstdlib>
|
||||
#ifdef ANDROID
|
||||
#include <QFile>
|
||||
#endif
|
||||
|
||||
#include "util/message.h"
|
||||
|
||||
|
||||
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
|
||||
hackrfinputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputhackrf)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputhackrf)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputhackrfsrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputhackrfsrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
|
||||
kiwisdrgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputkiwisdr)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputkiwisdr)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputkiwisdrsrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputkiwisdrsrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
|
||||
limesdrinputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputlimesdr)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputlimesdr)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputlimesdrsrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputlimesdrsrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -31,12 +31,12 @@ if(NOT SERVER_MODE)
|
||||
localinputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputlocal)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputlocal)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputlocalsrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputlocalsrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -35,12 +35,12 @@ if(NOT SERVER_MODE)
|
||||
perseusgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputperseus)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputperseus)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputperseussrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputperseussrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
|
||||
plutosdrinputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputplutosdr)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputplutosdr)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputplutosdrsrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputplutosdrsrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -35,12 +35,12 @@ if(NOT SERVER_MODE)
|
||||
remoteinputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputremote)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputremote)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputremotesrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputremotesrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
|
||||
remotetcpinputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputtcpremote)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputtcpremote)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputtcpremotesrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputtcpremotesrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
|
||||
rtlsdrgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputrtlsdr)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputrtlsdr)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputrtlsdrsrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputrtlsdrsrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
|
||||
sdrplaygui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputsdrplay)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputsdrplay)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputsdrplaysrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputsdrplaysrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
|
||||
sdrplayv3gui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputsdrplayv3)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputsdrplayv3)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputsdrplayv3srv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputsdrplayv3srv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -35,12 +35,12 @@ if(NOT SERVER_MODE)
|
||||
sigmffileinputgui.h
|
||||
recordinfodialog.h
|
||||
)
|
||||
set(TARGET_NAME inputsigmffileinput)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputsigmffileinput)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputsigmffileinputsrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputsigmffileinputsrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -64,8 +64,9 @@ struct SigMFFileDataType
|
||||
}
|
||||
};
|
||||
|
||||
struct SigMFFileMetaInfo
|
||||
class SigMFFileMetaInfo
|
||||
{
|
||||
public:
|
||||
// core
|
||||
QString m_dataTypeStr;
|
||||
SigMFFileDataType m_dataType;
|
||||
@@ -153,8 +154,9 @@ struct SigMFFileMetaInfo
|
||||
}
|
||||
};
|
||||
|
||||
struct SigMFFileCapture
|
||||
class SigMFFileCapture
|
||||
{
|
||||
public:
|
||||
uint64_t m_tsms; //!< Unix timestamp in milliseconds
|
||||
uint64_t m_centerFrequency; //!< Center frequency in Hz
|
||||
uint64_t m_sampleStart; //!< Sample index at which capture start
|
||||
|
||||
@@ -625,8 +625,8 @@ void SigMFFileInputWorker::writeToSampleFifoBAK(const quint8* buf, qint32 nbByte
|
||||
nbSamples = nbBytes / (2 * m_samplebytes);
|
||||
for (int is = 0; is < nbSamples; is++)
|
||||
{
|
||||
convertBuf[2*is] = fileBuf[2*is] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16;
|
||||
convertBuf[2*is+1] = fileBuf[2*is+1] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16;
|
||||
convertBuf[2*is] = fileBuf[2*is] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16);
|
||||
convertBuf[2*is+1] = fileBuf[2*is+1] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -634,7 +634,7 @@ void SigMFFileInputWorker::writeToSampleFifoBAK(const quint8* buf, qint32 nbByte
|
||||
nbSamples = nbBytes / m_samplebytes;
|
||||
for (int is = 0; is < nbSamples; is++)
|
||||
{
|
||||
convertBuf[2*is] = fileBuf[is] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16;
|
||||
convertBuf[2*is] = fileBuf[is] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16);
|
||||
convertBuf[2*is+1] = 0;
|
||||
}
|
||||
}
|
||||
@@ -715,9 +715,9 @@ void SigMFFileInputWorker::writeToSampleFifoBAK(const quint8* buf, qint32 nbByte
|
||||
nbSamples = nbBytes / (2 * m_samplebytes);
|
||||
for (int is = 0; is < nbSamples; is++)
|
||||
{
|
||||
convertBuf[2*is] = (fileBuf[2*is] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16)
|
||||
convertBuf[2*is] = (fileBuf[2*is] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16))
|
||||
- ((SDR_RX_SAMP_SZ == 24) ? (1<<23) : (1<<15));
|
||||
convertBuf[2*is+1] = (fileBuf[2*is+1] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16)
|
||||
convertBuf[2*is+1] = (fileBuf[2*is+1] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16))
|
||||
- ((SDR_RX_SAMP_SZ == 24) ? (1<<23) : (1<<15));;
|
||||
}
|
||||
}
|
||||
@@ -726,7 +726,7 @@ void SigMFFileInputWorker::writeToSampleFifoBAK(const quint8* buf, qint32 nbByte
|
||||
nbSamples = nbBytes / m_samplebytes;
|
||||
for (int is = 0; is < nbSamples; is++)
|
||||
{
|
||||
convertBuf[2*is] = (fileBuf[is] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16)
|
||||
convertBuf[2*is] = (fileBuf[is] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16))
|
||||
- ((SDR_RX_SAMP_SZ == 24) ? (1<<23) : (1<<15));
|
||||
convertBuf[2*is+1] = 0;
|
||||
}
|
||||
|
||||
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
|
||||
soapysdrinputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputsoapysdr)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputsoapysdr)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputsoapysdrsrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputsoapysdrsrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
@@ -56,9 +56,14 @@ target_link_libraries(${TARGET_NAME}
|
||||
${TARGET_LIB_GUI}
|
||||
swagger
|
||||
${SOAPYSDR_LINK_LIBRARIES}
|
||||
${SOAPYSDR_LIBRARIES}
|
||||
soapysdrdevice
|
||||
)
|
||||
|
||||
target_link_directories(${TARGET_NAME} PRIVATE
|
||||
${SOAPYSDR_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
|
||||
|
||||
# Install debug symbols
|
||||
|
||||
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
|
||||
testsourcegui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputtestsource)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputtestsource)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputtestsourcesrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputtestsourcesrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
|
||||
usrpinputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputusrp)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputusrp)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputusrpsrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputusrpsrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
|
||||
xtrxinputgui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME inputxtrx)
|
||||
set(TARGET_NAME ${PLUGINS_PREFIX}inputxtrx)
|
||||
set(TARGET_LIB "Qt::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME inputxtrxsrv)
|
||||
set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputxtrxsrv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
|
||||
Reference in New Issue
Block a user