From b127182062024b37e0fc9d0ea569f082bb848bc6 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 24 Dec 2017 18:37:33 +0100 Subject: [PATCH] All plugins: removed apply settings in constructors as it causes segfaults --- plugins/samplesink/bladerfoutput/bladerfoutput.cpp | 2 -- plugins/samplesink/filesink/filesinkoutput.cpp | 1 - plugins/samplesink/hackrfoutput/hackrfoutput.cpp | 2 -- plugins/samplesink/limesdroutput/limesdroutput.cpp | 2 -- plugins/samplesink/plutosdroutput/plutosdroutput.cpp | 2 -- plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp | 1 - plugins/samplesource/airspy/airspyinput.cpp | 2 -- plugins/samplesource/bladerfinput/bladerfinput.cpp | 2 -- plugins/samplesource/fcdpro/fcdproinput.cpp | 2 -- plugins/samplesource/fcdproplus/fcdproplusinput.cpp | 2 -- plugins/samplesource/filesource/filesourceinput.cpp | 3 +++ plugins/samplesource/hackrfinput/hackrfinput.cpp | 2 -- plugins/samplesource/limesdrinput/limesdrinput.cpp | 2 -- plugins/samplesource/plutosdrinput/plutosdrinput.cpp | 2 -- plugins/samplesource/rtlsdr/rtlsdrinput.cpp | 2 -- plugins/samplesource/sdrplay/sdrplayinput.cpp | 2 -- pluginssrv/samplesource/filesource/CMakeLists.txt | 2 ++ sdrbase/dsp/filerecord.cpp | 2 -- 18 files changed, 5 insertions(+), 30 deletions(-) diff --git a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp index 0a3725619..6e89f8eaa 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp @@ -47,8 +47,6 @@ BladerfOutput::BladerfOutput(DeviceSinkAPI *deviceAPI) : m_sampleSourceFifo.resize(16*BLADERFOUTPUT_BLOCKSIZE); openDevice(); m_deviceAPI->setBuddySharedPtr(&m_sharedParams); - - applySettings(m_settings, true); } BladerfOutput::~BladerfOutput() diff --git a/plugins/samplesink/filesink/filesinkoutput.cpp b/plugins/samplesink/filesink/filesinkoutput.cpp index 61345f4b5..b94535a34 100644 --- a/plugins/samplesink/filesink/filesinkoutput.cpp +++ b/plugins/samplesink/filesink/filesinkoutput.cpp @@ -49,7 +49,6 @@ FileSinkOutput::FileSinkOutput(DeviceSinkAPI *deviceAPI) : m_startingTimeStamp(0), m_masterTimer(deviceAPI->getMasterTimer()) { - applySettings(m_settings, true); } FileSinkOutput::~FileSinkOutput() diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp index f2d38dea0..e613bc793 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp @@ -47,8 +47,6 @@ HackRFOutput::HackRFOutput(DeviceSinkAPI *deviceAPI) : { openDevice(); m_deviceAPI->setBuddySharedPtr(&m_sharedParams); - - applySettings(m_settings, true); } HackRFOutput::~HackRFOutput() diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index a5496cfb7..5ce4dc929 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -55,8 +55,6 @@ LimeSDROutput::LimeSDROutput(DeviceSinkAPI *deviceAPI) : openDevice(); resumeTxBuddies(); resumeRxBuddies(); - - applySettings(m_settings, true, false); } LimeSDROutput::~LimeSDROutput() diff --git a/plugins/samplesink/plutosdroutput/plutosdroutput.cpp b/plugins/samplesink/plutosdroutput/plutosdroutput.cpp index ca771c856..54d6ae071 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutput.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutput.cpp @@ -45,8 +45,6 @@ PlutoSDROutput::PlutoSDROutput(DeviceSinkAPI *deviceAPI) : suspendBuddies(); openDevice(); resumeBuddies(); - - applySettings(m_settings, true); } PlutoSDROutput::~PlutoSDROutput() diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp index e2371b42a..db4e775c2 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp @@ -47,7 +47,6 @@ SDRdaemonSinkOutput::SDRdaemonSinkOutput(DeviceSinkAPI *deviceAPI) : m_startingTimeStamp(0), m_masterTimer(deviceAPI->getMasterTimer()) { - applySettings(m_settings, true); } SDRdaemonSinkOutput::~SDRdaemonSinkOutput() diff --git a/plugins/samplesource/airspy/airspyinput.cpp b/plugins/samplesource/airspy/airspyinput.cpp index 704637763..1e7c82610 100644 --- a/plugins/samplesource/airspy/airspyinput.cpp +++ b/plugins/samplesource/airspy/airspyinput.cpp @@ -52,8 +52,6 @@ AirspyInput::AirspyInput(DeviceSourceAPI *deviceAPI) : sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_deviceAPI->addSink(m_fileSink); - - applySettings(m_settings, true); } AirspyInput::~AirspyInput() diff --git a/plugins/samplesource/bladerfinput/bladerfinput.cpp b/plugins/samplesource/bladerfinput/bladerfinput.cpp index 8d623f6aa..1169e2663 100644 --- a/plugins/samplesource/bladerfinput/bladerfinput.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinput.cpp @@ -53,8 +53,6 @@ BladerfInput::BladerfInput(DeviceSourceAPI *deviceAPI) : m_deviceAPI->addSink(m_fileSink); m_deviceAPI->setBuddySharedPtr(&m_sharedParams); - - applySettings(m_settings, false); } BladerfInput::~BladerfInput() diff --git a/plugins/samplesource/fcdpro/fcdproinput.cpp b/plugins/samplesource/fcdpro/fcdproinput.cpp index 9613f4d52..d99beae57 100644 --- a/plugins/samplesource/fcdpro/fcdproinput.cpp +++ b/plugins/samplesource/fcdpro/fcdproinput.cpp @@ -54,8 +54,6 @@ FCDProInput::FCDProInput(DeviceSourceAPI *deviceAPI) : sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_deviceAPI->addSink(m_fileSink); - - applySettings(m_settings, true); } FCDProInput::~FCDProInput() diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp index 50b4e02f8..d2b10b074 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp @@ -53,8 +53,6 @@ FCDProPlusInput::FCDProPlusInput(DeviceSourceAPI *deviceAPI) : sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_deviceAPI->addSink(m_fileSink); - - applySettings(m_settings, true); } FCDProPlusInput::~FCDProPlusInput() diff --git a/plugins/samplesource/filesource/filesourceinput.cpp b/plugins/samplesource/filesource/filesourceinput.cpp index 9a9090a01..df5b0d0fd 100644 --- a/plugins/samplesource/filesource/filesourceinput.cpp +++ b/plugins/samplesource/filesource/filesourceinput.cpp @@ -54,6 +54,9 @@ FileSourceInput::FileSourceInput(DeviceSourceAPI *deviceAPI) : m_startingTimeStamp(0), m_masterTimer(deviceAPI->getMasterTimer()) { + qDebug("FileSourceInput::FileSourceInput: device source engine: %p", m_deviceAPI->getDeviceSourceEngine()); + qDebug("FileSourceInput::FileSourceInput: device source engine message queue: %p", m_deviceAPI->getDeviceEngineInputMessageQueue()); + qDebug("FileSourceInput::FileSourceInput: device source: %p", m_deviceAPI->getDeviceSourceEngine()->getSource()); } FileSourceInput::~FileSourceInput() diff --git a/plugins/samplesource/hackrfinput/hackrfinput.cpp b/plugins/samplesource/hackrfinput/hackrfinput.cpp index 36706427e..304f99a22 100644 --- a/plugins/samplesource/hackrfinput/hackrfinput.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinput.cpp @@ -56,8 +56,6 @@ HackRFInput::HackRFInput(DeviceSourceAPI *deviceAPI) : m_deviceAPI->addSink(m_fileSink); m_deviceAPI->setBuddySharedPtr(&m_sharedParams); - - applySettings(m_settings, true); } HackRFInput::~HackRFInput() diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp index a2e7357fd..f34fe1562 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -61,8 +61,6 @@ LimeSDRInput::LimeSDRInput(DeviceSourceAPI *deviceAPI) : sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_deviceAPI->addSink(m_fileSink); - - applySettings(m_settings, true, false); } LimeSDRInput::~LimeSDRInput() diff --git a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp index f075136be..518296c83 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp @@ -52,8 +52,6 @@ PlutoSDRInput::PlutoSDRInput(DeviceSourceAPI *deviceAPI) : sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_deviceAPI->addSink(m_fileSink); - - applySettings(m_settings, true); } PlutoSDRInput::~PlutoSDRInput() diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp index c3fb4510b..57e43ce9c 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp @@ -59,8 +59,6 @@ RTLSDRInput::RTLSDRInput(DeviceSourceAPI *deviceAPI) : sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_deviceAPI->addSink(m_fileSink); - - applySettings(m_settings, true); } RTLSDRInput::~RTLSDRInput() diff --git a/plugins/samplesource/sdrplay/sdrplayinput.cpp b/plugins/samplesource/sdrplay/sdrplayinput.cpp index c7bf8cd27..0f01613c4 100644 --- a/plugins/samplesource/sdrplay/sdrplayinput.cpp +++ b/plugins/samplesource/sdrplay/sdrplayinput.cpp @@ -53,8 +53,6 @@ SDRPlayInput::SDRPlayInput(DeviceSourceAPI *deviceAPI) : sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_deviceAPI->addSink(m_fileSink); - - applySettings(m_settings, true, true); } SDRPlayInput::~SDRPlayInput() diff --git a/pluginssrv/samplesource/filesource/CMakeLists.txt b/pluginssrv/samplesource/filesource/CMakeLists.txt index 2c408e6e6..f344b3bbc 100644 --- a/pluginssrv/samplesource/filesource/CMakeLists.txt +++ b/pluginssrv/samplesource/filesource/CMakeLists.txt @@ -7,12 +7,14 @@ set(filesource_SOURCES ${PLUGIN_PREFIX}/filesourceinput.cpp ${PLUGIN_PREFIX}/filesourceplugin.cpp ${PLUGIN_PREFIX}/filesourcethread.cpp + ${PLUGIN_PREFIX}/filesourcesettings.cpp ) set(filesource_HEADERS ${PLUGIN_PREFIX}/filesourceinput.h ${PLUGIN_PREFIX}/filesourceplugin.h ${PLUGIN_PREFIX}/filesourcethread.h + ${PLUGIN_PREFIX}/filesourcesettings.h ) include_directories( diff --git a/sdrbase/dsp/filerecord.cpp b/sdrbase/dsp/filerecord.cpp index b867dd385..f0f2fd3e8 100644 --- a/sdrbase/dsp/filerecord.cpp +++ b/sdrbase/dsp/filerecord.cpp @@ -95,8 +95,6 @@ void FileRecord::stopRecording() bool FileRecord::handleMessage(const Message& message) { - qDebug() << "FileRecord::handleMessage"; - if (DSPSignalNotification::match(message)) { DSPSignalNotification& notif = (DSPSignalNotification&) message;