VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-29 16:26:47 -04:00
Code Issues Projects Releases Wiki Activity

All plugins: removed apply settings in constructors as it causes segfaults

Browse Source
This commit is contained in:
f4exb 2017-12-24 18:37:33 +01:00
parent 063eff4204
commit b127182062
18 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/samplesink/bladerfoutput/bladerfoutput.cpp
View File

@ -47,8 +47,6 @@ BladerfOutput::BladerfOutput(DeviceSinkAPI *deviceAPI) :
m_sampleSourceFifo.resize(16*BLADERFOUTPUT_BLOCKSIZE); m_sampleSourceFifo.resize(16*BLADERFOUTPUT_BLOCKSIZE);
openDevice(); openDevice();
m_deviceAPI->setBuddySharedPtr(&m_sharedParams); m_deviceAPI->setBuddySharedPtr(&m_sharedParams);
applySettings(m_settings, true);
} }
BladerfOutput::~BladerfOutput() BladerfOutput::~BladerfOutput()

1
plugins/samplesink/filesink/filesinkoutput.cpp
View File

@ -49,7 +49,6 @@ FileSinkOutput::FileSinkOutput(DeviceSinkAPI *deviceAPI) :
m_startingTimeStamp(0), m_startingTimeStamp(0),
m_masterTimer(deviceAPI->getMasterTimer()) m_masterTimer(deviceAPI->getMasterTimer())
{ {
applySettings(m_settings, true);
} }
FileSinkOutput::~FileSinkOutput() FileSinkOutput::~FileSinkOutput()

2
plugins/samplesink/hackrfoutput/hackrfoutput.cpp
View File

@ -47,8 +47,6 @@ HackRFOutput::HackRFOutput(DeviceSinkAPI *deviceAPI) :
{ {
openDevice(); openDevice();
m_deviceAPI->setBuddySharedPtr(&m_sharedParams); m_deviceAPI->setBuddySharedPtr(&m_sharedParams);
applySettings(m_settings, true);
} }
HackRFOutput::~HackRFOutput() HackRFOutput::~HackRFOutput()

2
plugins/samplesink/limesdroutput/limesdroutput.cpp
View File

@ -55,8 +55,6 @@ LimeSDROutput::LimeSDROutput(DeviceSinkAPI *deviceAPI) :
openDevice(); openDevice();
resumeTxBuddies(); resumeTxBuddies();
resumeRxBuddies(); resumeRxBuddies();
applySettings(m_settings, true, false);
} }
LimeSDROutput::~LimeSDROutput() LimeSDROutput::~LimeSDROutput()

2
plugins/samplesink/plutosdroutput/plutosdroutput.cpp
View File

@ -45,8 +45,6 @@ PlutoSDROutput::PlutoSDROutput(DeviceSinkAPI *deviceAPI) :
suspendBuddies(); suspendBuddies();
openDevice(); openDevice();
resumeBuddies(); resumeBuddies();
applySettings(m_settings, true);
} }
PlutoSDROutput::~PlutoSDROutput() PlutoSDROutput::~PlutoSDROutput()

1
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp
View File

@ -47,7 +47,6 @@ SDRdaemonSinkOutput::SDRdaemonSinkOutput(DeviceSinkAPI *deviceAPI) :
m_startingTimeStamp(0), m_startingTimeStamp(0),
m_masterTimer(deviceAPI->getMasterTimer()) m_masterTimer(deviceAPI->getMasterTimer())
{ {
applySettings(m_settings, true);
} }
SDRdaemonSinkOutput::~SDRdaemonSinkOutput() SDRdaemonSinkOutput::~SDRdaemonSinkOutput()

2
plugins/samplesource/airspy/airspyinput.cpp
View File

@ -52,8 +52,6 @@ AirspyInput::AirspyInput(DeviceSourceAPI *deviceAPI) :
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
applySettings(m_settings, true);
} }
AirspyInput::~AirspyInput() AirspyInput::~AirspyInput()

2
plugins/samplesource/bladerfinput/bladerfinput.cpp
View File

@ -53,8 +53,6 @@ BladerfInput::BladerfInput(DeviceSourceAPI *deviceAPI) :
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
m_deviceAPI->setBuddySharedPtr(&m_sharedParams); m_deviceAPI->setBuddySharedPtr(&m_sharedParams);
applySettings(m_settings, false);
} }
BladerfInput::~BladerfInput() BladerfInput::~BladerfInput()

2
plugins/samplesource/fcdpro/fcdproinput.cpp
View File

@ -54,8 +54,6 @@ FCDProInput::FCDProInput(DeviceSourceAPI *deviceAPI) :
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
applySettings(m_settings, true);
} }
FCDProInput::~FCDProInput() FCDProInput::~FCDProInput()

2
plugins/samplesource/fcdproplus/fcdproplusinput.cpp
View File

@ -53,8 +53,6 @@ FCDProPlusInput::FCDProPlusInput(DeviceSourceAPI *deviceAPI) :
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
applySettings(m_settings, true);
} }
FCDProPlusInput::~FCDProPlusInput() FCDProPlusInput::~FCDProPlusInput()

3
plugins/samplesource/filesource/filesourceinput.cpp
View File

@ -54,6 +54,9 @@ FileSourceInput::FileSourceInput(DeviceSourceAPI *deviceAPI) :
m_startingTimeStamp(0), m_startingTimeStamp(0),
m_masterTimer(deviceAPI->getMasterTimer()) 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() FileSourceInput::~FileSourceInput()

2
plugins/samplesource/hackrfinput/hackrfinput.cpp
View File

@ -56,8 +56,6 @@ HackRFInput::HackRFInput(DeviceSourceAPI *deviceAPI) :
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
m_deviceAPI->setBuddySharedPtr(&m_sharedParams); m_deviceAPI->setBuddySharedPtr(&m_sharedParams);
applySettings(m_settings, true);
} }
HackRFInput::~HackRFInput() HackRFInput::~HackRFInput()

2
plugins/samplesource/limesdrinput/limesdrinput.cpp
View File

@ -61,8 +61,6 @@ LimeSDRInput::LimeSDRInput(DeviceSourceAPI *deviceAPI) :
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
applySettings(m_settings, true, false);
} }
LimeSDRInput::~LimeSDRInput() LimeSDRInput::~LimeSDRInput()

2
plugins/samplesource/plutosdrinput/plutosdrinput.cpp
View File

@ -52,8 +52,6 @@ PlutoSDRInput::PlutoSDRInput(DeviceSourceAPI *deviceAPI) :
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
applySettings(m_settings, true);
} }
PlutoSDRInput::~PlutoSDRInput() PlutoSDRInput::~PlutoSDRInput()

2
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
View File

@ -59,8 +59,6 @@ RTLSDRInput::RTLSDRInput(DeviceSourceAPI *deviceAPI) :
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
applySettings(m_settings, true);
} }
RTLSDRInput::~RTLSDRInput() RTLSDRInput::~RTLSDRInput()

2
plugins/samplesource/sdrplay/sdrplayinput.cpp
View File

@ -53,8 +53,6 @@ SDRPlayInput::SDRPlayInput(DeviceSourceAPI *deviceAPI) :
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
applySettings(m_settings, true, true);
} }
SDRPlayInput::~SDRPlayInput() SDRPlayInput::~SDRPlayInput()

2
pluginssrv/samplesource/filesource/CMakeLists.txt
View File

@ -7,12 +7,14 @@ set(filesource_SOURCES
${PLUGIN_PREFIX}/filesourceinput.cpp ${PLUGIN_PREFIX}/filesourceinput.cpp
${PLUGIN_PREFIX}/filesourceplugin.cpp ${PLUGIN_PREFIX}/filesourceplugin.cpp
${PLUGIN_PREFIX}/filesourcethread.cpp ${PLUGIN_PREFIX}/filesourcethread.cpp
${PLUGIN_PREFIX}/filesourcesettings.cpp
) )
set(filesource_HEADERS set(filesource_HEADERS
${PLUGIN_PREFIX}/filesourceinput.h ${PLUGIN_PREFIX}/filesourceinput.h
${PLUGIN_PREFIX}/filesourceplugin.h ${PLUGIN_PREFIX}/filesourceplugin.h
${PLUGIN_PREFIX}/filesourcethread.h ${PLUGIN_PREFIX}/filesourcethread.h
${PLUGIN_PREFIX}/filesourcesettings.h
) )
include_directories( include_directories(

2
sdrbase/dsp/filerecord.cpp
View File

@ -95,8 +95,6 @@ void FileRecord::stopRecording()
bool FileRecord::handleMessage(const Message& message) bool FileRecord::handleMessage(const Message& message)
{ {
qDebug() << "FileRecord::handleMessage";
if (DSPSignalNotification::match(message)) if (DSPSignalNotification::match(message))
{ {
DSPSignalNotification& notif = (DSPSignalNotification&) message; DSPSignalNotification& notif = (DSPSignalNotification&) message;