VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Device source API: use more meaningful names for get/set sample source

This commit is contained in:
f4exb 2017-09-15 08:45:22 +02:00
parent 1c9f11a5dc
commit 289fc2a89f
13 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ AirspyGui::AirspyGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{
m_sampleSource = new AirspyInput(m_deviceAPI);
m_deviceAPI->setSource(m_sampleSource);
m_deviceAPI->setSampleSource(m_sampleSource);
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));

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

@ -38,7 +38,7 @@ BladerfInputGui::BladerfInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{
m_sampleSource = new BladerfInput(m_deviceAPI);
m_deviceAPI->setSource(m_sampleSource);
m_deviceAPI->setSampleSource(m_sampleSource);
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));

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

@ -35,7 +35,7 @@ FCDProGui::FCDProGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{
m_sampleSource = new FCDProInput(m_deviceAPI);
m_deviceAPI->setSource(m_sampleSource);
m_deviceAPI->setSampleSource(m_sampleSource);
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));

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

@ -36,7 +36,7 @@ FCDProPlusGui::FCDProPlusGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{
m_sampleSource = new FCDProPlusInput(m_deviceAPI);
m_deviceAPI->setSource(m_sampleSource);
m_deviceAPI->setSampleSource(m_sampleSource);
ui->setupUi(this);

2
plugins/samplesource/filesource/filesourcegui.cpp
View File

@ -68,7 +68,7 @@ FileSourceGui::FileSourceGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_sampleSource = new FileSourceInput(m_deviceAPI);
connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
m_deviceAPI->setSource(m_sampleSource);
m_deviceAPI->setSampleSource(m_sampleSource);
connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
}

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

@ -41,7 +41,7 @@ HackRFInputGui::HackRFInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{
m_sampleSource = new HackRFInput(m_deviceAPI);
m_deviceAPI->setSource(m_sampleSource);
m_deviceAPI->setSampleSource(m_sampleSource);
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));

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

@ -42,7 +42,7 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceSourceAPI *deviceAPI, QWidget* parent) :
{
m_limeSDRInput = new LimeSDRInput(m_deviceAPI);
m_sampleSource = (DeviceSampleSource *) m_limeSDRInput;
m_deviceAPI->setSource(m_sampleSource);
m_deviceAPI->setSampleSource(m_sampleSource);
ui->setupUi(this);

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

@ -41,7 +41,7 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent)
m_statusCounter(0)
{
m_sampleSource = new PlutoSDRInput(m_deviceAPI);
m_deviceAPI->setSource(m_sampleSource);
m_deviceAPI->setSampleSource(m_sampleSource);
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));

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

@ -37,7 +37,7 @@ RTLSDRGui::RTLSDRGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{
m_sampleSource = new RTLSDRInput(m_deviceAPI);
m_deviceAPI->setSource(m_sampleSource);
m_deviceAPI->setSampleSource(m_sampleSource);
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));

2
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
View File

@ -99,7 +99,7 @@ SDRdaemonSourceGui::SDRdaemonSourceGui(DeviceSourceAPI *deviceAPI, QWidget* pare
m_sampleSource = new SDRdaemonSourceInput(m_deviceAPI);
connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
m_deviceAPI->setSource(m_sampleSource);
m_deviceAPI->setSampleSource(m_sampleSource);
displaySettings();

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

@ -34,7 +34,7 @@ SDRPlayGui::SDRPlayGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_deviceAPI(deviceAPI)
{
m_sampleSource = new SDRPlayInput(m_deviceAPI);
m_deviceAPI->setSource(m_sampleSource);
m_deviceAPI->setSampleSource(m_sampleSource);
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));

4
sdrbase/device/devicesourceapi.cpp
View File

@ -68,12 +68,12 @@ void DeviceSourceAPI::removeThreadedSink(ThreadedBasebandSampleSink* sink)
m_deviceSourceEngine->removeThreadedSink(sink);
}
void DeviceSourceAPI::setSource(DeviceSampleSource* source)
void DeviceSourceAPI::setSampleSource(DeviceSampleSource* source)
{
m_deviceSourceEngine->setSource(source);
}
DeviceSampleSource *DeviceSourceAPI::getSource()
DeviceSampleSource *DeviceSourceAPI::getSampleSource()
{
return m_deviceSourceEngine->getSource();
}

4
sdrbase/device/devicesourceapi.h
View File

@ -49,8 +49,8 @@ public:
void removeSink(BasebandSampleSink* sink); //!< Remove a sample sink from device engine
void addThreadedSink(ThreadedBasebandSampleSink* sink); //!< Add a sample sink that will run on its own thread to device engine
void removeThreadedSink(ThreadedBasebandSampleSink* sink); //!< Remove a sample sink that runs on its own thread from device engine
void setSource(DeviceSampleSource* source); //!< Set device sample source
DeviceSampleSource *getSource(); //!< Return pointer to the device sample source
void setSampleSource(DeviceSampleSource* source); //!< Set device sample source
DeviceSampleSource *getSampleSource(); //!< Return pointer to the device sample source
bool initAcquisition(); //!< Initialize device engine acquisition sequence
bool startAcquisition(); //!< Start device engine acquisition sequence
void stopAcquisition(); //!< Stop device engine acquisition sequence