mirror of https://github.com/f4exb/sdrangel.git
Device source API: use more meaningful names for get/set sample source
This commit is contained in:
parent
1c9f11a5dc
commit
289fc2a89f
|
@ -39,7 +39,7 @@ AirspyGui::AirspyGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
|
||||||
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
|
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
|
||||||
{
|
{
|
||||||
m_sampleSource = new AirspyInput(m_deviceAPI);
|
m_sampleSource = new AirspyInput(m_deviceAPI);
|
||||||
m_deviceAPI->setSource(m_sampleSource);
|
m_deviceAPI->setSampleSource(m_sampleSource);
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
||||||
|
|
|
@ -38,7 +38,7 @@ BladerfInputGui::BladerfInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
|
||||||
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
|
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
|
||||||
{
|
{
|
||||||
m_sampleSource = new BladerfInput(m_deviceAPI);
|
m_sampleSource = new BladerfInput(m_deviceAPI);
|
||||||
m_deviceAPI->setSource(m_sampleSource);
|
m_deviceAPI->setSampleSource(m_sampleSource);
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
||||||
|
|
|
@ -35,7 +35,7 @@ FCDProGui::FCDProGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
|
||||||
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
|
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
|
||||||
{
|
{
|
||||||
m_sampleSource = new FCDProInput(m_deviceAPI);
|
m_sampleSource = new FCDProInput(m_deviceAPI);
|
||||||
m_deviceAPI->setSource(m_sampleSource);
|
m_deviceAPI->setSampleSource(m_sampleSource);
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
||||||
|
|
|
@ -36,7 +36,7 @@ FCDProPlusGui::FCDProPlusGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
|
||||||
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
|
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
|
||||||
{
|
{
|
||||||
m_sampleSource = new FCDProPlusInput(m_deviceAPI);
|
m_sampleSource = new FCDProPlusInput(m_deviceAPI);
|
||||||
m_deviceAPI->setSource(m_sampleSource);
|
m_deviceAPI->setSampleSource(m_sampleSource);
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ FileSourceGui::FileSourceGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
|
||||||
|
|
||||||
m_sampleSource = new FileSourceInput(m_deviceAPI);
|
m_sampleSource = new FileSourceInput(m_deviceAPI);
|
||||||
connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
|
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);
|
connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,7 @@ HackRFInputGui::HackRFInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
|
||||||
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
|
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
|
||||||
{
|
{
|
||||||
m_sampleSource = new HackRFInput(m_deviceAPI);
|
m_sampleSource = new HackRFInput(m_deviceAPI);
|
||||||
m_deviceAPI->setSource(m_sampleSource);
|
m_deviceAPI->setSampleSource(m_sampleSource);
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
||||||
|
|
|
@ -42,7 +42,7 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceSourceAPI *deviceAPI, QWidget* parent) :
|
||||||
{
|
{
|
||||||
m_limeSDRInput = new LimeSDRInput(m_deviceAPI);
|
m_limeSDRInput = new LimeSDRInput(m_deviceAPI);
|
||||||
m_sampleSource = (DeviceSampleSource *) m_limeSDRInput;
|
m_sampleSource = (DeviceSampleSource *) m_limeSDRInput;
|
||||||
m_deviceAPI->setSource(m_sampleSource);
|
m_deviceAPI->setSampleSource(m_sampleSource);
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent)
|
||||||
m_statusCounter(0)
|
m_statusCounter(0)
|
||||||
{
|
{
|
||||||
m_sampleSource = new PlutoSDRInput(m_deviceAPI);
|
m_sampleSource = new PlutoSDRInput(m_deviceAPI);
|
||||||
m_deviceAPI->setSource(m_sampleSource);
|
m_deviceAPI->setSampleSource(m_sampleSource);
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
||||||
|
|
|
@ -37,7 +37,7 @@ RTLSDRGui::RTLSDRGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
|
||||||
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
|
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
|
||||||
{
|
{
|
||||||
m_sampleSource = new RTLSDRInput(m_deviceAPI);
|
m_sampleSource = new RTLSDRInput(m_deviceAPI);
|
||||||
m_deviceAPI->setSource(m_sampleSource);
|
m_deviceAPI->setSampleSource(m_sampleSource);
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
||||||
|
|
|
@ -99,7 +99,7 @@ SDRdaemonSourceGui::SDRdaemonSourceGui(DeviceSourceAPI *deviceAPI, QWidget* pare
|
||||||
|
|
||||||
m_sampleSource = new SDRdaemonSourceInput(m_deviceAPI);
|
m_sampleSource = new SDRdaemonSourceInput(m_deviceAPI);
|
||||||
connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
|
connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
|
||||||
m_deviceAPI->setSource(m_sampleSource);
|
m_deviceAPI->setSampleSource(m_sampleSource);
|
||||||
|
|
||||||
displaySettings();
|
displaySettings();
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ SDRPlayGui::SDRPlayGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
|
||||||
m_deviceAPI(deviceAPI)
|
m_deviceAPI(deviceAPI)
|
||||||
{
|
{
|
||||||
m_sampleSource = new SDRPlayInput(m_deviceAPI);
|
m_sampleSource = new SDRPlayInput(m_deviceAPI);
|
||||||
m_deviceAPI->setSource(m_sampleSource);
|
m_deviceAPI->setSampleSource(m_sampleSource);
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
||||||
|
|
|
@ -68,12 +68,12 @@ void DeviceSourceAPI::removeThreadedSink(ThreadedBasebandSampleSink* sink)
|
||||||
m_deviceSourceEngine->removeThreadedSink(sink);
|
m_deviceSourceEngine->removeThreadedSink(sink);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DeviceSourceAPI::setSource(DeviceSampleSource* source)
|
void DeviceSourceAPI::setSampleSource(DeviceSampleSource* source)
|
||||||
{
|
{
|
||||||
m_deviceSourceEngine->setSource(source);
|
m_deviceSourceEngine->setSource(source);
|
||||||
}
|
}
|
||||||
|
|
||||||
DeviceSampleSource *DeviceSourceAPI::getSource()
|
DeviceSampleSource *DeviceSourceAPI::getSampleSource()
|
||||||
{
|
{
|
||||||
return m_deviceSourceEngine->getSource();
|
return m_deviceSourceEngine->getSource();
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,8 +49,8 @@ public:
|
||||||
void removeSink(BasebandSampleSink* sink); //!< Remove a sample sink from device engine
|
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 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 removeThreadedSink(ThreadedBasebandSampleSink* sink); //!< Remove a sample sink that runs on its own thread from device engine
|
||||||
void setSource(DeviceSampleSource* source); //!< Set device sample source
|
void setSampleSource(DeviceSampleSource* source); //!< Set device sample source
|
||||||
DeviceSampleSource *getSource(); //!< Return pointer to the device sample source
|
DeviceSampleSource *getSampleSource(); //!< Return pointer to the device sample source
|
||||||
bool initAcquisition(); //!< Initialize device engine acquisition sequence
|
bool initAcquisition(); //!< Initialize device engine acquisition sequence
|
||||||
bool startAcquisition(); //!< Start device engine acquisition sequence
|
bool startAcquisition(); //!< Start device engine acquisition sequence
|
||||||
void stopAcquisition(); //!< Stop device engine acquisition sequence
|
void stopAcquisition(); //!< Stop device engine acquisition sequence
|
||||||
|
|
Loading…
Reference in New Issue