fix windows code to build with MSVC

- remove __attribute__((unused)) not supported on MSVC
- remove  __attribute((unused)) not supported on MSVC
- add symbol exports to RemoteDataReadQueue and RemoteDataQueue
- add export symbols to sdrsrv

appsrv/main.cpp

@@ -21,7 +21,6 @@
 #include <QSysInfo>
 
 #include <signal.h>
-#include <unistd.h>
 #include <vector>
 
 #include "loggerwithfile.h"

exports/export.h

@@ -55,6 +55,18 @@
 #   define SDRGUI_API
 #endif
 
+/* the 'SDRSRV_API' controls the import/export of 'sdrsrv' symbols
+ */
+#if !defined(sdrangel_STATIC)
+#  ifdef sdrsrv_EXPORTS
+#    define SDRSRV_API __SDR_EXPORT
+#  else
+#    define SDRSRV_API __SDR_IMPORT
+#  endif
+#else
+#   define SDRSRV_API
+#endif
+
 /* the 'DEVICES_API' controls the import/export of 'devices' symbols
  */
 #if !defined(sdrangel_STATIC)

libfreedv/cohpsk.cpp

@@ -310,8 +310,8 @@ void qpsk_symbols_to_bits(struct COHPSK *coh, float rx_bits[], COMP ct_symb_buf[
     COMP  y[NPILOTSFRAME+2], yfit;
     COMP  rx_symb_linear[NSYMROW*COHPSK_NC*ND];
     COMP  m, b;
-    COMP   __attribute__((unused)) corr, rot, pi_on_4, phi_rect, div_symb;
-    float mag,  __attribute__((unused)) phi_,  __attribute__((unused)) amp_;
+    COMP  corr, rot, pi_on_4, phi_rect, div_symb;
+    float mag, phi_, amp_;
     float sum_x, sum_xx, noise_var;
     COMP  s;
 

plugins/channelrx/demodam/amdemodplugin.cpp

@@ -37,8 +37,8 @@ void AMDemodPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* AMDemodPlugin::createRxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSink *rxChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSink *rxChannel)
 {
     return 0;
 }

plugins/channelrx/demodbfm/bfmplugin.cpp

@@ -56,8 +56,8 @@ void BFMPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* BFMPlugin::createRxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSink *rxChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSink *rxChannel)
 {
     return 0;
 }

plugins/channelrx/demoddatv/leansdr/dvb.h

@@ -24,6 +24,10 @@
 #include "leansdr/sdr.h"
 #include "leansdr/viterbi.h"
 
+#ifndef M_PI
+#    define M_PI 3.14159265358979323846
+#endif
+
 namespace leansdr
 {
 

plugins/channelrx/demoddatv/leansdr/math.h

@@ -20,6 +20,10 @@
 #include <math.h>
 #include <stdint.h>
 
+#ifndef M_PI
+#    define M_PI 3.14159265358979323846
+#endif
+
 namespace leansdr
 {
 

plugins/channelrx/demoddsd/dsddemodplugin.cpp

@@ -55,8 +55,8 @@ void DSDDemodPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* DSDDemodPlugin::createRxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSink *rxChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSink *rxChannel)
 {
     return 0;
 }

plugins/channelrx/demodfreedv/freedvplugin.cpp

@@ -54,8 +54,8 @@ void FreeDVPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* FreeDVPlugin::createRxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSink *rxChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSink *rxChannel)
 {
     return 0;
 }

plugins/channelrx/demodnfm/nfmplugin.cpp

@@ -37,8 +37,8 @@ void NFMPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* NFMPlugin::createRxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSink *rxChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSink *rxChannel)
 {
     return 0;
 }

plugins/channelrx/demodssb/ssbplugin.cpp

@@ -37,8 +37,8 @@ void SSBPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* SSBPlugin::createRxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSink *rxChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSink *rxChannel)
 {
     return 0;
 }

plugins/channelrx/demodwfm/wfmplugin.cpp

@@ -38,8 +38,8 @@ void WFMPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* WFMPlugin::createRxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSink *rxChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSink *rxChannel)
 {
     return 0;
 }

plugins/channelrx/freqtracker/freqtrackerplugin.cpp

@@ -54,8 +54,8 @@ void FreqTrackerPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* FreqTrackerPlugin::createRxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSink *rxChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSink *rxChannel)
 {
     return 0;
 }

plugins/channelrx/localsink/localsinkplugin.cpp

@@ -55,8 +55,8 @@ void LocalSinkPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* LocalSinkPlugin::createRxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSink *rxChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSink *rxChannel)
 {
     return 0;
 }

plugins/channelrx/remotesink/remotesinkplugin.cpp

@@ -55,8 +55,8 @@ void RemoteSinkPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* RemoteSinkPlugin::createRxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSink *rxChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSink *rxChannel)
 {
     return 0;
 }

plugins/channelrx/udpsink/udpsinkplugin.cpp

@@ -55,8 +55,8 @@ void UDPSinkPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* UDPSinkPlugin::createRxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSink *rxChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSink *rxChannel)
 {
     return 0;
 }

plugins/channeltx/localsource/localsourceplugin.cpp

@@ -55,8 +55,8 @@ void LocalSourcePlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* LocalSourcePlugin::createTxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSource *txChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSource *txChannel)
 {
     return 0;
 }

plugins/channeltx/modam/ammodplugin.cpp

@@ -54,8 +54,8 @@ void AMModPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* AMModPlugin::createTxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSource *txChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSource *txChannel)
 {
     return 0;
 }

plugins/channeltx/modatv/atvmodplugin.cpp

@@ -54,8 +54,8 @@ void ATVModPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* ATVModPlugin::createTxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSource *txChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSource *txChannel)
 {
     return 0;
 }

plugins/channeltx/modfreedv/freedvmodplugin.cpp

@@ -54,8 +54,8 @@ void FreeDVModPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* FreeDVModPlugin::createTxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSource *txChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSource *txChannel)
 {
     return 0;
 }

plugins/channeltx/modnfm/nfmmodplugin.cpp

@@ -54,8 +54,8 @@ void NFMModPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSource *txChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSource *txChannel)
 {
     return 0;
 }

plugins/channeltx/modssb/ssbmodplugin.cpp

@@ -54,8 +54,8 @@ void SSBModPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* SSBModPlugin::createTxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSource *txChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSource *txChannel)
 {
     return 0;
 }

plugins/channeltx/modwfm/wfmmodplugin.cpp

@@ -54,8 +54,8 @@ void WFMModPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* WFMModPlugin::createTxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSource *txChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSource *txChannel)
 {
     return 0;
 }

plugins/channeltx/remotesource/remotesourceplugin.cpp

@@ -54,8 +54,8 @@ void RemoteSourcePlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* RemoteSourcePlugin::createTxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSource *txChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSource *txChannel)
 {
     return 0;
 }

plugins/channeltx/udpsource/udpsourceplugin.cpp

@@ -56,8 +56,8 @@ void UDPSourcePlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* UDPSourcePlugin::createTxChannelGUI(
-        DeviceUISet *deviceUISet __attribute__((unused)),
-        BasebandSampleSource *txChannel __attribute__((unused)))
+        DeviceUISet *deviceUISet,
+        BasebandSampleSource *txChannel)
 {
     return 0;
 }

plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp

@@ -110,9 +110,9 @@ PluginInterface::SamplingDevices Bladerf1OutputPlugin::enumSampleSinks()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* Bladerf1OutputPlugin::createSampleSinkPluginInstanceGUI(
-        const QString& sinkId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sinkId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp

@@ -114,9 +114,9 @@ PluginInterface::SamplingDevices BladeRF2OutputPlugin::enumSampleSinks()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* BladeRF2OutputPlugin::createSampleSinkPluginInstanceGUI(
-        const QString& sinkId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sinkId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesink/filesink/filesinkplugin.cpp

@@ -74,9 +74,9 @@ PluginInterface::SamplingDevices FileSinkPlugin::enumSampleSinks()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* FileSinkPlugin::createSampleSinkPluginInstanceGUI(
-        const QString& sinkId __attribute((unused)),
-        QWidget **widget __attribute((unused)),
-        DeviceUISet *deviceUISet __attribute((unused)))
+        const QString& sinkId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp

@@ -123,9 +123,9 @@ PluginInterface::SamplingDevices HackRFOutputPlugin::enumSampleSinks()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* HackRFOutputPlugin::createSampleSinkPluginInstanceGUI(
-        const QString& sinkId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sinkId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesink/limesdroutput/limesdroutputplugin.cpp

@@ -113,9 +113,9 @@ PluginInterface::SamplingDevices LimeSDROutputPlugin::enumSampleSinks()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* LimeSDROutputPlugin::createSampleSinkPluginInstanceGUI(
-        const QString& sinkId __attribute((unused)),
-        QWidget **widget __attribute((unused)),
-        DeviceUISet *deviceUISet __attribute((unused)))
+        const QString& sinkId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesink/localoutput/localoutputplugin.cpp

@@ -74,9 +74,9 @@ PluginInterface::SamplingDevices LocalOutputPlugin::enumSampleSinks()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* LocalOutputPlugin::createSampleSinkPluginInstanceGUI(
-        const QString& sinkId __attribute((unused)),
-        QWidget **widget __attribute((unused)),
-        DeviceUISet *deviceUISet __attribute((unused)))
+        const QString& sinkId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp

@@ -88,9 +88,9 @@ PluginInterface::SamplingDevices PlutoSDROutputPlugin::enumSampleSinks()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* PlutoSDROutputPlugin::createSampleSinkPluginInstanceGUI(
-        const QString& sinkId __attribute((unused)),
-        QWidget **widget __attribute((unused)),
-        DeviceUISet *deviceUISet __attribute((unused)))
+        const QString& sinkId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesink/remoteoutput/remoteoutputplugin.cpp

@@ -74,9 +74,9 @@ PluginInterface::SamplingDevices RemoteOutputPlugin::enumSampleSinks()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* RemoteOutputPlugin::createSampleSinkPluginInstanceGUI(
-        const QString& sinkId __attribute((unused)),
-        QWidget **widget __attribute((unused)),
-        DeviceUISet *deviceUISet __attribute((unused)))
+        const QString& sinkId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp

@@ -91,9 +91,9 @@ PluginInterface::SamplingDevices SoapySDROutputPlugin::enumSampleSinks()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* SoapySDROutputPlugin::createSampleSinkPluginInstanceGUI(
-        const QString& sinkId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sinkId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp

@@ -87,9 +87,9 @@ PluginInterface::SamplingDevices XTRXOutputPlugin::enumSampleSinks()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* XTRXOutputPlugin::createSampleSinkPluginInstanceGUI(
-        const QString& sinkId __attribute((unused)),
-        QWidget **widget __attribute((unused)),
-        DeviceUISet *deviceUISet __attribute((unused)))
+        const QString& sinkId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/airspy/airspyplugin.cpp

@@ -130,9 +130,9 @@ PluginInterface::SamplingDevices AirspyPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* AirspyPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/airspyhf/airspyhfplugin.cpp

@@ -100,9 +100,9 @@ PluginInterface::SamplingDevices AirspyHFPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* AirspyHFPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp

@@ -109,9 +109,9 @@ PluginInterface::SamplingDevices Blderf1InputPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* Blderf1InputPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp

@@ -114,9 +114,9 @@ PluginInterface::SamplingDevices Blderf2InputPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* Blderf2InputPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/fcdpro/fcdproplugin.cpp

@@ -82,9 +82,9 @@ PluginInterface::SamplingDevices FCDProPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* FCDProPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/fcdproplus/fcdproplusplugin.cpp

@@ -84,9 +84,9 @@ PluginInterface::SamplingDevices FCDProPlusPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* FCDProPlusPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/filesource/filesourceplugin.cpp

@@ -74,9 +74,9 @@ PluginInterface::SamplingDevices FileSourcePlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* FileSourcePlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/hackrfinput/hackrfinputplugin.cpp

@@ -125,9 +125,9 @@ PluginInterface::SamplingDevices HackRFInputPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* HackRFInputPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/limesdrinput/limesdrinputplugin.cpp

@@ -112,9 +112,9 @@ PluginInterface::SamplingDevices LimeSDRInputPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* LimeSDRInputPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute((unused)),
-        QWidget **widget __attribute((unused)),
-        DeviceUISet *deviceUISet __attribute((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/localinput/localinputplugin.cpp

@@ -74,9 +74,9 @@ PluginInterface::SamplingDevices LocalInputPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* LocalInputPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute((unused)),
-        QWidget **widget __attribute((unused)),
-        DeviceUISet *deviceUISet __attribute((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/perseus/perseusplugin.cpp

@@ -90,9 +90,9 @@ PluginInterface::SamplingDevices PerseusPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* PerseusPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp

@@ -90,9 +90,9 @@ PluginInterface::SamplingDevices PlutoSDRInputPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* PlutoSDRInputPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/remoteinput/remoteinputplugin.cpp

@@ -74,9 +74,9 @@ PluginInterface::SamplingDevices RemoteInputPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* RemoteInputPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute((unused)),
-        QWidget **widget __attribute((unused)),
-        DeviceUISet *deviceUISet __attribute((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/rtlsdr/rtlsdrplugin.cpp

@@ -70,9 +70,9 @@ PluginInterface::SamplingDevices RTLSDRPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* RTLSDRPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute((unused)),
-        QWidget **widget __attribute((unused)),
-        DeviceUISet *deviceUISet __attribute((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/sdrplay/sdrplayplugin.cpp

@@ -93,9 +93,9 @@ PluginInterface::SamplingDevices SDRPlayPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* SDRPlayPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute((unused)),
-        QWidget **widget __attribute((unused)),
-        DeviceUISet *deviceUISet __attribute((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp

@@ -90,9 +90,9 @@ PluginInterface::SamplingDevices SoapySDRInputPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* SoapySDRInputPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute__((unused)),
-        QWidget **widget __attribute__((unused)),
-        DeviceUISet *deviceUISet __attribute__((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/testsource/testsourceplugin.cpp

@@ -74,9 +74,9 @@ PluginInterface::SamplingDevices TestSourcePlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* TestSourcePlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute((unused)),
-        QWidget **widget __attribute((unused)),
-        DeviceUISet *deviceUISet __attribute((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

plugins/samplesource/xtrxinput/xtrxinputplugin.cpp

@@ -88,9 +88,9 @@ PluginInterface::SamplingDevices XTRXInputPlugin::enumSampleSources()
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* XTRXInputPlugin::createSampleSourcePluginInstanceGUI(
-        const QString& sourceId __attribute((unused)),
-        QWidget **widget __attribute((unused)),
-        DeviceUISet *deviceUISet __attribute((unused)))
+        const QString& sourceId,
+        QWidget **widget,
+        DeviceUISet *deviceUISet)
 {
     return 0;
 }

sdrbase/channel/remotedataqueue.h

@@ -29,9 +29,11 @@
 #include <QMutex>
 #include <QQueue>
 
+#include "export.h"
+
 class RemoteDataBlock;
 
-class RemoteDataQueue : public QObject {
+class SDRBASE_API RemoteDataQueue : public QObject {
     Q_OBJECT
 
 public:

sdrbase/channel/remotedatareadqueue.h

@@ -27,10 +27,12 @@
 
 #include <QQueue>
 
+#include "export.h"
+
 class RemoteDataBlock;
 class Sample;
 
-class RemoteDataReadQueue
+class SDRBASE_API RemoteDataReadQueue
 {
 public:
     RemoteDataReadQueue();

sdrgui/gui/comboboxnoarrow.cpp

@@ -20,7 +20,9 @@
 
 #include "comboboxnoarrow.h"
 
-void ComboBoxNoArrow::paintEvent (QPaintEvent *ev __attribute__((unused)))
+// MSVC doesn't support __attribute__
+// maybe use #ifdef and __declspec(unused) as prefix for windows
+void ComboBoxNoArrow::paintEvent (QPaintEvent *ev)
 {
     QPainter p;
     p.begin (this);

sdrsrv/maincore.cpp

@@ -17,8 +17,6 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include <unistd.h>
-
 #include <QDebug>
 #include <QSysInfo>
 #include <QResource>

sdrsrv/maincore.h

@@ -45,7 +45,7 @@ namespace qtwebapp {
     class LoggerWithFile;
 }
 
-class MainCore : public QObject {
+class SDRSRV_API MainCore : public QObject {
     Q_OBJECT
 
 public:

sdrsrv/webapi/webapiadaptersrv.cpp

@@ -22,8 +22,6 @@
 #include <QTextStream>
 #include <QSysInfo>
 
-#include <unistd.h>
-
 #include "SWGInstanceSummaryResponse.h"
 #include "SWGInstanceDevicesResponse.h"
 #include "SWGInstanceChannelsResponse.h"
@@ -70,7 +68,7 @@ WebAPIAdapterSrv::~WebAPIAdapterSrv()
 
 int WebAPIAdapterSrv::instanceSummary(
         SWGSDRangel::SWGInstanceSummaryResponse& response,
-        SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+        SWGSDRangel::SWGErrorResponse& error)
 {
     response.init();
     *response.getAppname() = QCoreApplication::applicationName();
@@ -103,7 +101,7 @@ int WebAPIAdapterSrv::instanceSummary(
 
 int WebAPIAdapterSrv::instanceDelete(
         SWGSDRangel::SWGSuccessResponse& response,
-        SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+        SWGSDRangel::SWGErrorResponse& error)
 {
     MainCore::MsgDeleteInstance *msg = MainCore::MsgDeleteInstance::create();
     m_mainCore.getInputMessageQueue()->push(msg);
@@ -117,7 +115,7 @@ int WebAPIAdapterSrv::instanceDelete(
 int WebAPIAdapterSrv::instanceDevices(
             int direction,
             SWGSDRangel::SWGInstanceDevicesResponse& response,
-            SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+            SWGSDRangel::SWGErrorResponse& error)
 {
     response.init();
 
@@ -165,7 +163,7 @@ int WebAPIAdapterSrv::instanceDevices(
 int WebAPIAdapterSrv::instanceChannels(
             int direction,
             SWGSDRangel::SWGInstanceChannelsResponse& response,
-            SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+            SWGSDRangel::SWGErrorResponse& error)
 {
     response.init();
     PluginAPI::ChannelRegistrations *channelRegistrations;
@@ -209,7 +207,7 @@ int WebAPIAdapterSrv::instanceChannels(
 
 int WebAPIAdapterSrv::instanceLoggingGet(
         SWGSDRangel::SWGLoggingInfo& response,
-        SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+        SWGSDRangel::SWGErrorResponse& error)
 {
     response.init();
     response.setDumpToFile(m_mainCore.m_logger->getUseFileLogger() ? 1 : 0);
@@ -227,7 +225,7 @@ int WebAPIAdapterSrv::instanceLoggingGet(
 int WebAPIAdapterSrv::instanceLoggingPut(
         SWGSDRangel::SWGLoggingInfo& query,
         SWGSDRangel::SWGLoggingInfo& response,
-        SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+        SWGSDRangel::SWGErrorResponse& error)
 {
     // response input is the query actually
     bool dumpToFile = (query.getDumpToFile() != 0);
@@ -264,7 +262,7 @@ int WebAPIAdapterSrv::instanceLoggingPut(
 
 int WebAPIAdapterSrv::instanceAudioGet(
         SWGSDRangel::SWGAudioDevices& response,
-        SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+        SWGSDRangel::SWGErrorResponse& error)
 {
     const QList<QAudioDeviceInfo>& audioInputDevices = m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputDevices();
     const QList<QAudioDeviceInfo>& audioOutputDevices = m_mainCore.m_dspEngine->getAudioDeviceManager()->getOutputDevices();
@@ -501,7 +499,7 @@ int WebAPIAdapterSrv::instanceAudioOutputDelete(
 
 int WebAPIAdapterSrv::instanceAudioInputCleanupPatch(
             SWGSDRangel::SWGSuccessResponse& response,
-            SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+            SWGSDRangel::SWGErrorResponse& error)
 {
     m_mainCore.m_dspEngine->getAudioDeviceManager()->inputInfosCleanup();
 
@@ -513,7 +511,7 @@ int WebAPIAdapterSrv::instanceAudioInputCleanupPatch(
 
 int WebAPIAdapterSrv::instanceAudioOutputCleanupPatch(
             SWGSDRangel::SWGSuccessResponse& response,
-            SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+            SWGSDRangel::SWGErrorResponse& error)
 {
     m_mainCore.m_dspEngine->getAudioDeviceManager()->outputInfosCleanup();
 
@@ -525,7 +523,7 @@ int WebAPIAdapterSrv::instanceAudioOutputCleanupPatch(
 
 int WebAPIAdapterSrv::instanceLocationGet(
         SWGSDRangel::SWGLocationInformation& response,
-        SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+        SWGSDRangel::SWGErrorResponse& error)
 {
     response.init();
     response.setLatitude(m_mainCore.m_settings.getLatitude());
@@ -536,7 +534,7 @@ int WebAPIAdapterSrv::instanceLocationGet(
 
 int WebAPIAdapterSrv::instanceLocationPut(
         SWGSDRangel::SWGLocationInformation& response,
-        SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+        SWGSDRangel::SWGErrorResponse& error)
 {
     float latitude = response.getLatitude();
     float longitude = response.getLongitude();
@@ -555,7 +553,7 @@ int WebAPIAdapterSrv::instanceLocationPut(
 
 int WebAPIAdapterSrv::instanceDVSerialGet(
             SWGSDRangel::SWGDVSeralDevices& response,
-            SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+            SWGSDRangel::SWGErrorResponse& error)
 {
     response.init();
 
@@ -580,7 +578,7 @@ int WebAPIAdapterSrv::instanceDVSerialGet(
 int WebAPIAdapterSrv::instanceDVSerialPatch(
             bool dvserial,
             SWGSDRangel::SWGDVSeralDevices& response,
-            SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+            SWGSDRangel::SWGErrorResponse& error)
 {
     m_mainCore.m_dspEngine->setDVSerialSupport(dvserial);
     response.init();
@@ -730,7 +728,7 @@ int WebAPIAdapterSrv::instancePresetFilePost(
 
 int WebAPIAdapterSrv::instancePresetsGet(
         SWGSDRangel::SWGPresets& response,
-        SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+        SWGSDRangel::SWGErrorResponse& error)
 {
     int nbPresets = m_mainCore.m_settings.getPresetCount();
     int nbGroups = 0;
@@ -992,7 +990,7 @@ int WebAPIAdapterSrv::instancePresetDelete(
 
 int WebAPIAdapterSrv::instanceDeviceSetsGet(
         SWGSDRangel::SWGDeviceSetList& response,
-        SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+        SWGSDRangel::SWGErrorResponse& error)
 {
     getDeviceSetList(&response);
     return 200;
@@ -1001,7 +999,7 @@ int WebAPIAdapterSrv::instanceDeviceSetsGet(
 int WebAPIAdapterSrv::instanceDeviceSetPost(
         int direction,
         SWGSDRangel::SWGSuccessResponse& response,
-        SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
+        SWGSDRangel::SWGErrorResponse& error)
 {
     MainCore::MsgAddDeviceSet *msg = MainCore::MsgAddDeviceSet::create(direction);
     m_mainCore.m_inputMessageQueue.push(msg);
@@ -1057,8 +1055,8 @@ int WebAPIAdapterSrv::devicesetGet(
 }
 
 int WebAPIAdapterSrv::devicesetFocusPatch(
-        int deviceSetIndex __attribute__((unused)),
-        SWGSDRangel::SWGSuccessResponse& response __attribute__((unused)),
+        int deviceSetIndex,
+        SWGSDRangel::SWGSuccessResponse& response,
         SWGSDRangel::SWGErrorResponse& error)
 {
     *error.getMessage() = QString("Not supported in server instance");