diff --git a/ReadmeDeveloper.md b/ReadmeDeveloper.md index 356dd52bb..d36902b13 100644 --- a/ReadmeDeveloper.md +++ b/ReadmeDeveloper.md @@ -28,7 +28,7 @@ The existing receiving flow is represented with green boxes. The future Tx flow - The `DownChannelizer`class downsamples further down (or not) the baseband I/Q samples depending on the requirements of the Rx plugin. It cascades the downsampling from the center, left or right half of the baseband in order to fit the Rx plugin bandwidth. It contains the NCO to adjust to the Rx plugin center frequency. - The special `FileSource` plugin reads a file that was recorded using the `FileRecord` class directly into the baseband as there is no downsampling from the sample rate at which the file was recorded. - The baseband I/Q samples can be recorded to a file using the `FileRecord` class - +

Device sample source plugins

At present the following plugins are available: @@ -90,7 +90,7 @@ The `plugins` subdirectory contains the associated plugins used to manage device - `xxxplugin.h/cpp` : Plugin interface - `xxxsettings.h/cpp` : Configuration manager - `xxxthread.h/cpp` : Reading samples - - `xxx.pro` : Qt .pro file for Windows/Android build + - `xxx.pro` : Qt .pro file for Windows/Android build - `channelrx`: Channel handlers: - `demodxxx` : Demodulator internal handler (e.g xxx = demodam) - `xxxdemod.h/cpp` : Demodulator core @@ -116,7 +116,7 @@ The `plugins` subdirectory contains the associated plugins used to manage device - `xxxsinkplugin.h/cpp` : Plugin interface - `xxxsinksettings.h/cpp` : Configuration manager - `xxxsinkthread.h/cpp` : Writing samples - - `xxxsink.pro` : Qt .pro file for Windows/Android build + - `xxxsink.pro` : Qt .pro file for Windows/Android build - `channeltx`: Channel handlers: - `modxxx` : Modulator internal handler (e.g xxx = modam) - `xxxmod.h/cpp` : Modulator core @@ -133,7 +133,7 @@ The `plugins` subdirectory contains the associated plugins used to manage device - `xxxsourcegui.h/cpp` : Interface GUI - `xxxsourceplugin/h/cpp` : Interface plugin manager - `xxxsource.pro` : Qt .pro file for Windows/Android build - +

Device interface and GUI lifecycle

Overview

@@ -149,7 +149,7 @@ The lifecycle of the GUI is controlled from the "Sampling Device Control" device - Stop streaming - Delete the current GUI this will in turn delete the device interface and always close the physical device unless the physical device has a SISO or MIMO architecture (more on that later) - Remove the current device API from the relevant buddies lists. Buddies list are effective only for physical devices with SISO or MIMO architecture (more on that later) - - Create the new device API + - Create the new device API - Add the new device API to the relevant devices APIs buddies list - Creates the new GUI and hence new device interface. This will always open the physical device unless the physical device has a SISO or MIMO architecture @@ -167,7 +167,7 @@ Here is the relevant part of the code (source side) in the `MainWindow::on_sampl PluginInstanceUI *pluginUI = sampleSourceDevice->m_plugin->createSampleSourcePluginInstanceUI(sampleSourceDevice->m_deviceId, &gui, deviceUI->m_deviceSourceAPI); deviceUI->m_deviceSourceAPI->setSampleSourcePluginInstanceUI(pluginUI); deviceUI->m_deviceSourceAPI->setInputGUI(gui, sampleSourceDevice->m_displayName); - +

SISO and MIMO devices support

Some SDR hardware have Rx/Tx capabilities in a SISO or MIMO configuration. That is a physical device can handle more than one I/Q sample flow in either direction. Such devices supported by SDRangel are the following: @@ -175,12 +175,12 @@ Some SDR hardware have Rx/Tx capabilities in a SISO or MIMO configuration. That - SISO full duplex: BladeRF - SISO half duplex: HackRF - MIMO: LimeSDR - + Note that the following would also work for multiple sample channels Rx or Tx only devices but none exists or is supported at this moment. - + In SDRangel there is a complete receiver or transmitter per I/Q sample flow. These transmitters and receivers are visually represented by the Rn and Tn tabs in the main window. They are created and disposed in the way explained in the previous paragraph using the source or sink selection confirmation button. In fact it acts as if each receiver or transmitter was controlled independently. In single input or single output (none at the moment) devices this is a true independence but with SISO or MIMO devices this cannot be the case and although each receiver or transmitter looks like it was handled independently there are things in common that have to be taken into account. For example in all cases the device handle should be unique and opening and closing the device has to be done only once per physical device usage cycle. -This is where the "buddies list" come into play. Receivers exhibit a generic interface in the form of the DeviceSourceAPI class and transmitter have the DeviceSinkAPI with the same role. Through these APIs some information and control can flow between receivers and transmitters. The point is that all receivers and/or transmitters pertaining to the same physical device must "know" each other in order to be able to exchange information or control each other. For this purpose the DeviceSourceAPI or DeviceSinkAPI maintain a list of DeviceSourceAPI siblings and a list of DeviceSinkAPI siblings called "buddies". Thus any multi flow Rx/Tx configuration can be handled. +This is where the "buddies list" come into play. Devices exhibit a generic interface in the form of the DeviceAPI class. Through this API some information and control can flow between receivers and transmitters. The point is that all receivers and/or transmitters pertaining to the same physical device must "know" each other in order to be able to exchange information or control each other. For this purpose the DeviceAPI maintain a list of DeviceAPI siblings called "buddies". Thus any multi flow Rx/Tx configuration can be handled. The exact behaviour of these coupled receivers and/or transmitters is dependent on the hardware therefore a generic pointer attached to the API can be used to convey any kind of class or structure tailored for the exact hardware use case. Through this structure the state of the receiver or transmitter can be exposed therefore there is one structure per receiver and transmitter in the device interface. This structure may contain pointers to common areas (dynamically allocated) related to the physical device. One such "area" is the device handle which is present in all cases. @@ -193,24 +193,24 @@ The degree of entanglement between the different coupled flows in a single hardw - independent Rx and Tx center frequencies - independent Gain, bandwidth, ... - only the device handle and indication of the presence of the XB200 accessory board is common - + - HackRF: this is a half duplex device. Rx and Tx might appear as tightly coupled but since you can use only one or the other then in fact you can control them differently as this is done in sequence. In fact only the common device handle has to be taken care of - + - LimeSDR: dual Rx and dual Tx in MIMO configuration. This implies tightly coupling between receivers on one part and transmitter on the other. But in the case of the LimeSDR (LMS7002M chip) there is even a tight coupling between Rx and Tx parts since the ADC/DAC clock is in common which means both have the same base sample rate that can only be varied by the mean of the hardware decimators and interpolators. This means: - Rx share the same sample rate, hardware decimation factor and center frequency - Tx share the same sample rate, hardware interpolation factor and center frequency - Rx and Tx share the same base sample rate (decimation/interpolation apart) - Independent Rx and Tx center frequencies - Independent gains, bandwidths, etc... per Rx or Tx channel - + The openDevice and closeDevice methods of the device interface are designed specifically for each physical device type in order to manage the common resources appropriately at receiver or transmitter construction and destruction. For example opening and closing the device and the related device handle is always done this way: - openDevice: - check if there is any "buddy" present in one of the lists - if there is a buddy then grab the device handle and use it for next operations - if there is no buddy open the device and store the handle in the common area so it will be visible for future buddies - + - closeDevice: - if there are no buddies then effectively close the device else just zero out the own copy of the device handle - + Exchange of dynamic information when necessary such as sample rate or center frequency is done by message passing between buddies. diff --git a/devices/limesdr/devicelimesdrparam.h b/devices/limesdr/devicelimesdrparam.h index dfb58aead..60c919d41 100644 --- a/devices/limesdr/devicelimesdrparam.h +++ b/devices/limesdr/devicelimesdrparam.h @@ -24,7 +24,7 @@ /** * This structure refers to one physical device shared among parties (logical devices represented by - * the DeviceSinkAPI or DeviceSourceAPI). + * the DeviceAPI with single Rx or Tx stream type). * It allows storing information on the common resources in one place and is shared among participants. * There is only one copy that is constructed by the first participant and destroyed by the last. * A participant knows it is the first or last by checking the lists of buddies (Rx + Tx). diff --git a/devices/plutosdr/deviceplutosdrparams.h b/devices/plutosdr/deviceplutosdrparams.h index 12b220e55..38ea10eae 100644 --- a/devices/plutosdr/deviceplutosdrparams.h +++ b/devices/plutosdr/deviceplutosdrparams.h @@ -26,7 +26,7 @@ class DEVICES_API DevicePlutoSDRBox; /** * This structure refers to one physical device shared among parties (logical devices represented by - * the DeviceSinkAPI or DeviceSourceAPI). + * the DeviceAPI with single Rx or Tx stream type). * It allows storing information on the common resources in one place and is shared among participants. * There is only one copy that is constructed by the first participant and destroyed by the last. * A participant knows it is the first or last by checking the lists of buddies (Rx + Tx). diff --git a/devices/soapysdr/devicesoapysdrparams.h b/devices/soapysdr/devicesoapysdrparams.h index abf39ad79..249c0c7e3 100644 --- a/devices/soapysdr/devicesoapysdrparams.h +++ b/devices/soapysdr/devicesoapysdrparams.h @@ -28,7 +28,7 @@ /** * This structure refers to one physical device shared among parties (logical devices represented by - * the DeviceSinkAPI or DeviceSourceAPI). + * the DeviceAPI with single Rx or Tx stream type). * It allows storing information on the common resources in one place and is shared among participants. * There is only one copy that is constructed by the first participant and destroyed by the last. * A participant knows it is the first or last by checking the lists of buddies (Rx + Tx). diff --git a/plugins/channelrx/chanalyzer/chanalyzer.cpp b/plugins/channelrx/chanalyzer/chanalyzer.cpp index 5ecbdf2bb..8517d8d23 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzer.cpp @@ -19,7 +19,7 @@ #include #include -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "audio/audiooutput.h" #include "dsp/threadedbasebandsamplesink.h" #include "dsp/downchannelizer.h" @@ -32,7 +32,7 @@ MESSAGE_CLASS_DEFINITION(ChannelAnalyzer::MsgReportChannelSampleRateChanged, Mes const QString ChannelAnalyzer::m_channelIdURI = "sdrangel.channel.chanalyzer"; const QString ChannelAnalyzer::m_channelId = "ChannelAnalyzer"; -ChannelAnalyzer::ChannelAnalyzer(DeviceSourceAPI *deviceAPI) : +ChannelAnalyzer::ChannelAnalyzer(DeviceAPI *deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_sampleSink(0), @@ -60,14 +60,14 @@ ChannelAnalyzer::ChannelAnalyzer(DeviceSourceAPI *deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); } ChannelAnalyzer::~ChannelAnalyzer() { - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; delete SSBFilter; diff --git a/plugins/channelrx/chanalyzer/chanalyzer.h b/plugins/channelrx/chanalyzer/chanalyzer.h index 512525ec0..4470d007e 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.h +++ b/plugins/channelrx/chanalyzer/chanalyzer.h @@ -37,7 +37,7 @@ #define ssbFftLen 1024 -class DeviceSourceAPI; +class DeviceAPI; class ThreadedBasebandSampleSink; class DownChannelizer; @@ -106,7 +106,7 @@ public: { } }; - ChannelAnalyzer(DeviceSourceAPI *deviceAPI); + ChannelAnalyzer(DeviceAPI *deviceAPI); virtual ~ChannelAnalyzer(); virtual void destroy() { delete this; } void setSampleSink(BasebandSampleSink* sampleSink) { m_sampleSink = sampleSink; } @@ -148,7 +148,7 @@ public: static const QString m_channelId; private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; ChannelAnalyzerSettings m_settings; diff --git a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp index 7f34e8cec..bddea090f 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp @@ -55,12 +55,12 @@ PluginInstanceGUI* ChannelAnalyzerPlugin::createRxChannelGUI(DeviceUISet *device return ChannelAnalyzerGUI::create(m_pluginAPI, deviceUISet, rxChannel); } -BasebandSampleSink* ChannelAnalyzerPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* ChannelAnalyzerPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new ChannelAnalyzer(deviceAPI); } -ChannelSinkAPI* ChannelAnalyzerPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* ChannelAnalyzerPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new ChannelAnalyzer(deviceAPI); } diff --git a/plugins/channelrx/chanalyzer/chanalyzerplugin.h b/plugins/channelrx/chanalyzer/chanalyzerplugin.h index d6f965f75..4234d3ac5 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerplugin.h +++ b/plugins/channelrx/chanalyzer/chanalyzerplugin.h @@ -37,8 +37,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp index ad7974c00..7bb417e75 100644 --- a/plugins/channelrx/demodam/amdemod.cpp +++ b/plugins/channelrx/demodam/amdemod.cpp @@ -37,7 +37,7 @@ #include "dsp/threadedbasebandsamplesink.h" #include "dsp/dspcommands.h" #include "dsp/fftfilt.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "util/db.h" #include "util/stepfunctions.h" @@ -48,7 +48,7 @@ const QString AMDemod::m_channelIdURI = "sdrangel.channel.amdemod"; const QString AMDemod::m_channelId = "AMDemod"; const int AMDemod::m_udpBlockSize = 512; -AMDemod::AMDemod(DeviceSourceAPI *deviceAPI) : +AMDemod::AMDemod(DeviceAPI *deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_inputSampleRate(48000), @@ -83,8 +83,8 @@ AMDemod::AMDemod(DeviceSourceAPI *deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); m_pllFilt.create(101, m_audioSampleRate, 200.0); m_pll.computeCoefficients(0.05, 0.707, 1000); @@ -99,8 +99,8 @@ AMDemod::~AMDemod() disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); delete m_networkManager; DSPEngine::instance()->getAudioDeviceManager()->removeAudioSink(&m_audioFifo); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; delete DSBFilter; diff --git a/plugins/channelrx/demodam/amdemod.h b/plugins/channelrx/demodam/amdemod.h index 635e46734..a217742c6 100644 --- a/plugins/channelrx/demodam/amdemod.h +++ b/plugins/channelrx/demodam/amdemod.h @@ -40,7 +40,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class DownChannelizer; class ThreadedBasebandSampleSink; class fftfilt; @@ -94,7 +94,7 @@ public: { } }; - AMDemod(DeviceSourceAPI *deviceAPI); + AMDemod(DeviceAPI *deviceAPI); ~AMDemod(); virtual void destroy() { delete this; } @@ -167,7 +167,7 @@ private: RSRunning }; - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; diff --git a/plugins/channelrx/demodam/amdemodplugin.cpp b/plugins/channelrx/demodam/amdemodplugin.cpp index 7198ba782..8c3248198 100644 --- a/plugins/channelrx/demodam/amdemodplugin.cpp +++ b/plugins/channelrx/demodam/amdemodplugin.cpp @@ -49,12 +49,12 @@ PluginInstanceGUI* AMDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, B } #endif -BasebandSampleSink* AMDemodPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* AMDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new AMDemod(deviceAPI); } -ChannelSinkAPI* AMDemodPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* AMDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new AMDemod(deviceAPI); } diff --git a/plugins/channelrx/demodam/amdemodplugin.h b/plugins/channelrx/demodam/amdemodplugin.h index 1276abfbf..a21c7f9fc 100644 --- a/plugins/channelrx/demodam/amdemodplugin.h +++ b/plugins/channelrx/demodam/amdemodplugin.h @@ -36,8 +36,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodatv/atvdemod.cpp b/plugins/channelrx/demodatv/atvdemod.cpp index 47afd06f5..618612691 100644 --- a/plugins/channelrx/demodatv/atvdemod.cpp +++ b/plugins/channelrx/demodatv/atvdemod.cpp @@ -25,7 +25,7 @@ #include "dsp/dspengine.h" #include "dsp/downchannelizer.h" #include "dsp/threadedbasebandsamplesink.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "atvdemod.h" @@ -39,7 +39,7 @@ const QString ATVDemod::m_channelIdURI = "sdrangel.channel.demodatv"; const QString ATVDemod::m_channelId = "ATVDemod"; const int ATVDemod::m_ssbFftLen = 1024; -ATVDemod::ATVDemod(DeviceSourceAPI *deviceAPI) : +ATVDemod::ATVDemod(DeviceAPI *deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_scopeSink(0), @@ -90,16 +90,16 @@ ATVDemod::ATVDemod(DeviceSourceAPI *deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); connect(m_channelizer, SIGNAL(inputSampleRateChanged()), this, SLOT(channelSampleRateChanged())); } ATVDemod::~ATVDemod() { - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; delete m_DSBFilter; diff --git a/plugins/channelrx/demodatv/atvdemod.h b/plugins/channelrx/demodatv/atvdemod.h index 035ab9905..7e4db2eee 100644 --- a/plugins/channelrx/demodatv/atvdemod.h +++ b/plugins/channelrx/demodatv/atvdemod.h @@ -40,7 +40,7 @@ #include "util/message.h" #include "gui/tvscreen.h" -class DeviceSourceAPI; +class DeviceAPI; class ThreadedBasebandSampleSink; class DownChannelizer; @@ -192,7 +192,7 @@ public: { } }; - ATVDemod(DeviceSourceAPI *deviceAPI); + ATVDemod(DeviceAPI *deviceAPI); ~ATVDemod(); virtual void destroy() { delete this; } void setScopeSink(BasebandSampleSink* scopeSink) { m_scopeSink = scopeSink; } @@ -405,7 +405,7 @@ private: bool m_start; }; - DeviceSourceAPI* m_deviceAPI; + DeviceAPI* m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; diff --git a/plugins/channelrx/demodatv/atvdemodplugin.cpp b/plugins/channelrx/demodatv/atvdemodplugin.cpp index 8f15fb69e..b457df02c 100644 --- a/plugins/channelrx/demodatv/atvdemodplugin.cpp +++ b/plugins/channelrx/demodatv/atvdemodplugin.cpp @@ -60,12 +60,12 @@ PluginInstanceGUI* ATVDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, return ATVDemodGUI::create(m_ptrPluginAPI, deviceUISet, rxChannel); } -BasebandSampleSink* ATVDemodPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* ATVDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new ATVDemod(deviceAPI); } -ChannelSinkAPI* ATVDemodPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* ATVDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new ATVDemod(deviceAPI); } diff --git a/plugins/channelrx/demodatv/atvdemodplugin.h b/plugins/channelrx/demodatv/atvdemodplugin.h index 3f1820277..afa89eaeb 100644 --- a/plugins/channelrx/demodatv/atvdemodplugin.h +++ b/plugins/channelrx/demodatv/atvdemodplugin.h @@ -38,8 +38,8 @@ public: void initPlugin(PluginAPI* ptrPluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_ptrPluginDescriptor; diff --git a/plugins/channelrx/demodbfm/bfmdemod.cpp b/plugins/channelrx/demodbfm/bfmdemod.cpp index 6a80ace99..ecaa1605b 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.cpp +++ b/plugins/channelrx/demodbfm/bfmdemod.cpp @@ -37,7 +37,7 @@ #include "dsp/downchannelizer.h" #include "dsp/threadedbasebandsamplesink.h" #include "dsp/dspcommands.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "util/db.h" #include "rdsparser.h" @@ -52,7 +52,7 @@ const QString BFMDemod::m_channelId = "BFMDemod"; const Real BFMDemod::default_deemphasis = 50.0; // 50 us const int BFMDemod::m_udpBlockSize = 512; -BFMDemod::BFMDemod(DeviceSourceAPI *deviceAPI) : +BFMDemod::BFMDemod(DeviceAPI *deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_inputSampleRate(384000), @@ -103,8 +103,8 @@ BFMDemod::BFMDemod(DeviceSourceAPI *deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -117,8 +117,8 @@ BFMDemod::~BFMDemod() DSPEngine::instance()->getAudioDeviceManager()->removeAudioSink(&m_audioFifo); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; delete m_rfFilter; diff --git a/plugins/channelrx/demodbfm/bfmdemod.h b/plugins/channelrx/demodbfm/bfmdemod.h index 24b6a6c74..48f9bb80b 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.h +++ b/plugins/channelrx/demodbfm/bfmdemod.h @@ -44,7 +44,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class ThreadedBasebandSampleSink; class DownChannelizer; @@ -121,7 +121,7 @@ public: { } }; - BFMDemod(DeviceSourceAPI *deviceAPI); + BFMDemod(DeviceAPI *deviceAPI); virtual ~BFMDemod(); virtual void destroy() { delete this; } void setSampleSink(BasebandSampleSink* sampleSink) { m_sampleSink = sampleSink; } @@ -212,7 +212,7 @@ private: RSRunning }; - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; diff --git a/plugins/channelrx/demodbfm/bfmplugin.cpp b/plugins/channelrx/demodbfm/bfmplugin.cpp index 8a1be5092..1200bbf3a 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.cpp +++ b/plugins/channelrx/demodbfm/bfmplugin.cpp @@ -68,12 +68,12 @@ PluginInstanceGUI* BFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, Baseb } #endif -BasebandSampleSink* BFMPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* BFMPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new BFMDemod(deviceAPI); } -ChannelSinkAPI* BFMPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* BFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new BFMDemod(deviceAPI); } diff --git a/plugins/channelrx/demodbfm/bfmplugin.h b/plugins/channelrx/demodbfm/bfmplugin.h index 3569978fa..984a81fa7 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.h +++ b/plugins/channelrx/demodbfm/bfmplugin.h @@ -36,8 +36,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demoddatv/datvdemod.cpp b/plugins/channelrx/demoddatv/datvdemod.cpp index 903fb3a54..36cfe4817 100644 --- a/plugins/channelrx/demoddatv/datvdemod.cpp +++ b/plugins/channelrx/demoddatv/datvdemod.cpp @@ -28,7 +28,7 @@ #include "dsp/downchannelizer.h" #include "dsp/threadedbasebandsamplesink.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" const QString DATVDemod::m_channelIdURI = "sdrangel.channel.demoddatv"; const QString DATVDemod::m_channelId = "DATVDemod"; @@ -36,7 +36,7 @@ const QString DATVDemod::m_channelId = "DATVDemod"; MESSAGE_CLASS_DEFINITION(DATVDemod::MsgConfigureDATVDemod, Message) MESSAGE_CLASS_DEFINITION(DATVDemod::MsgConfigureChannelizer, Message) -DATVDemod::DATVDemod(DeviceSourceAPI *deviceAPI) : +DATVDemod::DATVDemod(DeviceAPI *deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_blnNeedConfigUpdate(false), m_deviceAPI(deviceAPI), @@ -66,8 +66,8 @@ DATVDemod::DATVDemod(DeviceSourceAPI *deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); } DATVDemod::~DATVDemod() @@ -95,8 +95,8 @@ DATVDemod::~DATVDemod() CleanUpDATVFramework(true); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; delete m_objRFFilter; diff --git a/plugins/channelrx/demoddatv/datvdemod.h b/plugins/channelrx/demoddatv/datvdemod.h index 2b3833ee2..842d0ed04 100644 --- a/plugins/channelrx/demoddatv/datvdemod.h +++ b/plugins/channelrx/demoddatv/datvdemod.h @@ -20,7 +20,7 @@ #ifndef INCLUDE_DATVDEMOD_H #define INCLUDE_DATVDEMOD_H -class DeviceSourceAPI; +class DeviceAPI; class ThreadedBasebandSampleSink; class DownChannelizer; @@ -129,7 +129,7 @@ class DATVDemod : public BasebandSampleSink, public ChannelSinkAPI public: - DATVDemod(DeviceSourceAPI *); + DATVDemod(DeviceAPI *); ~DATVDemod(); virtual void destroy() { delete this; } @@ -332,7 +332,7 @@ private: //CONSTELLATION leansdr::datvconstellation *r_scope_symbols; - DeviceSourceAPI* m_deviceAPI; + DeviceAPI* m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp index 94005aa2b..8d5f4d555 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.cpp +++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp @@ -134,7 +134,6 @@ void DATVDemodGUI::onMenuDoubleClicked() { } -//DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceSourceAPI *objDeviceAPI, QWidget* objParent) : DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* objParent) : RollupWidget(objParent), ui(new Ui::DATVDemodGUI), diff --git a/plugins/channelrx/demoddatv/datvdemodplugin.cpp b/plugins/channelrx/demoddatv/datvdemodplugin.cpp index 6d934cc77..7d8f72624 100644 --- a/plugins/channelrx/demoddatv/datvdemodplugin.cpp +++ b/plugins/channelrx/demoddatv/datvdemodplugin.cpp @@ -61,12 +61,12 @@ PluginInstanceGUI* DATVDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, return DATVDemodGUI::create(m_ptrPluginAPI, deviceUISet, rxChannel); } -BasebandSampleSink* DATVDemodPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* DATVDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new DATVDemod(deviceAPI); } -ChannelSinkAPI* DATVDemodPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* DATVDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new DATVDemod(deviceAPI); } diff --git a/plugins/channelrx/demoddatv/datvdemodplugin.h b/plugins/channelrx/demoddatv/datvdemodplugin.h index bdb102f2e..c6019f9c6 100644 --- a/plugins/channelrx/demoddatv/datvdemodplugin.h +++ b/plugins/channelrx/demoddatv/datvdemodplugin.h @@ -39,8 +39,8 @@ public: void initPlugin(PluginAPI* ptrPluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp index 84848ecc8..46ef1b7f8 100644 --- a/plugins/channelrx/demoddsd/dsddemod.cpp +++ b/plugins/channelrx/demoddsd/dsddemod.cpp @@ -38,7 +38,7 @@ #include "dsp/threadedbasebandsamplesink.h" #include "dsp/downchannelizer.h" #include "dsp/dspcommands.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "util/db.h" #include "dsddemod.h" @@ -51,7 +51,7 @@ const QString DSDDemod::m_channelIdURI = "sdrangel.channel.dsddemod"; const QString DSDDemod::m_channelId = "DSDDemod"; const int DSDDemod::m_udpBlockSize = 512; -DSDDemod::DSDDemod(DeviceSourceAPI *deviceAPI) : +DSDDemod::DSDDemod(DeviceAPI *deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_inputSampleRate(48000), @@ -95,8 +95,8 @@ DSDDemod::DSDDemod(DeviceSourceAPI *deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -110,8 +110,8 @@ DSDDemod::~DSDDemod() DSPEngine::instance()->getAudioDeviceManager()->removeAudioSink(&m_audioFifo1); DSPEngine::instance()->getAudioDeviceManager()->removeAudioSink(&m_audioFifo2); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; } diff --git a/plugins/channelrx/demoddsd/dsddemod.h b/plugins/channelrx/demoddsd/dsddemod.h index 8838b85c6..2fb94698b 100644 --- a/plugins/channelrx/demoddsd/dsddemod.h +++ b/plugins/channelrx/demoddsd/dsddemod.h @@ -43,7 +43,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class ThreadedBasebandSampleSink; class DownChannelizer; @@ -96,7 +96,7 @@ public: { } }; - DSDDemod(DeviceSourceAPI *deviceAPI); + DSDDemod(DeviceAPI *deviceAPI); ~DSDDemod(); virtual void destroy() { delete this; } void setScopeXYSink(BasebandSampleSink* sampleSink) { m_scopeXY = sampleSink; } @@ -205,7 +205,7 @@ private: RSRunning }; - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.cpp b/plugins/channelrx/demoddsd/dsddemodplugin.cpp index dba615947..d9362e861 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.cpp +++ b/plugins/channelrx/demoddsd/dsddemodplugin.cpp @@ -68,12 +68,12 @@ PluginInstanceGUI* DSDDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, } #endif -BasebandSampleSink* DSDDemodPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* DSDDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new DSDDemod(deviceAPI); } -ChannelSinkAPI* DSDDemodPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* DSDDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new DSDDemod(deviceAPI); } diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.h b/plugins/channelrx/demoddsd/dsddemodplugin.h index 4a6ad64bb..5722b9ca7 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.h +++ b/plugins/channelrx/demoddsd/dsddemodplugin.h @@ -37,8 +37,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodfreedv/freedvdemod.cpp b/plugins/channelrx/demodfreedv/freedvdemod.cpp index 437c7aaee..2a2188f38 100644 --- a/plugins/channelrx/demodfreedv/freedvdemod.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemod.cpp @@ -35,7 +35,7 @@ #include "dsp/downchannelizer.h" #include "dsp/threadedbasebandsamplesink.h" #include "dsp/dspcommands.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "util/db.h" #include "freedvdemod.h" @@ -144,7 +144,7 @@ void FreeDVDemod::LevelRMS::accumulate(float level) } } -FreeDVDemod::FreeDVDemod(DeviceSourceAPI *deviceAPI) : +FreeDVDemod::FreeDVDemod(DeviceAPI *deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_hiCutoff(6000), @@ -197,8 +197,8 @@ FreeDVDemod::FreeDVDemod(DeviceSourceAPI *deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -210,8 +210,8 @@ FreeDVDemod::~FreeDVDemod() delete m_networkManager; DSPEngine::instance()->getAudioDeviceManager()->removeAudioSink(&m_audioFifo); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; delete SSBFilter; diff --git a/plugins/channelrx/demodfreedv/freedvdemod.h b/plugins/channelrx/demodfreedv/freedvdemod.h index 61a287c87..e0cbc8e9c 100644 --- a/plugins/channelrx/demodfreedv/freedvdemod.h +++ b/plugins/channelrx/demodfreedv/freedvdemod.h @@ -41,7 +41,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class ThreadedBasebandSampleSink; class DownChannelizer; @@ -111,7 +111,7 @@ public: { } }; - FreeDVDemod(DeviceSourceAPI *deviceAPI); + FreeDVDemod(DeviceAPI *deviceAPI); virtual ~FreeDVDemod(); virtual void destroy() { delete this; } void setSampleSink(BasebandSampleSink* sampleSink) { m_sampleSink = sampleSink; } @@ -342,7 +342,7 @@ private: { } }; - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; FreeDVDemodSettings m_settings; diff --git a/plugins/channelrx/demodfreedv/freedvplugin.cpp b/plugins/channelrx/demodfreedv/freedvplugin.cpp index 699c66bc0..2cee11a89 100644 --- a/plugins/channelrx/demodfreedv/freedvplugin.cpp +++ b/plugins/channelrx/demodfreedv/freedvplugin.cpp @@ -67,12 +67,12 @@ PluginInstanceGUI* FreeDVPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, Ba } #endif -BasebandSampleSink* FreeDVPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* FreeDVPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new FreeDVDemod(deviceAPI); } -ChannelSinkAPI* FreeDVPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* FreeDVPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new FreeDVDemod(deviceAPI); } diff --git a/plugins/channelrx/demodfreedv/freedvplugin.h b/plugins/channelrx/demodfreedv/freedvplugin.h index a35a145b0..0babf3ece 100644 --- a/plugins/channelrx/demodfreedv/freedvplugin.h +++ b/plugins/channelrx/demodfreedv/freedvplugin.h @@ -36,8 +36,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodlora/lorademod.cpp b/plugins/channelrx/demodlora/lorademod.cpp index 7fb5f9ce6..43e73c8de 100644 --- a/plugins/channelrx/demodlora/lorademod.cpp +++ b/plugins/channelrx/demodlora/lorademod.cpp @@ -25,7 +25,7 @@ #include "dsp/downchannelizer.h" #include "dsp/threadedbasebandsamplesink.h" #include "dsp/dspcommands.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "lorademod.h" #include "lorabits.h" @@ -36,7 +36,7 @@ MESSAGE_CLASS_DEFINITION(LoRaDemod::MsgConfigureChannelizer, Message) const QString LoRaDemod::m_channelIdURI = "sdrangel.channel.lorademod"; const QString LoRaDemod::m_channelId = "LoRaDemod"; -LoRaDemod::LoRaDemod(DeviceSourceAPI* deviceAPI) : +LoRaDemod::LoRaDemod(DeviceAPI* deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_sampleSink(0), @@ -69,8 +69,8 @@ LoRaDemod::LoRaDemod(DeviceSourceAPI* deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); } LoRaDemod::~LoRaDemod() @@ -86,8 +86,8 @@ LoRaDemod::~LoRaDemod() if (finetune) delete [] finetune; - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; } diff --git a/plugins/channelrx/demodlora/lorademod.h b/plugins/channelrx/demodlora/lorademod.h index bb4980db1..df1fadf1d 100644 --- a/plugins/channelrx/demodlora/lorademod.h +++ b/plugins/channelrx/demodlora/lorademod.h @@ -37,7 +37,7 @@ #define LORA_SFFT_LEN (SPREADFACTOR / 2) #define LORA_SQUELCH (3) -class DeviceSourceAPI; +class DeviceAPI; class ThreadedBasebandSampleSink; class DownChannelizer; @@ -89,7 +89,7 @@ public: { } }; - LoRaDemod(DeviceSourceAPI* deviceAPI); + LoRaDemod(DeviceAPI* deviceAPI); virtual ~LoRaDemod(); virtual void destroy() { delete this; } void setSpectrumSink(BasebandSampleSink* sampleSink) { m_sampleSink = sampleSink; } @@ -118,7 +118,7 @@ private: void hamming6(char* inout, int size); void prng6(char* inout, int size); - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; LoRaDemodSettings m_settings; diff --git a/plugins/channelrx/demodlora/loraplugin.cpp b/plugins/channelrx/demodlora/loraplugin.cpp index 0a25300a4..b8e27f874 100644 --- a/plugins/channelrx/demodlora/loraplugin.cpp +++ b/plugins/channelrx/demodlora/loraplugin.cpp @@ -38,12 +38,12 @@ PluginInstanceGUI* LoRaPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, Base return LoRaDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } -BasebandSampleSink* LoRaPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* LoRaPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new LoRaDemod(deviceAPI); } -ChannelSinkAPI* LoRaPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* LoRaPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new LoRaDemod(deviceAPI); } diff --git a/plugins/channelrx/demodlora/loraplugin.h b/plugins/channelrx/demodlora/loraplugin.h index 75a812af0..791092632 100644 --- a/plugins/channelrx/demodlora/loraplugin.h +++ b/plugins/channelrx/demodlora/loraplugin.h @@ -19,8 +19,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp index 2d69be1fe..42444726b 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.cpp +++ b/plugins/channelrx/demodnfm/nfmdemod.cpp @@ -37,7 +37,7 @@ #include "dsp/dspengine.h" #include "dsp/threadedbasebandsamplesink.h" #include "dsp/dspcommands.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "nfmdemod.h" @@ -52,7 +52,7 @@ static const double afSqTones[2] = {1000.0, 6000.0}; // {1200.0, 8000.0}; static const double afSqTones_lowrate[2] = {1000.0, 3500.0}; const int NFMDemod::m_udpBlockSize = 512; -NFMDemod::NFMDemod(DeviceSourceAPI *devieAPI) : +NFMDemod::NFMDemod(DeviceAPI *devieAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(devieAPI), m_inputSampleRate(48000), @@ -97,8 +97,8 @@ NFMDemod::NFMDemod(DeviceSourceAPI *devieAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -109,8 +109,8 @@ NFMDemod::~NFMDemod() disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); delete m_networkManager; DSPEngine::instance()->getAudioDeviceManager()->removeAudioSink(&m_audioFifo); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; } diff --git a/plugins/channelrx/demodnfm/nfmdemod.h b/plugins/channelrx/demodnfm/nfmdemod.h index 0733389fe..1c268a277 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.h +++ b/plugins/channelrx/demodnfm/nfmdemod.h @@ -43,7 +43,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class ThreadedBasebandSampleSink; class DownChannelizer; @@ -116,7 +116,7 @@ public: { } }; - NFMDemod(DeviceSourceAPI *deviceAPI); + NFMDemod(DeviceAPI *deviceAPI); ~NFMDemod(); virtual void destroy() { delete this; } @@ -195,7 +195,7 @@ private: RSRunning }; - DeviceSourceAPI* m_deviceAPI; + DeviceAPI* m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; diff --git a/plugins/channelrx/demodnfm/nfmplugin.cpp b/plugins/channelrx/demodnfm/nfmplugin.cpp index 8a1efea7e..80c2afbaf 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.cpp +++ b/plugins/channelrx/demodnfm/nfmplugin.cpp @@ -49,12 +49,12 @@ PluginInstanceGUI* NFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, Baseb } #endif -BasebandSampleSink* NFMPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* NFMPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new NFMDemod(deviceAPI); } -ChannelSinkAPI* NFMPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* NFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new NFMDemod(deviceAPI); } diff --git a/plugins/channelrx/demodnfm/nfmplugin.h b/plugins/channelrx/demodnfm/nfmplugin.h index c5c07976a..ca1e7d519 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.h +++ b/plugins/channelrx/demodnfm/nfmplugin.h @@ -19,8 +19,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp index 01ff2978e..212f091e9 100644 --- a/plugins/channelrx/demodssb/ssbdemod.cpp +++ b/plugins/channelrx/demodssb/ssbdemod.cpp @@ -36,7 +36,7 @@ #include "dsp/downchannelizer.h" #include "dsp/threadedbasebandsamplesink.h" #include "dsp/dspcommands.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "util/db.h" #include "ssbdemod.h" @@ -48,7 +48,7 @@ MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureChannelizer, Message) const QString SSBDemod::m_channelIdURI = "sdrangel.channel.ssbdemod"; const QString SSBDemod::m_channelId = "SSBDemod"; -SSBDemod::SSBDemod(DeviceSourceAPI *deviceAPI) : +SSBDemod::SSBDemod(DeviceAPI *deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_audioBinaual(false), @@ -101,8 +101,8 @@ SSBDemod::SSBDemod(DeviceSourceAPI *deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -114,8 +114,8 @@ SSBDemod::~SSBDemod() delete m_networkManager; DSPEngine::instance()->getAudioDeviceManager()->removeAudioSink(&m_audioFifo); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; delete SSBFilter; diff --git a/plugins/channelrx/demodssb/ssbdemod.h b/plugins/channelrx/demodssb/ssbdemod.h index c2ff615cd..e286ff67c 100644 --- a/plugins/channelrx/demodssb/ssbdemod.h +++ b/plugins/channelrx/demodssb/ssbdemod.h @@ -41,7 +41,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class ThreadedBasebandSampleSink; class DownChannelizer; @@ -94,7 +94,7 @@ public: { } }; - SSBDemod(DeviceSourceAPI *deviceAPI); + SSBDemod(DeviceAPI *deviceAPI); virtual ~SSBDemod(); virtual void destroy() { delete this; } void setSampleSink(BasebandSampleSink* sampleSink) { m_sampleSink = sampleSink; } @@ -269,7 +269,7 @@ private: { } }; - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; SSBDemodSettings m_settings; diff --git a/plugins/channelrx/demodssb/ssbplugin.cpp b/plugins/channelrx/demodssb/ssbplugin.cpp index 953898ec8..16eedfb05 100644 --- a/plugins/channelrx/demodssb/ssbplugin.cpp +++ b/plugins/channelrx/demodssb/ssbplugin.cpp @@ -50,12 +50,12 @@ PluginInstanceGUI* SSBPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, Baseb } #endif -BasebandSampleSink* SSBPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* SSBPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new SSBDemod(deviceAPI); } -ChannelSinkAPI* SSBPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* SSBPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new SSBDemod(deviceAPI); } diff --git a/plugins/channelrx/demodssb/ssbplugin.h b/plugins/channelrx/demodssb/ssbplugin.h index f76f8e73d..95056fc73 100644 --- a/plugins/channelrx/demodssb/ssbplugin.h +++ b/plugins/channelrx/demodssb/ssbplugin.h @@ -19,8 +19,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodwfm/wfmdemod.cpp b/plugins/channelrx/demodwfm/wfmdemod.cpp index 7aa74ad41..b7e9c278e 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.cpp +++ b/plugins/channelrx/demodwfm/wfmdemod.cpp @@ -33,7 +33,7 @@ #include #include "dsp/threadedbasebandsamplesink.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "audio/audiooutput.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" @@ -48,7 +48,7 @@ const QString WFMDemod::m_channelIdURI = "sdrangel.channel.wfmdemod"; const QString WFMDemod::m_channelId = "WFMDemod"; const int WFMDemod::m_udpBlockSize = 512; -WFMDemod::WFMDemod(DeviceSourceAPI* deviceAPI) : +WFMDemod::WFMDemod(DeviceAPI* deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_inputSampleRate(384000), @@ -77,8 +77,8 @@ WFMDemod::WFMDemod(DeviceSourceAPI* deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -90,8 +90,8 @@ WFMDemod::~WFMDemod() delete m_networkManager; DSPEngine::instance()->getAudioDeviceManager()->removeAudioSink(&m_audioFifo); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; delete m_rfFilter; diff --git a/plugins/channelrx/demodwfm/wfmdemod.h b/plugins/channelrx/demodwfm/wfmdemod.h index 18faba87b..ec03d12c4 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.h +++ b/plugins/channelrx/demodwfm/wfmdemod.h @@ -43,7 +43,7 @@ class QNetworkAccessManager; class QNetworkReply; class ThreadedBasebandSampleSink; class DownChannelizer; -class DeviceSourceAPI; +class DeviceAPI; class WFMDemod : public BasebandSampleSink, public ChannelSinkAPI { Q_OBJECT @@ -94,7 +94,7 @@ public: { } }; - WFMDemod(DeviceSourceAPI *deviceAPI); + WFMDemod(DeviceAPI *deviceAPI); virtual ~WFMDemod(); virtual void destroy() { delete this; } @@ -173,7 +173,7 @@ private: RSRunning }; - DeviceSourceAPI* m_deviceAPI; + DeviceAPI* m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; diff --git a/plugins/channelrx/demodwfm/wfmplugin.cpp b/plugins/channelrx/demodwfm/wfmplugin.cpp index 651b0e020..d105c3b91 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.cpp +++ b/plugins/channelrx/demodwfm/wfmplugin.cpp @@ -50,12 +50,12 @@ PluginInstanceGUI* WFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, Baseb } #endif -BasebandSampleSink* WFMPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* WFMPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new WFMDemod(deviceAPI); } -ChannelSinkAPI* WFMPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* WFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new WFMDemod(deviceAPI); } diff --git a/plugins/channelrx/demodwfm/wfmplugin.h b/plugins/channelrx/demodwfm/wfmplugin.h index 5b5e3be2a..6da793627 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.h +++ b/plugins/channelrx/demodwfm/wfmplugin.h @@ -19,8 +19,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/freqtracker/freqtracker.cpp b/plugins/channelrx/freqtracker/freqtracker.cpp index f2b7d885d..ed67e6f51 100644 --- a/plugins/channelrx/freqtracker/freqtracker.cpp +++ b/plugins/channelrx/freqtracker/freqtracker.cpp @@ -38,7 +38,7 @@ #include "dsp/threadedbasebandsamplesink.h" #include "dsp/dspcommands.h" #include "dsp/fftfilt.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "util/db.h" #include "util/stepfunctions.h" @@ -50,7 +50,7 @@ const QString FreqTracker::m_channelIdURI = "sdrangel.channel.freqtracker"; const QString FreqTracker::m_channelId = "FreqTracker"; const int FreqTracker::m_udpBlockSize = 512; -FreqTracker::FreqTracker(DeviceSourceAPI *deviceAPI) : +FreqTracker::FreqTracker(DeviceAPI *deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_deviceSampleRate(48000), @@ -86,8 +86,8 @@ FreqTracker::FreqTracker(DeviceSourceAPI *deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -102,8 +102,8 @@ FreqTracker::~FreqTracker() #endif disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); delete m_networkManager; - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; delete m_rrcFilter; diff --git a/plugins/channelrx/freqtracker/freqtracker.h b/plugins/channelrx/freqtracker/freqtracker.h index 698175392..7936ded96 100644 --- a/plugins/channelrx/freqtracker/freqtracker.h +++ b/plugins/channelrx/freqtracker/freqtracker.h @@ -40,7 +40,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class DownChannelizer; class ThreadedBasebandSampleSink; class QTimer; @@ -117,7 +117,7 @@ public: int m_frequencyOffset; }; - FreqTracker(DeviceSourceAPI *deviceAPI); + FreqTracker(DeviceAPI *deviceAPI); ~FreqTracker(); virtual void destroy() { delete this; } @@ -191,7 +191,7 @@ private: RSRunning }; - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; FreqTrackerSettings m_settings; diff --git a/plugins/channelrx/freqtracker/freqtrackerplugin.cpp b/plugins/channelrx/freqtracker/freqtrackerplugin.cpp index b1568d92f..2b4c13582 100644 --- a/plugins/channelrx/freqtracker/freqtrackerplugin.cpp +++ b/plugins/channelrx/freqtracker/freqtrackerplugin.cpp @@ -66,12 +66,12 @@ PluginInstanceGUI* FreqTrackerPlugin::createRxChannelGUI(DeviceUISet *deviceUISe } #endif -BasebandSampleSink* FreqTrackerPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* FreqTrackerPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new FreqTracker(deviceAPI); } -ChannelSinkAPI* FreqTrackerPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* FreqTrackerPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new FreqTracker(deviceAPI); } diff --git a/plugins/channelrx/freqtracker/freqtrackerplugin.h b/plugins/channelrx/freqtracker/freqtrackerplugin.h index 7d5b4d4e0..f440bca3b 100644 --- a/plugins/channelrx/freqtracker/freqtrackerplugin.h +++ b/plugins/channelrx/freqtracker/freqtrackerplugin.h @@ -36,8 +36,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/localsink/localsink.cpp b/plugins/channelrx/localsink/localsink.cpp index 058408f4e..10b031c2d 100644 --- a/plugins/channelrx/localsink/localsink.cpp +++ b/plugins/channelrx/localsink/localsink.cpp @@ -30,10 +30,11 @@ #include "dsp/threadedbasebandsamplesink.h" #include "dsp/downchannelizer.h" #include "dsp/dspcommands.h" +#include "dsp/dspdevicesourceengine.h" #include "dsp/dspengine.h" #include "dsp/devicesamplesource.h" #include "dsp/hbfilterchainconverter.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "localsinkthread.h" @@ -44,7 +45,7 @@ MESSAGE_CLASS_DEFINITION(LocalSink::MsgConfigureChannelizer, Message) const QString LocalSink::m_channelIdURI = "sdrangel.channel.localsink"; const QString LocalSink::m_channelId = "LocalSink"; -LocalSink::LocalSink(DeviceSourceAPI *deviceAPI) : +LocalSink::LocalSink(DeviceAPI *deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_running(false), @@ -61,8 +62,8 @@ LocalSink::LocalSink(DeviceSourceAPI *deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -72,8 +73,8 @@ LocalSink::~LocalSink() { disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); delete m_networkManager; - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; } diff --git a/plugins/channelrx/localsink/localsink.h b/plugins/channelrx/localsink/localsink.h index fd3d2c608..0bb4c2651 100644 --- a/plugins/channelrx/localsink/localsink.h +++ b/plugins/channelrx/localsink/localsink.h @@ -26,7 +26,7 @@ #include "channel/channelsinkapi.h" #include "localsinksettings.h" -class DeviceSourceAPI; +class DeviceAPI; class DeviceSampleSource; class ThreadedBasebandSampleSink; class DownChannelizer; @@ -103,7 +103,7 @@ public: { } }; - LocalSink(DeviceSourceAPI *deviceAPI); + LocalSink(DeviceAPI *deviceAPI); virtual ~LocalSink(); virtual void destroy() { delete this; } @@ -145,7 +145,7 @@ signals: void samplesAvailable(const quint8* data, uint count); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; bool m_running; diff --git a/plugins/channelrx/localsink/localsinkplugin.cpp b/plugins/channelrx/localsink/localsinkplugin.cpp index 9d0eec34e..5e87c8676 100644 --- a/plugins/channelrx/localsink/localsinkplugin.cpp +++ b/plugins/channelrx/localsink/localsinkplugin.cpp @@ -67,12 +67,12 @@ PluginInstanceGUI* LocalSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, } #endif -BasebandSampleSink* LocalSinkPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* LocalSinkPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new LocalSink(deviceAPI); } -ChannelSinkAPI* LocalSinkPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* LocalSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new LocalSink(deviceAPI); } diff --git a/plugins/channelrx/localsink/localsinkplugin.h b/plugins/channelrx/localsink/localsinkplugin.h index 8870cac1f..9d4b400f5 100644 --- a/plugins/channelrx/localsink/localsinkplugin.h +++ b/plugins/channelrx/localsink/localsinkplugin.h @@ -37,8 +37,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/remotesink/remotesink.cpp b/plugins/channelrx/remotesink/remotesink.cpp index b7f0bf2f0..99e1cc8c2 100644 --- a/plugins/channelrx/remotesink/remotesink.cpp +++ b/plugins/channelrx/remotesink/remotesink.cpp @@ -39,7 +39,7 @@ #include "dsp/downchannelizer.h" #include "dsp/dspcommands.h" #include "dsp/hbfilterchainconverter.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "remotesinkthread.h" @@ -50,7 +50,7 @@ MESSAGE_CLASS_DEFINITION(RemoteSink::MsgConfigureChannelizer, Message) const QString RemoteSink::m_channelIdURI = "sdrangel.channel.remotesink"; const QString RemoteSink::m_channelId = "RemoteSink"; -RemoteSink::RemoteSink(DeviceSourceAPI *deviceAPI) : +RemoteSink::RemoteSink(DeviceAPI *deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_running(false), @@ -72,8 +72,8 @@ RemoteSink::RemoteSink(DeviceSourceAPI *deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -90,8 +90,8 @@ RemoteSink::~RemoteSink() } m_dataBlockMutex.unlock(); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; } diff --git a/plugins/channelrx/remotesink/remotesink.h b/plugins/channelrx/remotesink/remotesink.h index 2551471ab..ac34f4ad7 100644 --- a/plugins/channelrx/remotesink/remotesink.h +++ b/plugins/channelrx/remotesink/remotesink.h @@ -35,7 +35,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class ThreadedBasebandSampleSink; class DownChannelizer; class RemoteSinkThread; @@ -109,7 +109,7 @@ public: { } }; - RemoteSink(DeviceSourceAPI *deviceAPI); + RemoteSink(DeviceAPI *deviceAPI); virtual ~RemoteSink(); virtual void destroy() { delete this; } @@ -154,7 +154,7 @@ signals: void dataBlockAvailable(RemoteDataBlock *dataBlock); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; bool m_running; diff --git a/plugins/channelrx/remotesink/remotesinkplugin.cpp b/plugins/channelrx/remotesink/remotesinkplugin.cpp index 318b5b5ee..a7bb927a7 100644 --- a/plugins/channelrx/remotesink/remotesinkplugin.cpp +++ b/plugins/channelrx/remotesink/remotesinkplugin.cpp @@ -67,12 +67,12 @@ PluginInstanceGUI* RemoteSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet } #endif -BasebandSampleSink* RemoteSinkPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* RemoteSinkPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new RemoteSink(deviceAPI); } -ChannelSinkAPI* RemoteSinkPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* RemoteSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new RemoteSink(deviceAPI); } diff --git a/plugins/channelrx/remotesink/remotesinkplugin.h b/plugins/channelrx/remotesink/remotesinkplugin.h index 0e32c141c..a18516caf 100644 --- a/plugins/channelrx/remotesink/remotesinkplugin.h +++ b/plugins/channelrx/remotesink/remotesinkplugin.h @@ -37,8 +37,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/udpsink/udpsink.cpp b/plugins/channelrx/udpsink/udpsink.cpp index 38a51cc6a..ae0e763f3 100644 --- a/plugins/channelrx/udpsink/udpsink.cpp +++ b/plugins/channelrx/udpsink/udpsink.cpp @@ -32,7 +32,7 @@ #include "dsp/downchannelizer.h" #include "dsp/threadedbasebandsamplesink.h" #include "dsp/dspcommands.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "udpsink.h" @@ -45,7 +45,7 @@ MESSAGE_CLASS_DEFINITION(UDPSink::MsgUDPSinkSpectrum, Message) const QString UDPSink::m_channelIdURI = "sdrangel.channel.udpsink"; const QString UDPSink::m_channelId = "UDPSink"; -UDPSink::UDPSink(DeviceSourceAPI *deviceAPI) : +UDPSink::UDPSink(DeviceAPI *deviceAPI) : ChannelSinkAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_inputSampleRate(48000), @@ -112,8 +112,8 @@ UDPSink::UDPSink(DeviceSourceAPI *deviceAPI) : m_channelizer = new DownChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); - m_deviceAPI->addThreadedSink(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSink(m_threadedChannelizer); + m_deviceAPI->addChannelSinkAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -129,8 +129,8 @@ UDPSink::~UDPSink() delete m_udpBufferMono16; delete[] m_udpAudioBuf; DSPEngine::instance()->getAudioDeviceManager()->removeAudioSink(&m_audioFifo); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSink(m_threadedChannelizer); + m_deviceAPI->removeChannelSinkAPI(this); + m_deviceAPI->removeChannelSink(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; delete UDPFilter; diff --git a/plugins/channelrx/udpsink/udpsink.h b/plugins/channelrx/udpsink/udpsink.h index dda1f262f..9abb8b7a0 100644 --- a/plugins/channelrx/udpsink/udpsink.h +++ b/plugins/channelrx/udpsink/udpsink.h @@ -41,7 +41,7 @@ class QNetworkAccessManager; class QNetworkReply; class QUdpSocket; -class DeviceSourceAPI; +class DeviceAPI; class ThreadedBasebandSampleSink; class DownChannelizer; @@ -96,7 +96,7 @@ public: { } }; - UDPSink(DeviceSourceAPI *deviceAPI); + UDPSink(DeviceAPI *deviceAPI); virtual ~UDPSink(); virtual void destroy() { delete this; } void setSpectrum(BasebandSampleSink* spectrum) { m_spectrum = spectrum; } @@ -179,7 +179,7 @@ protected: int32_t m_i; }; - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; ThreadedBasebandSampleSink* m_threadedChannelizer; DownChannelizer* m_channelizer; diff --git a/plugins/channelrx/udpsink/udpsinkplugin.cpp b/plugins/channelrx/udpsink/udpsinkplugin.cpp index 4579582a9..4fb5a8991 100644 --- a/plugins/channelrx/udpsink/udpsinkplugin.cpp +++ b/plugins/channelrx/udpsink/udpsinkplugin.cpp @@ -67,12 +67,12 @@ PluginInstanceGUI* UDPSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, B } #endif -BasebandSampleSink* UDPSinkPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI) +BasebandSampleSink* UDPSinkPlugin::createRxChannelBS(DeviceAPI *deviceAPI) { return new UDPSink(deviceAPI); } -ChannelSinkAPI* UDPSinkPlugin::createRxChannelCS(DeviceSourceAPI *deviceAPI) +ChannelSinkAPI* UDPSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) { return new UDPSink(deviceAPI); } diff --git a/plugins/channelrx/udpsink/udpsinkplugin.h b/plugins/channelrx/udpsink/udpsinkplugin.h index 498c74921..b268f8ac0 100644 --- a/plugins/channelrx/udpsink/udpsinkplugin.h +++ b/plugins/channelrx/udpsink/udpsinkplugin.h @@ -37,8 +37,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceSourceAPI *deviceAPI); - virtual ChannelSinkAPI* createRxChannelCS(DeviceSourceAPI *deviceAPI); + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSinkAPI* createRxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modam/ammod.cpp b/plugins/channeltx/modam/ammod.cpp index e50943353..cd2e7c556 100644 --- a/plugins/channeltx/modam/ammod.cpp +++ b/plugins/channeltx/modam/ammod.cpp @@ -35,7 +35,7 @@ #include "dsp/dspengine.h" #include "dsp/threadedbasebandsamplesource.h" #include "dsp/dspcommands.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "util/db.h" MESSAGE_CLASS_DEFINITION(AMMod::MsgConfigureAMMod, Message) @@ -50,7 +50,7 @@ const QString AMMod::m_channelIdURI = "sdrangel.channeltx.modam"; const QString AMMod::m_channelId ="AMMod"; const int AMMod::m_levelNbSamples = 480; // every 10ms -AMMod::AMMod(DeviceSinkAPI *deviceAPI) : +AMMod::AMMod(DeviceAPI *deviceAPI) : ChannelSourceAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_basebandSampleRate(48000), @@ -86,8 +86,8 @@ AMMod::AMMod(DeviceSinkAPI *deviceAPI) : m_channelizer = new UpChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); - m_deviceAPI->addThreadedSource(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSource(m_threadedChannelizer); + m_deviceAPI->addChannelSourceAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -97,8 +97,8 @@ AMMod::~AMMod() { disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); delete m_networkManager; - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSource(m_threadedChannelizer); + m_deviceAPI->removeChannelSourceAPI(this); + m_deviceAPI->removeChannelSource(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; DSPEngine::instance()->getAudioDeviceManager()->removeAudioSource(&m_audioFifo); diff --git a/plugins/channeltx/modam/ammod.h b/plugins/channeltx/modam/ammod.h index 3bce90dca..7e605e56d 100644 --- a/plugins/channeltx/modam/ammod.h +++ b/plugins/channeltx/modam/ammod.h @@ -42,7 +42,7 @@ class QNetworkAccessManager; class QNetworkReply; class ThreadedBasebandSampleSource; class UpChannelizer; -class DeviceSinkAPI; +class DeviceAPI; class AMMod : public BasebandSampleSource, public ChannelSourceAPI { Q_OBJECT @@ -201,7 +201,7 @@ public: //================================================================= - AMMod(DeviceSinkAPI *deviceAPI); + AMMod(DeviceAPI *deviceAPI); ~AMMod(); virtual void destroy() { delete this; } @@ -255,7 +255,7 @@ private: RSRunning }; - DeviceSinkAPI* m_deviceAPI; + DeviceAPI* m_deviceAPI; ThreadedBasebandSampleSource* m_threadedChannelizer; UpChannelizer* m_channelizer; diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp index f83e5834f..eea93a08f 100644 --- a/plugins/channeltx/modam/ammodplugin.cpp +++ b/plugins/channeltx/modam/ammodplugin.cpp @@ -66,12 +66,12 @@ PluginInstanceGUI* AMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, Bas } #endif -BasebandSampleSource* AMModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI) +BasebandSampleSource* AMModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) { return new AMMod(deviceAPI); } -ChannelSourceAPI* AMModPlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI) +ChannelSourceAPI* AMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) { return new AMMod(deviceAPI); } diff --git a/plugins/channeltx/modam/ammodplugin.h b/plugins/channeltx/modam/ammodplugin.h index 3407004e5..bf2a201f8 100644 --- a/plugins/channeltx/modam/ammodplugin.h +++ b/plugins/channeltx/modam/ammodplugin.h @@ -36,8 +36,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI); - virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI); + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSourceAPI* createTxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modatv/atvmod.cpp b/plugins/channeltx/modatv/atvmod.cpp index f3a5489c7..f22432f9e 100644 --- a/plugins/channeltx/modatv/atvmod.cpp +++ b/plugins/channeltx/modatv/atvmod.cpp @@ -31,7 +31,7 @@ #include "dsp/upchannelizer.h" #include "dsp/threadedbasebandsamplesource.h" #include "dsp/dspcommands.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "util/db.h" #include "atvmod.h" @@ -58,7 +58,7 @@ const int ATVMod::m_nbBars = 6; const int ATVMod::m_cameraFPSTestNbFrames = 100; const int ATVMod::m_ssbFftLen = 1024; -ATVMod::ATVMod(DeviceSinkAPI *deviceAPI) : +ATVMod::ATVMod(DeviceAPI *deviceAPI) : ChannelSourceAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_outputSampleRate(1000000), @@ -103,8 +103,8 @@ ATVMod::ATVMod(DeviceSinkAPI *deviceAPI) : m_channelizer = new UpChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); - m_deviceAPI->addThreadedSource(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSource(m_threadedChannelizer); + m_deviceAPI->addChannelSourceAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -120,8 +120,8 @@ ATVMod::~ATVMod() } releaseCameras(); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSource(m_threadedChannelizer); + m_deviceAPI->removeChannelSourceAPI(this); + m_deviceAPI->removeChannelSource(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; delete m_SSBFilter; diff --git a/plugins/channeltx/modatv/atvmod.h b/plugins/channeltx/modatv/atvmod.h index b7a7cdb8a..d296b1e63 100644 --- a/plugins/channeltx/modatv/atvmod.h +++ b/plugins/channeltx/modatv/atvmod.h @@ -41,7 +41,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSinkAPI; +class DeviceAPI; class ThreadedBasebandSampleSource; class UpChannelizer; @@ -354,7 +354,7 @@ public: { } }; - ATVMod(DeviceSinkAPI *deviceAPI); + ATVMod(DeviceAPI *deviceAPI); ~ATVMod(); virtual void destroy() { delete this; } @@ -442,7 +442,7 @@ private: {} }; - DeviceSinkAPI* m_deviceAPI; + DeviceAPI* m_deviceAPI; ThreadedBasebandSampleSource* m_threadedChannelizer; UpChannelizer* m_channelizer; diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp index 5b719b88b..bcfbe2c39 100644 --- a/plugins/channeltx/modatv/atvmodplugin.cpp +++ b/plugins/channeltx/modatv/atvmodplugin.cpp @@ -66,12 +66,12 @@ PluginInstanceGUI* ATVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, Ba } #endif -BasebandSampleSource* ATVModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI) +BasebandSampleSource* ATVModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) { return new ATVMod(deviceAPI); } -ChannelSourceAPI* ATVModPlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI) +ChannelSourceAPI* ATVModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) { return new ATVMod(deviceAPI); } diff --git a/plugins/channeltx/modatv/atvmodplugin.h b/plugins/channeltx/modatv/atvmodplugin.h index 9ab0e21ef..7494ca2b5 100644 --- a/plugins/channeltx/modatv/atvmodplugin.h +++ b/plugins/channeltx/modatv/atvmodplugin.h @@ -21,7 +21,7 @@ #include #include "plugin/plugininterface.h" -class DeviceSinkAPI; +class DeviceAPI; class BasebandSampleSource; class ATVModPlugin : public QObject, PluginInterface { @@ -36,8 +36,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI); - virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI); + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSourceAPI* createTxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modfreedv/freedvmod.cpp b/plugins/channeltx/modfreedv/freedvmod.cpp index df4597005..166c9541e 100644 --- a/plugins/channeltx/modfreedv/freedvmod.cpp +++ b/plugins/channeltx/modfreedv/freedvmod.cpp @@ -38,7 +38,7 @@ #include "dsp/dspengine.h" #include "dsp/threadedbasebandsamplesource.h" #include "dsp/dspcommands.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "util/db.h" MESSAGE_CLASS_DEFINITION(FreeDVMod::MsgConfigureFreeDVMod, Message) @@ -54,7 +54,7 @@ const QString FreeDVMod::m_channelId = "FreeDVMod"; const int FreeDVMod::m_levelNbSamples = 80; // every 10ms const int FreeDVMod::m_ssbFftLen = 1024; -FreeDVMod::FreeDVMod(DeviceSinkAPI *deviceAPI) : +FreeDVMod::FreeDVMod(DeviceAPI *deviceAPI) : ChannelSourceAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_basebandSampleRate(48000), @@ -112,8 +112,8 @@ FreeDVMod::FreeDVMod(DeviceSinkAPI *deviceAPI) : m_channelizer = new UpChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); - m_deviceAPI->addThreadedSource(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSource(m_threadedChannelizer); + m_deviceAPI->addChannelSourceAPI(this); applySettings(m_settings, true); applyChannelSettings(m_basebandSampleRate, m_outputSampleRate, m_inputFrequencyOffset, true); @@ -129,8 +129,8 @@ FreeDVMod::~FreeDVMod() DSPEngine::instance()->getAudioDeviceManager()->removeAudioSource(&m_audioFifo); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSource(m_threadedChannelizer); + m_deviceAPI->removeChannelSourceAPI(this); + m_deviceAPI->removeChannelSource(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; diff --git a/plugins/channeltx/modfreedv/freedvmod.h b/plugins/channeltx/modfreedv/freedvmod.h index 5ac2bb3f7..ce6dff71d 100644 --- a/plugins/channeltx/modfreedv/freedvmod.h +++ b/plugins/channeltx/modfreedv/freedvmod.h @@ -42,7 +42,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSinkAPI; +class DeviceAPI; class ThreadedBasebandSampleSource; class UpChannelizer; @@ -207,7 +207,7 @@ public: //================================================================= - FreeDVMod(DeviceSinkAPI *deviceAPI); + FreeDVMod(DeviceAPI *deviceAPI); ~FreeDVMod(); virtual void destroy() { delete this; } @@ -267,7 +267,7 @@ private: RSRunning }; - DeviceSinkAPI* m_deviceAPI; + DeviceAPI* m_deviceAPI; ThreadedBasebandSampleSource* m_threadedChannelizer; UpChannelizer* m_channelizer; diff --git a/plugins/channeltx/modfreedv/freedvmodplugin.cpp b/plugins/channeltx/modfreedv/freedvmodplugin.cpp index 1c04d88f0..ec39208bd 100644 --- a/plugins/channeltx/modfreedv/freedvmodplugin.cpp +++ b/plugins/channeltx/modfreedv/freedvmodplugin.cpp @@ -66,12 +66,12 @@ PluginInstanceGUI* FreeDVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, } #endif -BasebandSampleSource* FreeDVModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI) +BasebandSampleSource* FreeDVModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) { return new FreeDVMod(deviceAPI); } -ChannelSourceAPI* FreeDVModPlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI) +ChannelSourceAPI* FreeDVModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) { return new FreeDVMod(deviceAPI); } diff --git a/plugins/channeltx/modfreedv/freedvmodplugin.h b/plugins/channeltx/modfreedv/freedvmodplugin.h index eb773fe64..227a7c20f 100644 --- a/plugins/channeltx/modfreedv/freedvmodplugin.h +++ b/plugins/channeltx/modfreedv/freedvmodplugin.h @@ -36,8 +36,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI); - virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI); + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSourceAPI* createTxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modnfm/nfmmod.cpp b/plugins/channeltx/modnfm/nfmmod.cpp index 5839c8b8c..d7c7f73f5 100644 --- a/plugins/channeltx/modnfm/nfmmod.cpp +++ b/plugins/channeltx/modnfm/nfmmod.cpp @@ -34,7 +34,7 @@ #include "dsp/upchannelizer.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "dsp/threadedbasebandsamplesource.h" #include "util/db.h" @@ -52,7 +52,7 @@ const QString NFMMod::m_channelIdURI = "sdrangel.channeltx.modnfm"; const QString NFMMod::m_channelId = "NFMMod"; const int NFMMod::m_levelNbSamples = 480; // every 10ms -NFMMod::NFMMod(DeviceSinkAPI *deviceAPI) : +NFMMod::NFMMod(DeviceAPI *deviceAPI) : ChannelSourceAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_basebandSampleRate(48000), @@ -92,8 +92,8 @@ NFMMod::NFMMod(DeviceSinkAPI *deviceAPI) : m_channelizer = new UpChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); - m_deviceAPI->addThreadedSource(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSource(m_threadedChannelizer); + m_deviceAPI->addChannelSourceAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -104,8 +104,8 @@ NFMMod::~NFMMod() disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); delete m_networkManager; DSPEngine::instance()->getAudioDeviceManager()->removeAudioSource(&m_audioFifo); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSource(m_threadedChannelizer); + m_deviceAPI->removeChannelSourceAPI(this); + m_deviceAPI->removeChannelSource(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; } diff --git a/plugins/channeltx/modnfm/nfmmod.h b/plugins/channeltx/modnfm/nfmmod.h index dc9e609b1..073381431 100644 --- a/plugins/channeltx/modnfm/nfmmod.h +++ b/plugins/channeltx/modnfm/nfmmod.h @@ -40,7 +40,7 @@ #include "nfmmodsettings.h" -class DeviceSinkAPI; +class DeviceAPI; class ThreadedBasebandSampleSource; class UpChannelizer; class QNetworkAccessManager; @@ -203,7 +203,7 @@ public: //================================================================= - NFMMod(DeviceSinkAPI *deviceAPI); + NFMMod(DeviceAPI *deviceAPI); ~NFMMod(); virtual void destroy() { delete this; } @@ -257,7 +257,7 @@ private: RSRunning }; - DeviceSinkAPI* m_deviceAPI; + DeviceAPI* m_deviceAPI; ThreadedBasebandSampleSource* m_threadedChannelizer; UpChannelizer* m_channelizer; diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp index 6dc89b39d..f95c823a5 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.cpp +++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp @@ -66,12 +66,12 @@ PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, Ba } #endif -BasebandSampleSource* NFMModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI) +BasebandSampleSource* NFMModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) { return new NFMMod(deviceAPI); } -ChannelSourceAPI* NFMModPlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI) +ChannelSourceAPI* NFMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) { return new NFMMod(deviceAPI); } diff --git a/plugins/channeltx/modnfm/nfmmodplugin.h b/plugins/channeltx/modnfm/nfmmodplugin.h index 7d88ed0d4..ffb0327a9 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.h +++ b/plugins/channeltx/modnfm/nfmmodplugin.h @@ -36,8 +36,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *rxChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI); - virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI); + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSourceAPI* createTxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modssb/ssbmod.cpp b/plugins/channeltx/modssb/ssbmod.cpp index aaffde1a5..72eb4dcc3 100644 --- a/plugins/channeltx/modssb/ssbmod.cpp +++ b/plugins/channeltx/modssb/ssbmod.cpp @@ -36,7 +36,7 @@ #include "dsp/dspengine.h" #include "dsp/threadedbasebandsamplesource.h" #include "dsp/dspcommands.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "util/db.h" MESSAGE_CLASS_DEFINITION(SSBMod::MsgConfigureSSBMod, Message) @@ -52,7 +52,7 @@ const QString SSBMod::m_channelId = "SSBMod"; const int SSBMod::m_levelNbSamples = 480; // every 10ms const int SSBMod::m_ssbFftLen = 1024; -SSBMod::SSBMod(DeviceSinkAPI *deviceAPI) : +SSBMod::SSBMod(DeviceAPI *deviceAPI) : ChannelSourceAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_basebandSampleRate(48000), @@ -117,8 +117,8 @@ SSBMod::SSBMod(DeviceSinkAPI *deviceAPI) : m_channelizer = new UpChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); - m_deviceAPI->addThreadedSource(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSource(m_threadedChannelizer); + m_deviceAPI->addChannelSourceAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -131,8 +131,8 @@ SSBMod::~SSBMod() DSPEngine::instance()->getAudioDeviceManager()->removeAudioSource(&m_audioFifo); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSource(m_threadedChannelizer); + m_deviceAPI->removeChannelSourceAPI(this); + m_deviceAPI->removeChannelSource(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; diff --git a/plugins/channeltx/modssb/ssbmod.h b/plugins/channeltx/modssb/ssbmod.h index 3dc98dc28..236f6afce 100644 --- a/plugins/channeltx/modssb/ssbmod.h +++ b/plugins/channeltx/modssb/ssbmod.h @@ -41,7 +41,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSinkAPI; +class DeviceAPI; class ThreadedBasebandSampleSource; class UpChannelizer; @@ -202,7 +202,7 @@ public: //================================================================= - SSBMod(DeviceSinkAPI *deviceAPI); + SSBMod(DeviceAPI *deviceAPI); ~SSBMod(); virtual void destroy() { delete this; } @@ -259,7 +259,7 @@ private: RSRunning }; - DeviceSinkAPI* m_deviceAPI; + DeviceAPI* m_deviceAPI; ThreadedBasebandSampleSource* m_threadedChannelizer; UpChannelizer* m_channelizer; diff --git a/plugins/channeltx/modssb/ssbmodplugin.cpp b/plugins/channeltx/modssb/ssbmodplugin.cpp index 9b6006d6f..2f01ff67d 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.cpp +++ b/plugins/channeltx/modssb/ssbmodplugin.cpp @@ -66,12 +66,12 @@ PluginInstanceGUI* SSBModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, Ba } #endif -BasebandSampleSource* SSBModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI) +BasebandSampleSource* SSBModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) { return new SSBMod(deviceAPI); } -ChannelSourceAPI* SSBModPlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI) +ChannelSourceAPI* SSBModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) { return new SSBMod(deviceAPI); } diff --git a/plugins/channeltx/modssb/ssbmodplugin.h b/plugins/channeltx/modssb/ssbmodplugin.h index effd30182..c7f4fe109 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.h +++ b/plugins/channeltx/modssb/ssbmodplugin.h @@ -36,8 +36,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI); - virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI); + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSourceAPI* createTxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modwfm/wfmmod.cpp b/plugins/channeltx/modwfm/wfmmod.cpp index fbac3699b..644992906 100644 --- a/plugins/channeltx/modwfm/wfmmod.cpp +++ b/plugins/channeltx/modwfm/wfmmod.cpp @@ -34,7 +34,7 @@ #include "dsp/dspengine.h" #include "dsp/threadedbasebandsamplesource.h" #include "dsp/dspcommands.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "util/db.h" #include "wfmmod.h" @@ -52,7 +52,7 @@ const QString WFMMod::m_channelId = "WFMMod"; const int WFMMod::m_levelNbSamples = 480; // every 10ms const int WFMMod::m_rfFilterFFTLength = 1024; -WFMMod::WFMMod(DeviceSinkAPI *deviceAPI) : +WFMMod::WFMMod(DeviceAPI *deviceAPI) : ChannelSourceAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_basebandSampleRate(384000), @@ -97,8 +97,8 @@ WFMMod::WFMMod(DeviceSinkAPI *deviceAPI) : m_channelizer = new UpChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); - m_deviceAPI->addThreadedSource(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSource(m_threadedChannelizer); + m_deviceAPI->addChannelSourceAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -109,8 +109,8 @@ WFMMod::~WFMMod() disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); delete m_networkManager; DSPEngine::instance()->getAudioDeviceManager()->removeAudioSource(&m_audioFifo); - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSource(m_threadedChannelizer); + m_deviceAPI->removeChannelSourceAPI(this); + m_deviceAPI->removeChannelSource(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; delete m_rfFilter; diff --git a/plugins/channeltx/modwfm/wfmmod.h b/plugins/channeltx/modwfm/wfmmod.h index 1dbdf90a2..ffaff69e9 100644 --- a/plugins/channeltx/modwfm/wfmmod.h +++ b/plugins/channeltx/modwfm/wfmmod.h @@ -41,7 +41,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSinkAPI; +class DeviceAPI; class ThreadedBasebandSampleSource; class UpChannelizer; @@ -202,7 +202,7 @@ public: //================================================================= - WFMMod(DeviceSinkAPI *deviceAPI); + WFMMod(DeviceAPI *deviceAPI); ~WFMMod(); virtual void destroy() { delete this; } @@ -256,7 +256,7 @@ private: RSRunning }; - DeviceSinkAPI* m_deviceAPI; + DeviceAPI* m_deviceAPI; ThreadedBasebandSampleSource* m_threadedChannelizer; UpChannelizer* m_channelizer; diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp index 8f04bf7fc..bd4326cf6 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.cpp +++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp @@ -66,12 +66,12 @@ PluginInstanceGUI* WFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, Ba } #endif -BasebandSampleSource* WFMModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI) +BasebandSampleSource* WFMModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) { return new WFMMod(deviceAPI); } -ChannelSourceAPI* WFMModPlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI) +ChannelSourceAPI* WFMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) { return new WFMMod(deviceAPI); } diff --git a/plugins/channeltx/modwfm/wfmmodplugin.h b/plugins/channeltx/modwfm/wfmmodplugin.h index cb3ad02e6..606bd598d 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.h +++ b/plugins/channeltx/modwfm/wfmmodplugin.h @@ -21,7 +21,7 @@ #include #include "plugin/plugininterface.h" -class DeviceSinkAPI; +class DeviceAPI; class WFMModPlugin : public QObject, PluginInterface { Q_OBJECT @@ -35,8 +35,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI); - virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI); + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSourceAPI* createTxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/remotesource/remotesource.cpp b/plugins/channeltx/remotesource/remotesource.cpp index 93735b24b..b8ef81d31 100644 --- a/plugins/channeltx/remotesource/remotesource.cpp +++ b/plugins/channeltx/remotesource/remotesource.cpp @@ -32,7 +32,7 @@ #include "SWGRemoteSourceReport.h" #include "dsp/devicesamplesink.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "dsp/upchannelizer.h" #include "dsp/threadedbasebandsamplesource.h" @@ -46,7 +46,7 @@ MESSAGE_CLASS_DEFINITION(RemoteSource::MsgReportStreamData, Message) const QString RemoteSource::m_channelIdURI = "sdrangel.channeltx.remotesource"; const QString RemoteSource::m_channelId ="RemoteSource"; -RemoteSource::RemoteSource(DeviceSinkAPI *deviceAPI) : +RemoteSource::RemoteSource(DeviceAPI *deviceAPI) : ChannelSourceAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_sourceThread(0), @@ -62,8 +62,8 @@ RemoteSource::RemoteSource(DeviceSinkAPI *deviceAPI) : m_channelizer = new UpChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); - m_deviceAPI->addThreadedSource(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSource(m_threadedChannelizer); + m_deviceAPI->addChannelSourceAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -73,8 +73,8 @@ RemoteSource::~RemoteSource() { disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); delete m_networkManager; - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSource(m_threadedChannelizer); + m_deviceAPI->removeChannelSourceAPI(this); + m_deviceAPI->removeChannelSource(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; } diff --git a/plugins/channeltx/remotesource/remotesource.h b/plugins/channeltx/remotesource/remotesource.h index fb4d7840b..6b8b9e066 100644 --- a/plugins/channeltx/remotesource/remotesource.h +++ b/plugins/channeltx/remotesource/remotesource.h @@ -34,7 +34,7 @@ class ThreadedBasebandSampleSource; class UpChannelizer; -class DeviceSinkAPI; +class DeviceAPI; class RemoteSourceThread; class RemoteDataBlock; class QNetworkAccessManager; @@ -180,7 +180,7 @@ public: { } }; - RemoteSource(DeviceSinkAPI *deviceAPI); + RemoteSource(DeviceAPI *deviceAPI); ~RemoteSource(); virtual void destroy() { delete this; } @@ -218,7 +218,7 @@ public: static const QString m_channelId; private: - DeviceSinkAPI* m_deviceAPI; + DeviceAPI* m_deviceAPI; ThreadedBasebandSampleSource* m_threadedChannelizer; UpChannelizer* m_channelizer; RemoteDataQueue m_dataQueue; diff --git a/plugins/channeltx/remotesource/remotesourcegui.cpp b/plugins/channeltx/remotesource/remotesourcegui.cpp index eeb49613a..500929610 100644 --- a/plugins/channeltx/remotesource/remotesourcegui.cpp +++ b/plugins/channeltx/remotesource/remotesourcegui.cpp @@ -17,7 +17,7 @@ #include "remotesourcegui.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "gui/basicchannelsettingsdialog.h" #include "mainwindow.h" @@ -178,7 +178,7 @@ RemoteSourceGUI::RemoteSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, m_remoteSrc = (RemoteSource*) channelTx; m_remoteSrc->setMessageQueueToGUI(getInputMessageQueue()); - connect(&(m_deviceUISet->m_deviceSinkAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); + connect(&(m_deviceUISet->m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); m_channelMarker.blockSignals(true); m_channelMarker.setColor(m_settings.m_rgbColor); diff --git a/plugins/channeltx/remotesource/remotesourceplugin.cpp b/plugins/channeltx/remotesource/remotesourceplugin.cpp index 415859f7c..8d1eaa45e 100644 --- a/plugins/channeltx/remotesource/remotesourceplugin.cpp +++ b/plugins/channeltx/remotesource/remotesourceplugin.cpp @@ -66,12 +66,12 @@ PluginInstanceGUI* RemoteSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUIS } #endif -BasebandSampleSource* RemoteSourcePlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI) +BasebandSampleSource* RemoteSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) { return new RemoteSource(deviceAPI); } -ChannelSourceAPI* RemoteSourcePlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI) +ChannelSourceAPI* RemoteSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) { return new RemoteSource(deviceAPI); } diff --git a/plugins/channeltx/remotesource/remotesourceplugin.h b/plugins/channeltx/remotesource/remotesourceplugin.h index 21aba3ec3..6685f4d37 100644 --- a/plugins/channeltx/remotesource/remotesourceplugin.h +++ b/plugins/channeltx/remotesource/remotesourceplugin.h @@ -36,8 +36,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI); - virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI); + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSourceAPI* createTxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/udpsource/udpsource.cpp b/plugins/channeltx/udpsource/udpsource.cpp index 50ef7bd23..ce776f320 100644 --- a/plugins/channeltx/udpsource/udpsource.cpp +++ b/plugins/channeltx/udpsource/udpsource.cpp @@ -24,7 +24,7 @@ #include "SWGChannelReport.h" #include "SWGUDPSourceReport.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "dsp/upchannelizer.h" #include "dsp/threadedbasebandsamplesource.h" #include "dsp/dspcommands.h" @@ -41,7 +41,7 @@ MESSAGE_CLASS_DEFINITION(UDPSource::MsgResetReadIndex, Message) const QString UDPSource::m_channelIdURI = "sdrangel.channeltx.udpsource"; const QString UDPSource::m_channelId = "UDPSource"; -UDPSource::UDPSource(DeviceSinkAPI *deviceAPI) : +UDPSource::UDPSource(DeviceAPI *deviceAPI) : ChannelSourceAPI(m_channelIdURI), m_deviceAPI(deviceAPI), m_basebandSampleRate(48000), @@ -80,8 +80,8 @@ UDPSource::UDPSource(DeviceSinkAPI *deviceAPI) : m_channelizer = new UpChannelizer(this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); - m_deviceAPI->addThreadedSource(m_threadedChannelizer); - m_deviceAPI->addChannelAPI(this); + m_deviceAPI->addChannelSource(m_threadedChannelizer); + m_deviceAPI->addChannelSourceAPI(this); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -91,8 +91,8 @@ UDPSource::~UDPSource() { disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); delete m_networkManager; - m_deviceAPI->removeChannelAPI(this); - m_deviceAPI->removeThreadedSource(m_threadedChannelizer); + m_deviceAPI->removeChannelSourceAPI(this); + m_deviceAPI->removeChannelSource(m_threadedChannelizer); delete m_threadedChannelizer; delete m_channelizer; delete m_SSBFilter; diff --git a/plugins/channeltx/udpsource/udpsource.h b/plugins/channeltx/udpsource/udpsource.h index 21772a7e0..12f06c72d 100644 --- a/plugins/channeltx/udpsource/udpsource.h +++ b/plugins/channeltx/udpsource/udpsource.h @@ -35,7 +35,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSinkAPI; +class DeviceAPI; class ThreadedBasebandSampleSource; class UpChannelizer; @@ -90,7 +90,7 @@ public: { } }; - UDPSource(DeviceSinkAPI *deviceAPI); + UDPSource(DeviceAPI *deviceAPI); virtual ~UDPSource(); virtual void destroy() { delete this; } @@ -183,7 +183,7 @@ private: { } }; - DeviceSinkAPI* m_deviceAPI; + DeviceAPI* m_deviceAPI; ThreadedBasebandSampleSource* m_threadedChannelizer; UpChannelizer* m_channelizer; diff --git a/plugins/channeltx/udpsource/udpsourceplugin.cpp b/plugins/channeltx/udpsource/udpsourceplugin.cpp index 7e64c106d..8a227e16c 100644 --- a/plugins/channeltx/udpsource/udpsourceplugin.cpp +++ b/plugins/channeltx/udpsource/udpsourceplugin.cpp @@ -68,12 +68,12 @@ PluginInstanceGUI* UDPSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, } #endif -BasebandSampleSource* UDPSourcePlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI) +BasebandSampleSource* UDPSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) { return new UDPSource(deviceAPI); } -ChannelSourceAPI* UDPSourcePlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI) +ChannelSourceAPI* UDPSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) { return new UDPSource(deviceAPI); } diff --git a/plugins/channeltx/udpsource/udpsourceplugin.h b/plugins/channeltx/udpsource/udpsourceplugin.h index e2f1061c4..aab8641b1 100644 --- a/plugins/channeltx/udpsource/udpsourceplugin.h +++ b/plugins/channeltx/udpsource/udpsourceplugin.h @@ -37,8 +37,8 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI); - virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI); + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); + virtual ChannelSourceAPI* createTxChannelCS(DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/samplesink/bladerf1output/bladerf1output.cpp b/plugins/samplesink/bladerf1output/bladerf1output.cpp index 961578f7d..30187c905 100644 --- a/plugins/samplesink/bladerf1output/bladerf1output.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1output.cpp @@ -26,9 +26,10 @@ #include "SWGDeviceState.h" #include "dsp/dspcommands.h" +#include "dsp/dspdevicesourceengine.h" +#include "dsp/dspdevicesinkengine.h" #include "dsp/dspengine.h" -#include "device/devicesinkapi.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "bladerf1/devicebladerf1shared.h" #include "bladerf1outputthread.h" #include "bladerf1output.h" @@ -37,7 +38,7 @@ MESSAGE_CLASS_DEFINITION(Bladerf1Output::MsgConfigureBladerf1, Message) MESSAGE_CLASS_DEFINITION(Bladerf1Output::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(Bladerf1Output::MsgReportBladerf1, Message) -Bladerf1Output::Bladerf1Output(DeviceSinkAPI *deviceAPI) : +Bladerf1Output::Bladerf1Output(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_dev(0), @@ -83,7 +84,7 @@ bool Bladerf1Output::openDevice() if (m_deviceAPI->getSourceBuddies().size() > 0) { - DeviceSourceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; + DeviceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; DeviceBladeRF1Params *buddySharedParams = (DeviceBladeRF1Params *) sourceBuddy->getBuddySharedPtr(); if (buddySharedParams == 0) @@ -103,9 +104,9 @@ bool Bladerf1Output::openDevice() } else { - if (!DeviceBladeRF1::open_bladerf(&m_dev, qPrintable(m_deviceAPI->getSampleSinkSerial()))) + if (!DeviceBladeRF1::open_bladerf(&m_dev, qPrintable(m_deviceAPI->getSamplingDeviceSerial()))) { - qCritical("BladerfOutput::start: could not open BladeRF %s", qPrintable(m_deviceAPI->getSampleSinkSerial())); + qCritical("BladerfOutput::start: could not open BladeRF %s", qPrintable(m_deviceAPI->getSamplingDeviceSerial())); return false; } @@ -277,14 +278,14 @@ bool Bladerf1Output::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initGeneration()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startGeneration(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopGeneration(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { @@ -420,7 +421,7 @@ bool Bladerf1Output::applySettings(const BladeRF1OutputSettings& settings, bool if (m_deviceAPI->getSourceBuddies().size() > 0) { - DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[0]; + DeviceAPI *buddy = m_deviceAPI->getSourceBuddies()[0]; if (buddy->getDeviceSourceEngine()->state() == DSPDeviceSourceEngine::StRunning) { // Tx side running changeSettings = false; diff --git a/plugins/samplesink/bladerf1output/bladerf1output.h b/plugins/samplesink/bladerf1output/bladerf1output.h index ae19373ec..a74b6ae07 100644 --- a/plugins/samplesink/bladerf1output/bladerf1output.h +++ b/plugins/samplesink/bladerf1output/bladerf1output.h @@ -29,7 +29,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSinkAPI; +class DeviceAPI; class Bladerf1OutputThread; class Bladerf1Output : public DeviceSampleSink { @@ -94,7 +94,7 @@ public: { } }; - Bladerf1Output(DeviceSinkAPI *deviceAPI); + Bladerf1Output(DeviceAPI *deviceAPI); virtual ~Bladerf1Output(); virtual void destroy(); @@ -133,7 +133,7 @@ public: QString& errorMessage); private: - DeviceSinkAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; BladeRF1OutputSettings m_settings; struct bladerf* m_dev; diff --git a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp index 88f24fc8b..28633cc68 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp @@ -27,7 +27,7 @@ #include "gui/basicdevicesettingsdialog.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "bladerf1outputgui.h" @@ -41,9 +41,9 @@ Bladerf1OutputGui::Bladerf1OutputGui(DeviceUISet *deviceUISet, QWidget* parent) m_sampleRateMode(true), m_deviceSampleSink(nullptr), m_sampleRate(0), - m_lastEngineState(DSPDeviceSinkEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { - m_deviceSampleSink = (Bladerf1Output*) m_deviceUISet->m_deviceSinkAPI->getSampleSink(); + m_deviceSampleSink = (Bladerf1Output*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -395,24 +395,24 @@ void Bladerf1OutputGui::updateHardware() void Bladerf1OutputGui::updateStatus() { - int state = m_deviceUISet->m_deviceSinkAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSinkEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSinkEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSinkEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSinkEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSinkAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp b/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp index 6050b9c04..aa5704c5b 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp @@ -136,7 +136,7 @@ PluginInstanceGUI* Bladerf1OutputPlugin::createSampleSinkPluginInstanceGUI( } #endif -DeviceSampleSink* Bladerf1OutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI) +DeviceSampleSink* Bladerf1OutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI) { if(sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/bladerf1output/bladerf1outputplugin.h b/plugins/samplesink/bladerf1output/bladerf1outputplugin.h index b70d7d7bb..739e78db7 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputplugin.h +++ b/plugins/samplesink/bladerf1output/bladerf1outputplugin.h @@ -43,7 +43,7 @@ public: QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI); + virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesink/bladerf2output/bladerf2output.cpp b/plugins/samplesink/bladerf2output/bladerf2output.cpp index b7f1b6278..c1d60b498 100644 --- a/plugins/samplesink/bladerf2output/bladerf2output.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2output.cpp @@ -31,8 +31,7 @@ #include "dsp/dspcommands.h" #include "dsp/dspengine.h" -#include "device/devicesinkapi.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "bladerf2/devicebladerf2shared.h" #include "bladerf2/devicebladerf2.h" @@ -43,7 +42,7 @@ MESSAGE_CLASS_DEFINITION(BladeRF2Output::MsgConfigureBladeRF2, Message) MESSAGE_CLASS_DEFINITION(BladeRF2Output::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(BladeRF2Output::MsgReportGainRange, Message) -BladeRF2Output::BladeRF2Output(DeviceSinkAPI *deviceAPI) : +BladeRF2Output::BladeRF2Output(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_dev(0), @@ -82,7 +81,7 @@ bool BladeRF2Output::openDevice() { qDebug("BladeRF2Output::openDevice: look in Tx buddies"); - DeviceSinkAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; + DeviceAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; DeviceBladeRF2Shared *deviceBladeRF2Shared = (DeviceBladeRF2Shared*) sinkBuddy->getBuddySharedPtr(); if (deviceBladeRF2Shared == 0) @@ -106,7 +105,7 @@ bool BladeRF2Output::openDevice() { qDebug("BladeRF2Output::openDevice: look in Rx buddies"); - DeviceSourceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; + DeviceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; DeviceBladeRF2Shared *deviceBladeRF2Shared = (DeviceBladeRF2Shared*) sourceBuddy->getBuddySharedPtr(); if (deviceBladeRF2Shared == 0) @@ -132,7 +131,7 @@ bool BladeRF2Output::openDevice() m_deviceShared.m_dev = new DeviceBladeRF2(); char serial[256]; - strcpy(serial, qPrintable(m_deviceAPI->getSampleSinkSerial())); + strcpy(serial, qPrintable(m_deviceAPI->getSamplingDeviceSerial())); if (!m_deviceShared.m_dev->open(serial)) { @@ -186,8 +185,8 @@ BladeRF2OutputThread *BladeRF2Output::findThread() BladeRF2OutputThread *bladeRF2OutputThread = 0; // find a buddy that has allocated the thread - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { @@ -213,8 +212,8 @@ BladeRF2OutputThread *BladeRF2Output::findThread() void BladeRF2Output::moveThreadToBuddy() { - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { @@ -300,8 +299,8 @@ bool BladeRF2Output::start() } // remove old thread address from buddies (reset in all buddies) - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { ((DeviceBladeRF2Shared*) (*it)->getBuddySharedPtr())->m_sink->setThread(0); @@ -394,8 +393,8 @@ void BladeRF2Output::stop() m_thread = 0; // remove old thread address from buddies (reset in all buddies) - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { ((DeviceBladeRF2Shared*) (*it)->getBuddySharedPtr())->m_sink->setThread(0); @@ -438,8 +437,8 @@ void BladeRF2Output::stop() } // remove old thread address from buddies (reset in all buddies) - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { ((DeviceBladeRF2Shared*) (*it)->getBuddySharedPtr())->m_sink->setThread(0); @@ -674,14 +673,14 @@ bool BladeRF2Output::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initGeneration()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startGeneration(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopGeneration(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { @@ -876,8 +875,8 @@ bool BladeRF2Output::applySettings(const BladeRF2OutputSettings& settings, bool if (forwardChangeRxBuddies) { // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { @@ -887,15 +886,15 @@ bool BladeRF2Output::applySettings(const BladeRF2OutputSettings& settings, bool 2, settings.m_devSampleRate, // need to forward actual rate to the Rx side false); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } } if (forwardChangeTxBuddies) { // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { @@ -905,7 +904,7 @@ bool BladeRF2Output::applySettings(const BladeRF2OutputSettings& settings, bool 2, settings.m_devSampleRate, false); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } } diff --git a/plugins/samplesink/bladerf2output/bladerf2output.h b/plugins/samplesink/bladerf2output/bladerf2output.h index 985ab3918..dc0c56106 100644 --- a/plugins/samplesink/bladerf2output/bladerf2output.h +++ b/plugins/samplesink/bladerf2output/bladerf2output.h @@ -29,7 +29,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSinkAPI; +class DeviceAPI; class BladeRF2OutputThread; struct bladerf_gain_modes; @@ -103,7 +103,7 @@ public: {} }; - BladeRF2Output(DeviceSinkAPI *deviceAPI); + BladeRF2Output(DeviceAPI *deviceAPI); virtual ~BladeRF2Output(); virtual void destroy(); @@ -153,7 +153,7 @@ public: QString& errorMessage); private: - DeviceSinkAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; BladeRF2OutputSettings m_settings; struct bladerf* m_dev; diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp index 6797d1801..88c5fd8f7 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp @@ -27,7 +27,7 @@ #include "gui/basicdevicesettingsdialog.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "bladerf2outputgui.h" @@ -41,9 +41,9 @@ BladeRF2OutputGui::BladeRF2OutputGui(DeviceUISet *deviceUISet, QWidget* parent) m_settings(), m_sampleRateMode(true), m_sampleRate(0), - m_lastEngineState(DSPDeviceSinkEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { - m_sampleSink = (BladeRF2Output*) m_deviceUISet->m_deviceSinkAPI->getSampleSink(); + m_sampleSink = (BladeRF2Output*) m_deviceUISet->m_deviceAPI->getSampleSink(); int max, min, step; uint64_t f_min, f_max; @@ -405,24 +405,24 @@ void BladeRF2OutputGui::updateHardware() void BladeRF2OutputGui::updateStatus() { - int state = m_deviceUISet->m_deviceSinkAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSinkEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSinkEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSinkEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSinkEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSinkAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp b/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp index c933e912e..ccf8bb12f 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp @@ -140,7 +140,7 @@ PluginInstanceGUI* BladeRF2OutputPlugin::createSampleSinkPluginInstanceGUI( } #endif -DeviceSampleSink* BladeRF2OutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI) +DeviceSampleSink* BladeRF2OutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI) { if(sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/bladerf2output/bladerf2outputplugin.h b/plugins/samplesink/bladerf2output/bladerf2outputplugin.h index 31b8c41be..6036c94cf 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputplugin.h +++ b/plugins/samplesink/bladerf2output/bladerf2outputplugin.h @@ -43,7 +43,7 @@ public: QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI); + virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesink/filesink/filesinkgui.cpp b/plugins/samplesink/filesink/filesinkgui.cpp index 2b93b0f1d..6e75270a1 100644 --- a/plugins/samplesink/filesink/filesinkgui.cpp +++ b/plugins/samplesink/filesink/filesinkgui.cpp @@ -32,7 +32,7 @@ #include "mainwindow.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "filesinkgui.h" @@ -50,7 +50,7 @@ FileSinkGui::FileSinkGui(DeviceUISet *deviceUISet, QWidget* parent) : m_startingTimeStamp(0), m_samplesCount(0), m_tickCount(0), - m_lastEngineState(DSPDeviceSinkEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { ui->setupUi(this); @@ -62,14 +62,14 @@ FileSinkGui::FileSinkGui(DeviceUISet *deviceUISet, QWidget* parent) : ui->fileNameText->setText(m_fileName); - connect(&(m_deviceUISet->m_deviceSinkAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); + connect(&(m_deviceUISet->m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); m_statusTimer.start(500); displaySettings(); - m_deviceSampleSink = (FileSinkOutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink(); + m_deviceSampleSink = (FileSinkOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection); } @@ -226,24 +226,24 @@ void FileSinkGui::updateHardware() void FileSinkGui::updateStatus() { - int state = m_deviceUISet->m_deviceSinkAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSinkEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSinkEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSinkEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSinkEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSinkAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesink/filesink/filesinkoutput.cpp b/plugins/samplesink/filesink/filesinkoutput.cpp index 17bf9ac0f..567072f46 100644 --- a/plugins/samplesink/filesink/filesinkoutput.cpp +++ b/plugins/samplesink/filesink/filesinkoutput.cpp @@ -27,7 +27,7 @@ #include "dsp/dspengine.h" #include "dsp/filerecord.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "filesinkoutput.h" #include "filesinkthread.h" @@ -40,7 +40,7 @@ MESSAGE_CLASS_DEFINITION(FileSinkOutput::MsgConfigureFileSinkStreamTiming, Messa MESSAGE_CLASS_DEFINITION(FileSinkOutput::MsgReportFileSinkGeneration, Message) MESSAGE_CLASS_DEFINITION(FileSinkOutput::MsgReportFileSinkStreamTiming, Message) -FileSinkOutput::FileSinkOutput(DeviceSinkAPI *deviceAPI) : +FileSinkOutput::FileSinkOutput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_fileSinkThread(0), @@ -214,14 +214,14 @@ bool FileSinkOutput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initGeneration()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startGeneration(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopGeneration(); + m_deviceAPI->stopDeviceEngine(); } return true; diff --git a/plugins/samplesink/filesink/filesinkoutput.h b/plugins/samplesink/filesink/filesinkoutput.h index cb8fa11f7..25c535a9b 100644 --- a/plugins/samplesink/filesink/filesinkoutput.h +++ b/plugins/samplesink/filesink/filesinkoutput.h @@ -28,7 +28,7 @@ #include "filesinksettings.h" class FileSinkThread; -class DeviceSinkAPI; +class DeviceAPI; class FileSinkOutput : public DeviceSampleSink { public: @@ -171,7 +171,7 @@ public: { } }; - FileSinkOutput(DeviceSinkAPI *deviceAPI); + FileSinkOutput(DeviceAPI *deviceAPI); virtual ~FileSinkOutput(); virtual void destroy(); @@ -201,7 +201,7 @@ public: QString& errorMessage); private: - DeviceSinkAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; FileSinkSettings m_settings; std::ofstream m_ofstream; diff --git a/plugins/samplesink/filesink/filesinkplugin.cpp b/plugins/samplesink/filesink/filesinkplugin.cpp index 83c3eb2e7..02c0581c0 100644 --- a/plugins/samplesink/filesink/filesinkplugin.cpp +++ b/plugins/samplesink/filesink/filesinkplugin.cpp @@ -100,7 +100,7 @@ PluginInstanceGUI* FileSinkPlugin::createSampleSinkPluginInstanceGUI( } #endif -DeviceSampleSink* FileSinkPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI) +DeviceSampleSink* FileSinkPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI) { if(sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/filesink/filesinkplugin.h b/plugins/samplesink/filesink/filesinkplugin.h index 12fda1e97..0e726ce87 100644 --- a/plugins/samplesink/filesink/filesinkplugin.h +++ b/plugins/samplesink/filesink/filesinkplugin.h @@ -24,7 +24,7 @@ #define FILESINK_DEVICE_TYPE_ID "sdrangel.samplesink.filesink" class PluginAPI; -class DeviceSinkAPI; +class DeviceAPI; class FileSinkPlugin : public QObject, public PluginInterface { Q_OBJECT @@ -42,7 +42,7 @@ public: const QString& sinkId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI); + virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp index 800c5fcc3..f014bc30b 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp @@ -28,8 +28,7 @@ #include "util/simpleserializer.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "hackrf/devicehackrfshared.h" #include "hackrfoutputthread.h" #include "hackrfoutput.h" @@ -38,7 +37,7 @@ MESSAGE_CLASS_DEFINITION(HackRFOutput::MsgConfigureHackRF, Message) MESSAGE_CLASS_DEFINITION(HackRFOutput::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(HackRFOutput::MsgReportHackRF, Message) -HackRFOutput::HackRFOutput(DeviceSinkAPI *deviceAPI) : +HackRFOutput::HackRFOutput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_dev(0), @@ -81,7 +80,7 @@ bool HackRFOutput::openDevice() if (m_deviceAPI->getSourceBuddies().size() > 0) { - DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[0]; + DeviceAPI *buddy = m_deviceAPI->getSourceBuddies()[0]; DeviceHackRFParams *buddySharedParams = (DeviceHackRFParams *) buddy->getBuddySharedPtr(); if (buddySharedParams == 0) @@ -101,9 +100,9 @@ bool HackRFOutput::openDevice() } else { - if ((m_dev = DeviceHackRF::open_hackrf(qPrintable(m_deviceAPI->getSampleSinkSerial()))) == 0) + if ((m_dev = DeviceHackRF::open_hackrf(qPrintable(m_deviceAPI->getSamplingDeviceSerial()))) == 0) { - qCritical("HackRFOutput::openDevice: could not open HackRF %s", qPrintable(m_deviceAPI->getSampleSinkSerial())); + qCritical("HackRFOutput::openDevice: could not open HackRF %s", qPrintable(m_deviceAPI->getSamplingDeviceSerial())); return false; } @@ -258,14 +257,14 @@ bool HackRFOutput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initGeneration()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startGeneration(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopGeneration(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { @@ -436,9 +435,9 @@ bool HackRFOutput::applySettings(const HackRFOutputSettings& settings, bool forc if (m_deviceAPI->getSourceBuddies().size() > 0) { - DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[0]; + DeviceAPI *buddy = m_deviceAPI->getSourceBuddies()[0]; DeviceHackRFShared::MsgSynchronizeFrequency *freqMsg = DeviceHackRFShared::MsgSynchronizeFrequency::create(deviceCenterFrequency); - buddy->getSampleSourceInputMessageQueue()->push(freqMsg); + buddy->getSamplingDeviceInputMessageQueue()->push(freqMsg); } forwardChange = true; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.h b/plugins/samplesink/hackrfoutput/hackrfoutput.h index bfcdb98fe..ec34521b3 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutput.h +++ b/plugins/samplesink/hackrfoutput/hackrfoutput.h @@ -29,7 +29,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSinkAPI; +class DeviceAPI; class HackRFOutputThread; class HackRFOutput : public DeviceSampleSink { @@ -95,7 +95,7 @@ public: { } }; - HackRFOutput(DeviceSinkAPI *deviceAPI); + HackRFOutput(DeviceAPI *deviceAPI); virtual ~HackRFOutput(); virtual void destroy(); @@ -134,7 +134,7 @@ public: QString& errorMessage); private: - DeviceSinkAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; HackRFOutputSettings m_settings; struct hackrf_device* m_dev; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp index 2efba67b3..e72c979d0 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp @@ -26,8 +26,7 @@ #include "gui/basicdevicesettingsdialog.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" -#include "device/devicesinkapi.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "hackrf/devicehackrfvalues.h" #include "hackrf/devicehackrfshared.h" @@ -43,10 +42,10 @@ HackRFOutputGui::HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_settings(), m_sampleRateMode(true), m_deviceSampleSink(0), - m_lastEngineState(DSPDeviceSinkEngine::StNotStarted), + m_lastEngineState(DeviceAPI::StNotStarted), m_doApplySettings(true) { - m_deviceSampleSink = (HackRFOutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink(); + m_deviceSampleSink = (HackRFOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -402,25 +401,25 @@ void HackRFOutputGui::updateHardware() void HackRFOutputGui::updateStatus() { - int state = m_deviceUISet->m_deviceSinkAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSinkEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSinkEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); ui->startStop->setChecked(false); break; - case DSPDeviceSinkEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSinkEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSinkAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp index dd2f17c16..d817d7ec6 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp @@ -149,7 +149,7 @@ PluginInstanceGUI* HackRFOutputPlugin::createSampleSinkPluginInstanceGUI( } #endif -DeviceSampleSink* HackRFOutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI) +DeviceSampleSink* HackRFOutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI) { if(sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.h b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.h index 53869b8f2..201376683 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.h +++ b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.h @@ -41,7 +41,7 @@ public: const QString& sinkId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI); + virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index a48720ea1..a374bdfc1 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -31,8 +31,7 @@ #include "SWGDeviceReport.h" #include "SWGLimeSdrOutputReport.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" #include "limesdroutputthread.h" @@ -47,7 +46,7 @@ MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgGetDeviceInfo, Message) MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgReportStreamInfo, Message) -LimeSDROutput::LimeSDROutput(DeviceSinkAPI *deviceAPI) : +LimeSDROutput::LimeSDROutput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_limeSDROutputThread(0), @@ -97,7 +96,7 @@ bool LimeSDROutput::openDevice() { qDebug("LimeSDROutput::openDevice: look in Ix buddies"); - DeviceSinkAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; + DeviceAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; //m_deviceShared = *((DeviceLimeSDRShared *) sinkBuddy->getBuddySharedPtr()); // copy shared data DeviceLimeSDRShared *deviceLimeSDRShared = (DeviceLimeSDRShared*) sinkBuddy->getBuddySharedPtr(); m_deviceShared.m_deviceParams = deviceLimeSDRShared->m_deviceParams; @@ -128,7 +127,7 @@ bool LimeSDROutput::openDevice() for (unsigned int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) { - DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[i]; + DeviceAPI *buddy = m_deviceAPI->getSinkBuddies()[i]; DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr(); if (buddyShared->m_channel == requestedChannel) @@ -146,7 +145,7 @@ bool LimeSDROutput::openDevice() { qDebug("LimeSDROutput::openDevice: look in Rx buddies"); - DeviceSourceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; + DeviceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; //m_deviceShared = *((DeviceLimeSDRShared *) sourceBuddy->getBuddySharedPtr()); // copy parameters DeviceLimeSDRShared *deviceLimeSDRShared = (DeviceLimeSDRShared*) sourceBuddy->getBuddySharedPtr(); m_deviceShared.m_deviceParams = deviceLimeSDRShared->m_deviceParams; @@ -172,7 +171,7 @@ bool LimeSDROutput::openDevice() m_deviceShared.m_deviceParams = new DeviceLimeSDRParams(); char serial[256]; - strcpy(serial, qPrintable(m_deviceAPI->getSampleSinkSerial())); + strcpy(serial, qPrintable(m_deviceAPI->getSamplingDeviceSerial())); m_deviceShared.m_deviceParams->open(serial); m_deviceShared.m_channel = requestedChannel; // acknowledge the requested channel } @@ -184,8 +183,8 @@ bool LimeSDROutput::openDevice() void LimeSDROutput::suspendRxBuddies() { - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); qDebug("LimeSDROutput::suspendRxBuddies (%lu)", sourceBuddies.size()); @@ -207,8 +206,8 @@ void LimeSDROutput::suspendRxBuddies() void LimeSDROutput::suspendTxBuddies() { - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); qDebug("LimeSDROutput::suspendTxBuddies (%lu)", sinkBuddies.size()); @@ -230,8 +229,8 @@ void LimeSDROutput::suspendTxBuddies() void LimeSDROutput::resumeRxBuddies() { - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); qDebug("LimeSDROutput::resumeRxBuddies (%lu)", sourceBuddies.size()); @@ -247,8 +246,8 @@ void LimeSDROutput::resumeRxBuddies() void LimeSDROutput::resumeTxBuddies() { - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); qDebug("LimeSDROutput::resumeTxBuddies (%lu)", sinkBuddies.size()); @@ -536,14 +535,14 @@ bool LimeSDROutput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initGeneration()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startGeneration(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopGeneration(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { @@ -643,7 +642,7 @@ bool LimeSDROutput::handleMessage(const Message& message) if (m_streamId.handle && (LMS_GetStreamStatus(&m_streamId, &status) == 0)) { - if (m_deviceAPI->getSampleSinkGUIMessageQueue()) + if (m_deviceAPI->getSamplingDeviceGUIMessageQueue()) { MsgReportStreamInfo *report = MsgReportStreamInfo::create( true, // Success @@ -655,12 +654,12 @@ bool LimeSDROutput::handleMessage(const Message& message) status.droppedPackets, status.linkRate, status.timestamp); - m_deviceAPI->getSampleSinkGUIMessageQueue()->push(report); + m_deviceAPI->getSamplingDeviceGUIMessageQueue()->push(report); } } else { - if (m_deviceAPI->getSampleSinkGUIMessageQueue()) + if (m_deviceAPI->getSamplingDeviceGUIMessageQueue()) { MsgReportStreamInfo *report = MsgReportStreamInfo::create( false, // Success @@ -672,7 +671,7 @@ bool LimeSDROutput::handleMessage(const Message& message) 0, // status.droppedPackets, 0, // status.linkRate, 0); // status.timestamp); - m_deviceAPI->getSampleSinkGUIMessageQueue()->push(report); + m_deviceAPI->getSamplingDeviceGUIMessageQueue()->push(report); } } @@ -703,28 +702,28 @@ bool LimeSDROutput::handleMessage(const Message& message) } // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { - if ((*itSource)->getSampleSourceGUIMessageQueue()) + if ((*itSource)->getSamplingDeviceGUIMessageQueue()) { DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp, gpioPins); - (*itSource)->getSampleSourceGUIMessageQueue()->push(report); + (*itSource)->getSamplingDeviceGUIMessageQueue()->push(report); } } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { - if ((*itSink)->getSampleSinkGUIMessageQueue()) + if ((*itSink)->getSamplingDeviceGUIMessageQueue()) { DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp, gpioPins); - (*itSink)->getSampleSinkGUIMessageQueue()->push(report); + (*itSink)->getSamplingDeviceGUIMessageQueue()->push(report); } } @@ -1103,25 +1102,25 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { DeviceLimeSDRShared::MsgReportBuddyChange *report = DeviceLimeSDRShared::MsgReportBuddyChange::create( m_settings.m_devSampleRate, m_settings.m_log2HardInterp, m_settings.m_centerFrequency, false); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { DeviceLimeSDRShared::MsgReportBuddyChange *report = DeviceLimeSDRShared::MsgReportBuddyChange::create( m_settings.m_devSampleRate, m_settings.m_log2HardInterp, m_settings.m_centerFrequency, false); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } } else if (forwardChangeTxDSP) @@ -1136,14 +1135,14 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { DeviceLimeSDRShared::MsgReportBuddyChange *report = DeviceLimeSDRShared::MsgReportBuddyChange::create( m_settings.m_devSampleRate, m_settings.m_log2HardInterp, m_settings.m_centerFrequency, false); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } } else if (forwardChangeOwnDSP) @@ -1159,49 +1158,49 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo if (forwardClockSource) { // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { DeviceLimeSDRShared::MsgReportClockSourceChange *report = DeviceLimeSDRShared::MsgReportClockSourceChange::create( m_settings.m_extClock, m_settings.m_extClockFreq); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { DeviceLimeSDRShared::MsgReportClockSourceChange *report = DeviceLimeSDRShared::MsgReportClockSourceChange::create( m_settings.m_extClock, m_settings.m_extClockFreq); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } } if (forwardGPIOChange) { - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { DeviceLimeSDRShared::MsgReportGPIOChange *report = DeviceLimeSDRShared::MsgReportGPIOChange::create( m_settings.m_gpioDir, m_settings.m_gpioPins); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { DeviceLimeSDRShared::MsgReportGPIOChange *report = DeviceLimeSDRShared::MsgReportGPIOChange::create( m_settings.m_gpioDir, m_settings.m_gpioPins); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } } diff --git a/plugins/samplesink/limesdroutput/limesdroutput.h b/plugins/samplesink/limesdroutput/limesdroutput.h index 64cf2e243..27994b026 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.h +++ b/plugins/samplesink/limesdroutput/limesdroutput.h @@ -29,7 +29,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSinkAPI; +class DeviceAPI; class LimeSDROutputThread; struct DeviceLimeSDRParams; @@ -184,7 +184,7 @@ public: { } }; - LimeSDROutput(DeviceSinkAPI *deviceAPI); + LimeSDROutput(DeviceAPI *deviceAPI); virtual ~LimeSDROutput(); virtual void destroy(); @@ -234,7 +234,7 @@ public: DeviceLimeSDRParams::LimeType getLimeType() const; private: - DeviceSinkAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; LimeSDROutputSettings m_settings; LimeSDROutputThread* m_limeSDROutputThread; diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index b219a7c89..5afe92170 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -25,7 +25,7 @@ #include "gui/basicdevicesettingsdialog.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "limesdroutputgui.h" @@ -36,13 +36,13 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_settings(), m_sampleRateMode(true), m_sampleRate(0), - m_lastEngineState(DSPDeviceSinkEngine::StNotStarted), + m_lastEngineState(DeviceAPI::StNotStarted), m_doApplySettings(true), m_forceSettings(true), m_statusCounter(0), m_deviceStatusCounter(0) { - m_limeSDROutput = (LimeSDROutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink(); + m_limeSDROutput = (LimeSDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(this); @@ -88,7 +88,7 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : displaySettings(); char recFileNameCStr[30]; - sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceUISet->m_deviceSinkAPI->getDeviceUID()); + sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceUISet->m_deviceAPI->getDeviceUID()); connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection); @@ -453,24 +453,24 @@ void LimeSDROutputGUI::updateHardware() void LimeSDROutputGUI::updateStatus() { - int state = m_deviceUISet->m_deviceSinkAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSinkEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSinkEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSinkEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSinkEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSinkAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; @@ -496,7 +496,7 @@ void LimeSDROutputGUI::updateStatus() } else { - if (m_deviceUISet->m_deviceSinkAPI->isBuddyLeader()) + if (m_deviceUISet->m_deviceAPI->isBuddyLeader()) { LimeSDROutput::MsgGetDeviceInfo* message = LimeSDROutput::MsgGetDeviceInfo::create(); m_limeSDROutput->getInputMessageQueue()->push(message); diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp index d98c1e174..1ffae5ffb 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp @@ -157,7 +157,7 @@ bool LimeSDROutputPlugin::findSerial(const char *lmsInfoStr, std::string& serial } } -DeviceSampleSink* LimeSDROutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI) +DeviceSampleSink* LimeSDROutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI) { if(sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.h b/plugins/samplesink/limesdroutput/limesdroutputplugin.h index c8e032e89..3f41b8a24 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputplugin.h +++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.h @@ -41,7 +41,7 @@ public: const QString& sinkId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI); + virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesink/plutosdroutput/plutosdroutput.cpp b/plugins/samplesink/plutosdroutput/plutosdroutput.cpp index 1e7f4b444..970cc2da1 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutput.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutput.cpp @@ -26,8 +26,7 @@ #include "dsp/dspcommands.h" #include "dsp/dspengine.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "plutosdr/deviceplutosdrparams.h" #include "plutosdr/deviceplutosdrbox.h" @@ -39,7 +38,7 @@ MESSAGE_CLASS_DEFINITION(PlutoSDROutput::MsgConfigurePlutoSDR, Message) MESSAGE_CLASS_DEFINITION(PlutoSDROutput::MsgStartStop, Message) -PlutoSDROutput::PlutoSDROutput(DeviceSinkAPI *deviceAPI) : +PlutoSDROutput::PlutoSDROutput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_deviceDescription("PlutoSDROutput"), m_settings(), @@ -209,14 +208,14 @@ bool PlutoSDROutput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initGeneration()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startGeneration(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopGeneration(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { @@ -240,7 +239,7 @@ bool PlutoSDROutput::openDevice() { qDebug("PlutoSDROutput::openDevice: look at Rx buddy"); - DeviceSourceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; + DeviceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; DevicePlutoSDRShared* buddySharedPtr = (DevicePlutoSDRShared*) sourceBuddy->getBuddySharedPtr(); m_deviceShared.m_deviceParams = buddySharedPtr->m_deviceParams; @@ -262,7 +261,7 @@ bool PlutoSDROutput::openDevice() m_deviceShared.m_deviceParams = new DevicePlutoSDRParams(); char serial[256]; - strcpy(serial, qPrintable(m_deviceAPI->getSampleSinkSerial())); + strcpy(serial, qPrintable(m_deviceAPI->getSamplingDeviceSerial())); m_deviceShared.m_deviceParams->open(serial); } @@ -296,7 +295,7 @@ void PlutoSDROutput::suspendBuddies() for (unsigned int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++) { - DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[i]; + DeviceAPI *buddy = m_deviceAPI->getSourceBuddies()[i]; DevicePlutoSDRShared *buddyShared = (DevicePlutoSDRShared *) buddy->getBuddySharedPtr(); if (buddyShared->m_thread) { @@ -311,7 +310,7 @@ void PlutoSDROutput::resumeBuddies() for (unsigned int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++) { - DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[i]; + DeviceAPI *buddy = m_deviceAPI->getSourceBuddies()[i]; DevicePlutoSDRShared *buddyShared = (DevicePlutoSDRShared *) buddy->getBuddySharedPtr(); if (buddyShared->m_thread) { @@ -383,8 +382,8 @@ bool PlutoSDROutput::applySettings(const PlutoSDROutputSettings& settings, bool if (suspendAllOtherThreads) { - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSink = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSink = sourceBuddies.begin(); for (; itSink != sourceBuddies.end(); ++itSink) { @@ -526,8 +525,8 @@ bool PlutoSDROutput::applySettings(const PlutoSDROutputSettings& settings, bool if (suspendAllOtherThreads) { - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { @@ -548,8 +547,8 @@ bool PlutoSDROutput::applySettings(const PlutoSDROutputSettings& settings, bool { qDebug("PlutoSDROutput::applySettings: forwardChangeOtherDSP"); - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { @@ -560,13 +559,13 @@ bool PlutoSDROutput::applySettings(const PlutoSDROutputSettings& settings, bool settings.m_lpfFIRBW, settings.m_LOppmTenths); - if ((*itSource)->getSampleSourceGUIMessageQueue()) + if ((*itSource)->getSamplingDeviceGUIMessageQueue()) { DevicePlutoSDRShared::MsgCrossReportToBuddy *msgToGUI = new DevicePlutoSDRShared::MsgCrossReportToBuddy(*msg); - (*itSource)->getSampleSourceGUIMessageQueue()->push(msgToGUI); + (*itSource)->getSamplingDeviceGUIMessageQueue()->push(msgToGUI); } - (*itSource)->getSampleSourceInputMessageQueue()->push(msg); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(msg); } } diff --git a/plugins/samplesink/plutosdroutput/plutosdroutput.h b/plugins/samplesink/plutosdroutput/plutosdroutput.h index 21d704586..27d85dfd7 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutput.h +++ b/plugins/samplesink/plutosdroutput/plutosdroutput.h @@ -30,7 +30,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSinkAPI; +class DeviceAPI; class PlutoSDROutputThread; class PlutoSDROutput : public DeviceSampleSink { @@ -78,7 +78,7 @@ public: { } }; - PlutoSDROutput(DeviceSinkAPI *deviceAPI); + PlutoSDROutput(DeviceAPI *deviceAPI); ~PlutoSDROutput(); virtual void destroy(); @@ -129,7 +129,7 @@ public: float getTemperature(); private: - DeviceSinkAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QString m_deviceDescription; PlutoSDROutputSettings m_settings; bool m_running; diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp index 3a15e4359..1a908c740 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp @@ -24,7 +24,7 @@ #include "gui/glspectrum.h" #include "gui/crightclickenabler.h" #include "gui/basicdevicesettingsdialog.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "plutosdr/deviceplutosdr.h" #include "plutosdroutput.h" @@ -41,11 +41,11 @@ PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) m_sampleSink(0), m_sampleRate(0), m_deviceCenterFrequency(0), - m_lastEngineState(DSPDeviceSinkEngine::StNotStarted), + m_lastEngineState(DeviceAPI::StNotStarted), m_doApplySettings(true), m_statusCounter(0) { - m_sampleSink = (PlutoSDROutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink(); + m_sampleSink = (PlutoSDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -373,24 +373,24 @@ void PlutoSDROutputGUI::blockApplySettings(bool block) void PlutoSDROutputGUI::updateStatus() { - int state = m_deviceUISet->m_deviceSinkAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSinkEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSinkEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSinkEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSinkEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSinkAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; @@ -419,7 +419,7 @@ void PlutoSDROutputGUI::updateStatus() if (m_statusCounter % 10 == 0) // 5s { - if (m_deviceUISet->m_deviceSinkAPI->isBuddyLeader()) { + if (m_deviceUISet->m_deviceAPI->isBuddyLeader()) { ((PlutoSDROutput *) m_sampleSink)->fetchTemperature(); } diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp index 79f60b55e..1f0a6cce8 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp @@ -27,8 +27,6 @@ #endif #include "plutosdroutputplugin.h" -class DeviceSourceAPI; - const PluginDescriptor PlutoSDROutputPlugin::m_pluginDescriptor = { QString("PlutoSDR Output"), QString("4.5.4"), @@ -115,7 +113,7 @@ PluginInstanceGUI* PlutoSDROutputPlugin::createSampleSinkPluginInstanceGUI( } #endif -DeviceSampleSink *PlutoSDROutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI) +DeviceSampleSink *PlutoSDROutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI) { if (sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.h b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.h index 3395fe1dd..aea40f5cb 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.h +++ b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.h @@ -41,7 +41,7 @@ public: const QString& sinkId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI); + virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesink/remoteoutput/remoteoutput.cpp b/plugins/samplesink/remoteoutput/remoteoutput.cpp index a86989cde..537063e0b 100644 --- a/plugins/samplesink/remoteoutput/remoteoutput.cpp +++ b/plugins/samplesink/remoteoutput/remoteoutput.cpp @@ -33,7 +33,7 @@ #include "dsp/dspengine.h" #include "dsp/filerecord.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "remoteoutput.h" #include "remoteoutputthread.h" @@ -45,7 +45,7 @@ MESSAGE_CLASS_DEFINITION(RemoteOutput::MsgConfigureRemoteOutputChunkCorrection, const uint32_t RemoteOutput::NbSamplesForRateCorrection = 5000000; -RemoteOutput::RemoteOutput(DeviceSinkAPI *deviceAPI) : +RemoteOutput::RemoteOutput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_centerFrequency(0), @@ -209,14 +209,14 @@ bool RemoteOutput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initGeneration()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startGeneration(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopGeneration(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { diff --git a/plugins/samplesink/remoteoutput/remoteoutput.h b/plugins/samplesink/remoteoutput/remoteoutput.h index db3cc9da6..558d41ddb 100644 --- a/plugins/samplesink/remoteoutput/remoteoutput.h +++ b/plugins/samplesink/remoteoutput/remoteoutput.h @@ -32,7 +32,7 @@ #include "remoteoutputsettings.h" class RemoteOutputThread; -class DeviceSinkAPI; +class DeviceAPI; class QNetworkAccessManager; class QNetworkReply; class QJsonObject; @@ -122,7 +122,7 @@ public: { } }; - RemoteOutput(DeviceSinkAPI *deviceAPI); + RemoteOutput(DeviceAPI *deviceAPI); virtual ~RemoteOutput(); virtual void destroy(); @@ -166,7 +166,7 @@ public: QString& errorMessage); private: - DeviceSinkAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; RemoteOutputSettings m_settings; uint64_t m_centerFrequency; diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp index 238824107..1ffb3d3a6 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp +++ b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp @@ -38,11 +38,11 @@ #include "mainwindow.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "remoteoutputgui.h" -#include +#include "channel/remotedatablock.h" #include "udpsinkfec.h" @@ -56,7 +56,7 @@ RemoteOutputSinkGui::RemoteOutputSinkGui(DeviceUISet *deviceUISet, QWidget* pare m_samplesCount(0), m_tickCount(0), m_nbSinceLastFlowCheck(0), - m_lastEngineState(DSPDeviceSinkEngine::StNotStarted), + m_lastEngineState(DeviceAPI::StNotStarted), m_doApplySettings(true), m_forceSettings(true) { @@ -81,12 +81,12 @@ RemoteOutputSinkGui::RemoteOutputSinkGui(DeviceUISet *deviceUISet, QWidget* pare ui->apiAddressLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }"); - connect(&(m_deviceUISet->m_deviceSinkAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); + connect(&(m_deviceUISet->m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); m_statusTimer.start(500); - m_deviceSampleSink = (RemoteOutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink(); + m_deviceSampleSink = (RemoteOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection); @@ -268,24 +268,24 @@ void RemoteOutputSinkGui::updateHardware() void RemoteOutputSinkGui::updateStatus() { - int state = m_deviceUISet->m_deviceSinkAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSinkEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSinkEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSinkEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSinkEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSinkAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp b/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp index f687c5a1f..15b44b6f7 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp +++ b/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp @@ -100,7 +100,7 @@ PluginInstanceGUI* RemoteOutputPlugin::createSampleSinkPluginInstanceGUI( } #endif -DeviceSampleSink* RemoteOutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI) +DeviceSampleSink* RemoteOutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI) { if(sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/remoteoutput/remoteoutputplugin.h b/plugins/samplesink/remoteoutput/remoteoutputplugin.h index ca0a73b0a..0d06e9ee8 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputplugin.h +++ b/plugins/samplesink/remoteoutput/remoteoutputplugin.h @@ -24,7 +24,7 @@ #define REMOTEOUTPUT_DEVICE_TYPE_ID "sdrangel.samplesink.remoteoutput" class PluginAPI; -class DeviceSinkAPI; +class DeviceAPI; class RemoteOutputPlugin : public QObject, public PluginInterface { Q_OBJECT @@ -42,7 +42,7 @@ public: const QString& sinkId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI); + virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesink/soapysdroutput/soapysdroutput.cpp b/plugins/samplesink/soapysdroutput/soapysdroutput.cpp index 17ec5db57..6d8a9daab 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutput.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutput.cpp @@ -28,8 +28,7 @@ #include "util/simpleserializer.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" -#include "device/devicesinkapi.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "soapysdr/devicesoapysdr.h" #include "soapysdroutputthread.h" @@ -39,7 +38,7 @@ MESSAGE_CLASS_DEFINITION(SoapySDROutput::MsgConfigureSoapySDROutput, Message) MESSAGE_CLASS_DEFINITION(SoapySDROutput::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(SoapySDROutput::MsgReportGainChange, Message) -SoapySDROutput::SoapySDROutput(DeviceSinkAPI *deviceAPI) : +SoapySDROutput::SoapySDROutput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_deviceDescription("SoapySDROutput"), m_running(false), @@ -81,7 +80,7 @@ bool SoapySDROutput::openDevice() { qDebug("SoapySDROutput::openDevice: look in Tx buddies"); - DeviceSinkAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; + DeviceAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; DeviceSoapySDRShared *deviceSoapySDRShared = (DeviceSoapySDRShared*) sinkBuddy->getBuddySharedPtr(); if (deviceSoapySDRShared == 0) @@ -106,7 +105,7 @@ bool SoapySDROutput::openDevice() { qDebug("SoapySDROutput::openDevice: look in Rx buddies"); - DeviceSourceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; + DeviceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; DeviceSoapySDRShared *deviceSoapySDRShared = (DeviceSoapySDRShared*) sourceBuddy->getBuddySharedPtr(); if (deviceSoapySDRShared == 0) @@ -131,7 +130,7 @@ bool SoapySDROutput::openDevice() { qDebug("SoapySDROutput::openDevice: open device here"); DeviceSoapySDR& deviceSoapySDR = DeviceSoapySDR::instance(); - m_deviceShared.m_device = deviceSoapySDR.openSoapySDR(m_deviceAPI->getSampleSinkSequence()); + m_deviceShared.m_device = deviceSoapySDR.openSoapySDR(m_deviceAPI->getSamplingDeviceSequence()); if (!m_deviceShared.m_device) { @@ -366,8 +365,8 @@ SoapySDROutputThread *SoapySDROutput::findThread() SoapySDROutputThread *soapySDROutputThread = 0; // find a buddy that has allocated the thread - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { @@ -393,8 +392,8 @@ SoapySDROutputThread *SoapySDROutput::findThread() void SoapySDROutput::moveThreadToBuddy() { - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { @@ -484,8 +483,8 @@ bool SoapySDROutput::start() } // remove old thread address from buddies (reset in all buddies). The address being held only in the owning sink. - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { ((DeviceSoapySDRShared*) (*it)->getBuddySharedPtr())->m_sink->setThread(0); @@ -563,8 +562,8 @@ void SoapySDROutput::stop() m_thread = 0; // remove old thread address from buddies (reset in all buddies) - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { ((DeviceSoapySDRShared*) (*it)->getBuddySharedPtr())->m_sink->setThread(0); @@ -609,8 +608,8 @@ void SoapySDROutput::stop() } // remove old thread address from buddies (reset in all buddies). The address being held only in the owning sink. - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { ((DeviceSoapySDRShared*) (*it)->getBuddySharedPtr())->m_sink->setThread(0); @@ -773,14 +772,14 @@ bool SoapySDROutput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initGeneration()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startGeneration(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopGeneration(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { @@ -1214,8 +1213,8 @@ bool SoapySDROutput::applySettings(const SoapySDROutputSettings& settings, bool if (forwardChangeToBuddies) { // send to buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); for (const auto &itSource : sourceBuddies) { @@ -1225,7 +1224,7 @@ bool SoapySDROutput::applySettings(const SoapySDROutputSettings& settings, bool 2, settings.m_devSampleRate, false); - itSource->getSampleSourceInputMessageQueue()->push(report); + itSource->getSamplingDeviceInputMessageQueue()->push(report); } for (const auto &itSink : sinkBuddies) @@ -1236,28 +1235,28 @@ bool SoapySDROutput::applySettings(const SoapySDROutputSettings& settings, bool 2, settings.m_devSampleRate, false); - itSink->getSampleSinkInputMessageQueue()->push(report); + itSink->getSamplingDeviceInputMessageQueue()->push(report); } } if (deviceArgsChanged) { // send to buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); for (const auto &itSource : sourceBuddies) { DeviceSoapySDRShared::MsgReportDeviceArgsChange *report = DeviceSoapySDRShared::MsgReportDeviceArgsChange::create( settings.m_deviceArgSettings); - itSource->getSampleSourceInputMessageQueue()->push(report); + itSource->getSamplingDeviceInputMessageQueue()->push(report); } for (const auto &itSink : sinkBuddies) { DeviceSoapySDRShared::MsgReportDeviceArgsChange *report = DeviceSoapySDRShared::MsgReportDeviceArgsChange::create( settings.m_deviceArgSettings); - itSink->getSampleSinkInputMessageQueue()->push(report); + itSink->getSamplingDeviceInputMessageQueue()->push(report); } } diff --git a/plugins/samplesink/soapysdroutput/soapysdroutput.h b/plugins/samplesink/soapysdroutput/soapysdroutput.h index 0545ba1e0..3ced8f1a0 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutput.h +++ b/plugins/samplesink/soapysdroutput/soapysdroutput.h @@ -31,7 +31,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSinkAPI; +class DeviceAPI; class SoapySDROutputThread; namespace SoapySDR @@ -117,7 +117,7 @@ public: { } }; - SoapySDROutput(DeviceSinkAPI *deviceAPI); + SoapySDROutput(DeviceAPI *deviceAPI); virtual ~SoapySDROutput(); virtual void destroy(); @@ -181,7 +181,7 @@ public: QString& errorMessage); private: - DeviceSinkAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; SoapySDROutputSettings m_settings; QString m_deviceDescription; diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp index 7d2df9f6c..308c2940f 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp @@ -20,7 +20,7 @@ #include "dsp/dspengine.h" #include "dsp/dspcommands.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "util/simpleserializer.h" #include "ui_soapysdroutputgui.h" @@ -46,7 +46,7 @@ SoapySDROutputGui::SoapySDROutputGui(DeviceUISet *deviceUISet, QWidget* parent) m_doApplySettings(true), m_sampleSink(0), m_sampleRate(0), - m_lastEngineState(DSPDeviceSinkEngine::StNotStarted), + m_lastEngineState(DeviceAPI::StNotStarted), m_antennas(0), m_sampleRateGUI(0), m_bandwidthGUI(0), @@ -57,7 +57,7 @@ SoapySDROutputGui::SoapySDROutputGui(DeviceUISet *deviceUISet, QWidget* parent) m_autoDCCorrection(0), m_autoIQCorrection(0) { - m_sampleSink = (SoapySDROutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink(); + m_sampleSink = (SoapySDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -855,24 +855,24 @@ void SoapySDROutputGui::updateHardware() void SoapySDROutputGui::updateStatus() { - int state = m_deviceUISet->m_deviceSinkAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSinkEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSinkEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSinkEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSinkEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSinkAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp index a776aa734..50a922ea8 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp @@ -117,7 +117,7 @@ PluginInstanceGUI* SoapySDROutputPlugin::createSampleSinkPluginInstanceGUI( } #endif -DeviceSampleSink* SoapySDROutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI) +DeviceSampleSink* SoapySDROutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI) { if(sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.h b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.h index 46df4fd8c..e919a95b3 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.h +++ b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.h @@ -43,7 +43,7 @@ public: QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI); + virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesink/xtrxoutput/xtrxoutput.cpp b/plugins/samplesink/xtrxoutput/xtrxoutput.cpp index b6a3dd0b4..0c47fe5bc 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutput.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutput.cpp @@ -30,8 +30,7 @@ #include "SWGDeviceReport.h" #include "SWGXtrxOutputReport.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "dsp/dspcommands.h" #include "xtrxoutput.h" #include "xtrxoutputthread.h" @@ -46,7 +45,7 @@ MESSAGE_CLASS_DEFINITION(XTRXOutput::MsgReportClockGenChange, Message) MESSAGE_CLASS_DEFINITION(XTRXOutput::MsgReportStreamInfo, Message) MESSAGE_CLASS_DEFINITION(XTRXOutput::MsgStartStop, Message) -XTRXOutput::XTRXOutput(DeviceSinkAPI *deviceAPI) : +XTRXOutput::XTRXOutput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_XTRXOutputThread(0), @@ -85,7 +84,7 @@ bool XTRXOutput::openDevice() { qDebug("XTRXOutput::openDevice: look in Tx buddies"); - DeviceSinkAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; + DeviceAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; DeviceXTRXShared *deviceXTRXShared = (DeviceXTRXShared*) sinkBuddy->getBuddySharedPtr(); if (deviceXTRXShared == 0) @@ -109,7 +108,7 @@ bool XTRXOutput::openDevice() { qDebug("XTRXOutput::openDevice: look in Rx buddies"); - DeviceSourceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; + DeviceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; DeviceXTRXShared *deviceXTRXShared = (DeviceXTRXShared*) sourceBuddy->getBuddySharedPtr(); if (deviceXTRXShared == 0) @@ -135,7 +134,7 @@ bool XTRXOutput::openDevice() m_deviceShared.m_dev = new DeviceXTRX(); char serial[256]; - strcpy(serial, qPrintable(m_deviceAPI->getSampleSinkSerial())); + strcpy(serial, qPrintable(m_deviceAPI->getSamplingDeviceSerial())); if (!m_deviceShared.m_dev->open(serial)) { @@ -189,8 +188,8 @@ XTRXOutputThread *XTRXOutput::findThread() XTRXOutputThread *xtrxOutputThread = 0; // find a buddy that has allocated the thread - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { @@ -216,8 +215,8 @@ XTRXOutputThread *XTRXOutput::findThread() void XTRXOutput::moveThreadToBuddy() { - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { @@ -301,8 +300,8 @@ bool XTRXOutput::start() } // remove old thread address from buddies (reset in all buddies). The address being held only in the owning source. - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { @@ -381,8 +380,8 @@ void XTRXOutput::stop() m_deviceShared.m_thread = 0; // remove old thread address from buddies (reset in all buddies) - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { @@ -403,8 +402,8 @@ void XTRXOutput::stop() xtrxOutputThread->setLog2Interpolation(requestedChannel, m_settings.m_log2SoftInterp); // remove old thread address from buddies (reset in all buddies). The address being held only in the owning source. - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator it = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator it = sinkBuddies.begin(); for (; it != sinkBuddies.end(); ++it) { @@ -421,8 +420,8 @@ void XTRXOutput::stop() void XTRXOutput::suspendRxThread() { - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); qDebug("XTRXOutput::suspendRxThread (%lu)", sourceBuddies.size()); @@ -444,8 +443,8 @@ void XTRXOutput::suspendRxThread() void XTRXOutput::resumeRxThread() { - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); qDebug("XTRXOutput::resumeRxThread (%lu)", sourceBuddies.size()); @@ -659,7 +658,7 @@ bool XTRXOutput::handleMessage(const Message& message) } else if (MsgGetStreamInfo::match(message)) { - if (m_deviceAPI->getSampleSinkGUIMessageQueue()) + if (m_deviceAPI->getSamplingDeviceGUIMessageQueue()) { uint64_t fifolevel = 0; @@ -673,8 +672,8 @@ bool XTRXOutput::handleMessage(const Message& message) fifolevel, 65536); - if (m_deviceAPI->getSampleSinkGUIMessageQueue()) { - m_deviceAPI->getSampleSinkGUIMessageQueue()->push(report); + if (m_deviceAPI->getSamplingDeviceGUIMessageQueue()) { + m_deviceAPI->getSamplingDeviceGUIMessageQueue()->push(report); } } @@ -696,35 +695,35 @@ bool XTRXOutput::handleMessage(const Message& message) } // send to oneself - if (m_deviceAPI->getSampleSinkGUIMessageQueue()) + if (m_deviceAPI->getSamplingDeviceGUIMessageQueue()) { DeviceXTRXShared::MsgReportDeviceInfo *report = DeviceXTRXShared::MsgReportDeviceInfo::create(board_temp, gps_locked); - m_deviceAPI->getSampleSinkGUIMessageQueue()->push(report); + m_deviceAPI->getSamplingDeviceGUIMessageQueue()->push(report); } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { - if ((*itSink)->getSampleSinkGUIMessageQueue()) + if ((*itSink)->getSamplingDeviceGUIMessageQueue()) { DeviceXTRXShared::MsgReportDeviceInfo *report = DeviceXTRXShared::MsgReportDeviceInfo::create(board_temp, gps_locked); - (*itSink)->getSampleSinkGUIMessageQueue()->push(report); + (*itSink)->getSamplingDeviceGUIMessageQueue()->push(report); } } // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { - if ((*itSource)->getSampleSourceGUIMessageQueue()) + if ((*itSource)->getSamplingDeviceGUIMessageQueue()) { DeviceXTRXShared::MsgReportDeviceInfo *report = DeviceXTRXShared::MsgReportDeviceInfo::create(board_temp, gps_locked); - (*itSource)->getSampleSourceGUIMessageQueue()->push(report); + (*itSource)->getSamplingDeviceGUIMessageQueue()->push(report); } } @@ -737,14 +736,14 @@ bool XTRXOutput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initGeneration()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startGeneration(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopGeneration(); + m_deviceAPI->stopDeviceEngine(); } return true; @@ -1067,25 +1066,25 @@ bool XTRXOutput::applySettings(const XTRXOutputSettings& settings, bool force, b } // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { DeviceXTRXShared::MsgReportBuddyChange *report = DeviceXTRXShared::MsgReportBuddyChange::create( getDevSampleRate(), getLog2HardInterp(), m_settings.m_centerFrequency, true); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { DeviceXTRXShared::MsgReportBuddyChange *report = DeviceXTRXShared::MsgReportBuddyChange::create( getDevSampleRate(), getLog2HardInterp(), m_settings.m_centerFrequency, true); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } } else if (forwardChangeTxDSP) @@ -1105,14 +1104,14 @@ bool XTRXOutput::applySettings(const XTRXOutputSettings& settings, bool force, b } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { DeviceXTRXShared::MsgReportBuddyChange *report = DeviceXTRXShared::MsgReportBuddyChange::create( getDevSampleRate(), getLog2HardInterp(), m_settings.m_centerFrequency, true); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } } else if (forwardChangeOwnDSP) @@ -1134,25 +1133,25 @@ bool XTRXOutput::applySettings(const XTRXOutputSettings& settings, bool force, b if (forwardClockSource) { // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { DeviceXTRXShared::MsgReportClockSourceChange *report = DeviceXTRXShared::MsgReportClockSourceChange::create( m_settings.m_extClock, m_settings.m_extClockFreq); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { DeviceXTRXShared::MsgReportClockSourceChange *report = DeviceXTRXShared::MsgReportClockSourceChange::create( m_settings.m_extClock, m_settings.m_extClockFreq); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } } diff --git a/plugins/samplesink/xtrxoutput/xtrxoutput.h b/plugins/samplesink/xtrxoutput/xtrxoutput.h index 73e38014a..6d6ef8515 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutput.h +++ b/plugins/samplesink/xtrxoutput/xtrxoutput.h @@ -29,7 +29,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSinkAPI; +class DeviceAPI; class XTRXOutputThread; struct DeviceXTRXParams; class FileRecord; @@ -170,7 +170,7 @@ public: { } }; - XTRXOutput(DeviceSinkAPI *deviceAPI); + XTRXOutput(DeviceAPI *deviceAPI); virtual ~XTRXOutput(); virtual void destroy(); @@ -223,7 +223,7 @@ public: void getLPRange(float& minF, float& maxF, float& stepF) const; private: - DeviceSinkAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; XTRXOutputSettings m_settings; XTRXOutputThread* m_XTRXOutputThread; diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp index 55c2d012c..72200a71b 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp @@ -27,7 +27,7 @@ #include "gui/basicdevicesettingsdialog.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "xtrxoutputgui.h" @@ -38,13 +38,13 @@ XTRXOutputGUI::XTRXOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_settings(), m_sampleRateMode(true), m_sampleRate(0), - m_lastEngineState((DSPDeviceSinkEngine::State)-1), + m_lastEngineState(DeviceAPI::StNotStarted), m_doApplySettings(true), m_forceSettings(true), m_statusCounter(0), m_deviceStatusCounter(0) { - m_XTRXOutput = (XTRXOutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink(); + m_XTRXOutput = (XTRXOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(this); @@ -399,24 +399,24 @@ void XTRXOutputGUI::updateHardware() void XTRXOutputGUI::updateStatus() { - int state = m_deviceUISet->m_deviceSinkAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSinkEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSinkEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSinkEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSinkEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSinkAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; @@ -442,7 +442,7 @@ void XTRXOutputGUI::updateStatus() } else { - if (m_deviceUISet->m_deviceSinkAPI->isBuddyLeader()) + if (m_deviceUISet->m_deviceAPI->isBuddyLeader()) { XTRXOutput::MsgGetDeviceInfo* message = XTRXOutput::MsgGetDeviceInfo::create(); m_XTRXOutput->getInputMessageQueue()->push(message); diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp index 0c4004d6c..70379d0d6 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp @@ -113,7 +113,7 @@ PluginInstanceGUI* XTRXOutputPlugin::createSampleSinkPluginInstanceGUI( } #endif -DeviceSampleSink* XTRXOutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI) +DeviceSampleSink* XTRXOutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI) { if(sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputplugin.h b/plugins/samplesink/xtrxoutput/xtrxoutputplugin.h index f5dc029d2..a5c985657 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputplugin.h +++ b/plugins/samplesink/xtrxoutput/xtrxoutputplugin.h @@ -41,7 +41,7 @@ public: const QString& sinkId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI); + virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/airspy/airspygui.cpp b/plugins/samplesource/airspy/airspygui.cpp index 818abf782..3f7f31da5 100644 --- a/plugins/samplesource/airspy/airspygui.cpp +++ b/plugins/samplesource/airspy/airspygui.cpp @@ -22,7 +22,7 @@ #include "airspygui.h" -#include +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include @@ -42,9 +42,9 @@ AirspyGui::AirspyGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_settings(), m_sampleSource(0), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { - m_sampleSource = (AirspyInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (AirspyInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -409,24 +409,24 @@ void AirspyGui::updateHardware() void AirspyGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/airspy/airspyinput.cpp b/plugins/samplesource/airspy/airspyinput.cpp index 5499f3c41..a0ac7b223 100644 --- a/plugins/samplesource/airspy/airspyinput.cpp +++ b/plugins/samplesource/airspy/airspyinput.cpp @@ -31,7 +31,7 @@ #include "airspyinput.h" #include "airspyplugin.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "dsp/filerecord.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" @@ -45,7 +45,7 @@ MESSAGE_CLASS_DEFINITION(AirspyInput::MsgFileRecord, Message) const qint64 AirspyInput::loLowLimitFreq = 24000000L; const qint64 AirspyInput::loHighLimitFreq = 1900000000L; -AirspyInput::AirspyInput(DeviceSourceAPI *deviceAPI) : +AirspyInput::AirspyInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_dev(0), @@ -55,7 +55,7 @@ AirspyInput::AirspyInput(DeviceSourceAPI *deviceAPI) : { openDevice(); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -70,7 +70,7 @@ AirspyInput::~AirspyInput() stop(); } - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; closeDevice(); } @@ -102,7 +102,7 @@ bool AirspyInput::openDevice() return false; } - int device = m_deviceAPI->getSampleSourceSequence(); + int device = m_deviceAPI->getSamplingDeviceSequence(); if ((m_dev = open_airspy_from_sequence(device)) == 0) { @@ -301,14 +301,14 @@ bool AirspyInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { diff --git a/plugins/samplesource/airspy/airspyinput.h b/plugins/samplesource/airspy/airspyinput.h index 9c8f7b238..f4b3c2a47 100644 --- a/plugins/samplesource/airspy/airspyinput.h +++ b/plugins/samplesource/airspy/airspyinput.h @@ -28,7 +28,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class AirspyThread; class FileRecord; @@ -96,7 +96,7 @@ public: { } }; - AirspyInput(DeviceSourceAPI *deviceAPI); + AirspyInput(DeviceAPI *deviceAPI); virtual ~AirspyInput(); virtual void destroy(); @@ -144,7 +144,7 @@ public: static const qint64 loHighLimitFreq; private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; AirspySettings m_settings; struct airspy_device* m_dev; diff --git a/plugins/samplesource/airspy/airspyplugin.cpp b/plugins/samplesource/airspy/airspyplugin.cpp index 3050e559c..86f6b0ebf 100644 --- a/plugins/samplesource/airspy/airspyplugin.cpp +++ b/plugins/samplesource/airspy/airspyplugin.cpp @@ -156,7 +156,7 @@ PluginInstanceGUI* AirspyPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *AirspyPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *AirspyPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/airspy/airspyplugin.h b/plugins/samplesource/airspy/airspyplugin.h index a443f5c9b..ea7ba5aee 100644 --- a/plugins/samplesource/airspy/airspyplugin.h +++ b/plugins/samplesource/airspy/airspyplugin.h @@ -41,7 +41,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/airspyhf/airspyhfgui.cpp b/plugins/samplesource/airspyhf/airspyhfgui.cpp index 7f09c023a..01df94ef8 100644 --- a/plugins/samplesource/airspyhf/airspyhfgui.cpp +++ b/plugins/samplesource/airspyhf/airspyhfgui.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include "device/deviceuiset.h" #include @@ -41,9 +41,9 @@ AirspyHFGui::AirspyHFGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_settings(), m_sampleSource(0), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { - m_sampleSource = (AirspyHFInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (AirspyHFInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -428,24 +428,24 @@ void AirspyHFGui::updateHardware() void AirspyHFGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/airspyhf/airspyhfinput.cpp b/plugins/samplesource/airspyhf/airspyhfinput.cpp index 7e1dd1b3c..a36c8c351 100644 --- a/plugins/samplesource/airspyhf/airspyhfinput.cpp +++ b/plugins/samplesource/airspyhf/airspyhfinput.cpp @@ -27,8 +27,8 @@ #include "SWGDeviceReport.h" #include "SWGAirspyHFReport.h" -#include -#include +#include "device/deviceapi.h" +#include "dsp/filerecord.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" @@ -47,7 +47,7 @@ const qint64 AirspyHFInput::loHighLimitFreqHF = 31000000L; const qint64 AirspyHFInput::loLowLimitFreqVHF = 60000000L; const qint64 AirspyHFInput::loHighLimitFreqVHF = 260000000L; -AirspyHFInput::AirspyHFInput(DeviceSourceAPI *deviceAPI) : +AirspyHFInput::AirspyHFInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_dev(0), @@ -57,7 +57,7 @@ AirspyHFInput::AirspyHFInput(DeviceSourceAPI *deviceAPI) : { openDevice(); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); } @@ -71,7 +71,7 @@ AirspyHFInput::~AirspyHFInput() stop(); } - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; closeDevice(); } @@ -96,15 +96,15 @@ bool AirspyHFInput::openDevice() return false; } - if ((m_dev = open_airspyhf_from_serial(m_deviceAPI->getSampleSourceSerial())) == 0) + if ((m_dev = open_airspyhf_from_serial(m_deviceAPI->getSamplingDeviceSerial())) == 0) { - qCritical("AirspyHFInput::openDevice: could not open Airspy HF with serial %s", qPrintable(m_deviceAPI->getSampleSourceSerial())); + qCritical("AirspyHFInput::openDevice: could not open Airspy HF with serial %s", qPrintable(m_deviceAPI->getSamplingDeviceSerial())); m_dev = 0; return false; } else { - qDebug("AirspyHFInput::openDevice: opened Airspy HF with serial %s", qPrintable(m_deviceAPI->getSampleSourceSerial())); + qDebug("AirspyHFInput::openDevice: opened Airspy HF with serial %s", qPrintable(m_deviceAPI->getSamplingDeviceSerial())); } uint32_t nbSampleRates; @@ -311,14 +311,14 @@ bool AirspyHFInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { diff --git a/plugins/samplesource/airspyhf/airspyhfinput.h b/plugins/samplesource/airspyhf/airspyhfinput.h index 790f42833..e55d7d08c 100644 --- a/plugins/samplesource/airspyhf/airspyhfinput.h +++ b/plugins/samplesource/airspyhf/airspyhfinput.h @@ -29,7 +29,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class AirspyHFThread; class FileRecord; @@ -97,7 +97,7 @@ public: { } }; - AirspyHFInput(DeviceSourceAPI *deviceAPI); + AirspyHFInput(DeviceAPI *deviceAPI); virtual ~AirspyHFInput(); virtual void destroy(); @@ -147,7 +147,7 @@ public: static const qint64 loHighLimitFreqVHF; private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; AirspyHFSettings m_settings; airspyhf_device_t* m_dev; diff --git a/plugins/samplesource/airspyhf/airspyhfplugin.cpp b/plugins/samplesource/airspyhf/airspyhfplugin.cpp index 563324dee..dc0fa6808 100644 --- a/plugins/samplesource/airspyhf/airspyhfplugin.cpp +++ b/plugins/samplesource/airspyhf/airspyhfplugin.cpp @@ -126,7 +126,7 @@ PluginInstanceGUI* AirspyHFPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *AirspyHFPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *AirspyHFPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/airspyhf/airspyhfplugin.h b/plugins/samplesource/airspyhf/airspyhfplugin.h index 7bfe76c3f..efe4b367d 100644 --- a/plugins/samplesource/airspyhf/airspyhfplugin.h +++ b/plugins/samplesource/airspyhf/airspyhfplugin.h @@ -41,7 +41,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/bladerf1input/bladerf1input.cpp b/plugins/samplesource/bladerf1input/bladerf1input.cpp index 71e7125fe..8642aa04b 100644 --- a/plugins/samplesource/bladerf1input/bladerf1input.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1input.cpp @@ -27,10 +27,11 @@ #include "util/simpleserializer.h" #include "dsp/dspcommands.h" +#include "dsp/dspdevicesourceengine.h" +#include "dsp/dspdevicesinkengine.h" #include "dsp/dspengine.h" #include "dsp/filerecord.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "bladerf1input.h" #include "bladerf1inputthread.h" @@ -39,7 +40,7 @@ MESSAGE_CLASS_DEFINITION(Bladerf1Input::MsgConfigureBladerf1, Message) MESSAGE_CLASS_DEFINITION(Bladerf1Input::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(Bladerf1Input::MsgFileRecord, Message) -Bladerf1Input::Bladerf1Input(DeviceSourceAPI *deviceAPI) : +Bladerf1Input::Bladerf1Input(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_dev(0), @@ -49,7 +50,7 @@ Bladerf1Input::Bladerf1Input(DeviceSourceAPI *deviceAPI) : { openDevice(); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_deviceAPI->setBuddySharedPtr(&m_sharedParams); @@ -66,7 +67,7 @@ Bladerf1Input::~Bladerf1Input() stop(); } - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; closeDevice(); m_deviceAPI->setBuddySharedPtr(0); @@ -94,7 +95,7 @@ bool Bladerf1Input::openDevice() if (m_deviceAPI->getSinkBuddies().size() > 0) { - DeviceSinkAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; + DeviceAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; DeviceBladeRF1Params *buddySharedParams = (DeviceBladeRF1Params *) sinkBuddy->getBuddySharedPtr(); if (buddySharedParams == 0) @@ -114,9 +115,9 @@ bool Bladerf1Input::openDevice() } else { - if (!DeviceBladeRF1::open_bladerf(&m_dev, qPrintable(m_deviceAPI->getSampleSourceSerial()))) + if (!DeviceBladeRF1::open_bladerf(&m_dev, qPrintable(m_deviceAPI->getSamplingDeviceSerial()))) { - qCritical("BladerfInput::start: could not open BladeRF %s", qPrintable(m_deviceAPI->getSampleSourceSerial())); + qCritical("BladerfInput::start: could not open BladeRF %s", qPrintable(m_deviceAPI->getSamplingDeviceSerial())); return false; } @@ -313,14 +314,14 @@ bool Bladerf1Input::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { @@ -408,7 +409,7 @@ bool Bladerf1Input::applySettings(const BladeRF1InputSettings& settings, bool fo if (m_deviceAPI->getSinkBuddies().size() > 0) { - DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[0]; + DeviceAPI *buddy = m_deviceAPI->getSinkBuddies()[0]; if (buddy->getDeviceSinkEngine()->state() == DSPDeviceSinkEngine::StRunning) { // Tx side running changeSettings = false; diff --git a/plugins/samplesource/bladerf1input/bladerf1input.h b/plugins/samplesource/bladerf1input/bladerf1input.h index a34d5736b..965b2f046 100644 --- a/plugins/samplesource/bladerf1input/bladerf1input.h +++ b/plugins/samplesource/bladerf1input/bladerf1input.h @@ -31,7 +31,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class Bladerf1InputThread; class FileRecord; @@ -99,7 +99,7 @@ public: { } }; - Bladerf1Input(DeviceSourceAPI *deviceAPI); + Bladerf1Input(DeviceAPI *deviceAPI); virtual ~Bladerf1Input(); virtual void destroy(); @@ -139,7 +139,7 @@ public: QString& errorMessage); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; BladeRF1InputSettings m_settings; struct bladerf* m_dev; diff --git a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp index 8e0f7b313..890bac1ac 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp @@ -27,7 +27,7 @@ #include "gui/basicdevicesettingsdialog.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "bladerf1inputgui.h" @@ -42,9 +42,9 @@ Bladerf1InputGui::Bladerf1InputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleRateMode(true), m_sampleSource(NULL), m_sampleRate(0), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { - m_sampleSource = (Bladerf1Input*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (Bladerf1Input*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -471,24 +471,24 @@ void Bladerf1InputGui::blockApplySettings(bool block) void Bladerf1InputGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp b/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp index fe72c1109..ff1460b93 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp @@ -135,7 +135,7 @@ PluginInstanceGUI* Blderf1InputPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *Blderf1InputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *Blderf1InputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/bladerf1input/bladerf1inputplugin.h b/plugins/samplesource/bladerf1input/bladerf1inputplugin.h index 4f66987a0..793bfa850 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputplugin.h +++ b/plugins/samplesource/bladerf1input/bladerf1inputplugin.h @@ -22,7 +22,7 @@ #include "plugin/plugininterface.h" class PluginAPI; -class DeviceSourceAPI; +class DeviceAPI; class DeviceUISet; #define BLADERF1INPUT_DEVICE_TYPE_ID "sdrangel.samplesource.bladerf1input" @@ -43,7 +43,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/bladerf2input/bladerf2input.cpp b/plugins/samplesource/bladerf2input/bladerf2input.cpp index e41b5044d..beb691c8b 100644 --- a/plugins/samplesource/bladerf2input/bladerf2input.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2input.cpp @@ -27,8 +27,7 @@ #include "SWGDeviceReport.h" #include "SWGBladeRF2InputReport.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "dsp/dspcommands.h" #include "dsp/filerecord.h" #include "dsp/dspengine.h" @@ -44,7 +43,7 @@ MESSAGE_CLASS_DEFINITION(BladeRF2Input::MsgFileRecord, Message) MESSAGE_CLASS_DEFINITION(BladeRF2Input::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(BladeRF2Input::MsgReportGainRange, Message) -BladeRF2Input::BladeRF2Input(DeviceSourceAPI *deviceAPI) : +BladeRF2Input::BladeRF2Input(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_deviceDescription("BladeRF2Input"), @@ -67,7 +66,7 @@ BladeRF2Input::BladeRF2Input(DeviceSourceAPI *deviceAPI) : } m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); } @@ -81,7 +80,7 @@ BladeRF2Input::~BladeRF2Input() stop(); } - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; closeDevice(); } @@ -108,7 +107,7 @@ bool BladeRF2Input::openDevice() { qDebug("BladeRF2Input::openDevice: look in Rx buddies"); - DeviceSourceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; + DeviceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; DeviceBladeRF2Shared *deviceBladeRF2Shared = (DeviceBladeRF2Shared*) sourceBuddy->getBuddySharedPtr(); if (deviceBladeRF2Shared == 0) @@ -132,7 +131,7 @@ bool BladeRF2Input::openDevice() { qDebug("BladeRF2Input::openDevice: look in Tx buddies"); - DeviceSinkAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; + DeviceAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; DeviceBladeRF2Shared *deviceBladeRF2Shared = (DeviceBladeRF2Shared*) sinkBuddy->getBuddySharedPtr(); if (deviceBladeRF2Shared == 0) @@ -158,7 +157,7 @@ bool BladeRF2Input::openDevice() m_deviceShared.m_dev = new DeviceBladeRF2(); char serial[256]; - strcpy(serial, qPrintable(m_deviceAPI->getSampleSourceSerial())); + strcpy(serial, qPrintable(m_deviceAPI->getSamplingDeviceSerial())); if (!m_deviceShared.m_dev->open(serial)) { @@ -212,8 +211,8 @@ BladeRF2InputThread *BladeRF2Input::findThread() BladeRF2InputThread *bladerf2InputThread = 0; // find a buddy that has allocated the thread - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { @@ -239,8 +238,8 @@ BladeRF2InputThread *BladeRF2Input::findThread() void BladeRF2Input::moveThreadToBuddy() { - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { @@ -330,8 +329,8 @@ bool BladeRF2Input::start() } // remove old thread address from buddies (reset in all buddies). The address being held only in the owning source. - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { ((DeviceBladeRF2Shared*) (*it)->getBuddySharedPtr())->m_source->setThread(0); @@ -424,8 +423,8 @@ void BladeRF2Input::stop() m_thread = 0; // remove old thread address from buddies (reset in all buddies) - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { ((DeviceBladeRF2Shared*) (*it)->getBuddySharedPtr())->m_source->setThread(0); @@ -471,8 +470,8 @@ void BladeRF2Input::stop() } // remove old thread address from buddies (reset in all buddies). The address being held only in the owning source. - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { ((DeviceBladeRF2Shared*) (*it)->getBuddySharedPtr())->m_source->setThread(0); @@ -743,14 +742,14 @@ bool BladeRF2Input::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { @@ -975,8 +974,8 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo if (forwardChangeRxBuddies) { // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { @@ -986,15 +985,15 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo (int) settings.m_fcPos, settings.m_devSampleRate, true); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } } if (forwardChangeTxBuddies) { // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { @@ -1004,7 +1003,7 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo (int) settings.m_fcPos, settings.m_devSampleRate, true); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } } diff --git a/plugins/samplesource/bladerf2input/bladerf2input.h b/plugins/samplesource/bladerf2input/bladerf2input.h index 4530f24b6..288eaaa9d 100644 --- a/plugins/samplesource/bladerf2input/bladerf2input.h +++ b/plugins/samplesource/bladerf2input/bladerf2input.h @@ -30,7 +30,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class BladeRF2InputThread; class FileRecord; struct bladerf_gain_modes; @@ -131,7 +131,7 @@ public: int m_value; }; - BladeRF2Input(DeviceSourceAPI *deviceAPI); + BladeRF2Input(DeviceAPI *deviceAPI); virtual ~BladeRF2Input(); virtual void destroy(); @@ -183,7 +183,7 @@ public: QString& errorMessage); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; BladeRF2InputSettings m_settings; QString m_deviceDescription; diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp index 14b4d6c3a..18d9d6bcb 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp @@ -27,7 +27,7 @@ #include "gui/basicdevicesettingsdialog.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "bladerf2inputgui.h" @@ -42,9 +42,9 @@ BladeRF2InputGui::BladeRF2InputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleRateMode(true), m_sampleSource(0), m_sampleRate(0), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { - m_sampleSource = (BladeRF2Input*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (BladeRF2Input*) m_deviceUISet->m_deviceAPI->getSampleSource(); int max, min, step; uint64_t f_min, f_max; @@ -504,24 +504,24 @@ void BladeRF2InputGui::blockApplySettings(bool block) void BladeRF2InputGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp b/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp index 38e091d0e..b236926dc 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp @@ -140,7 +140,7 @@ PluginInstanceGUI* Blderf2InputPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *Blderf2InputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *Blderf2InputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/bladerf2input/bladerf2inputplugin.h b/plugins/samplesource/bladerf2input/bladerf2inputplugin.h index 63cc8f7fb..2f7291870 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputplugin.h +++ b/plugins/samplesource/bladerf2input/bladerf2inputplugin.h @@ -22,7 +22,7 @@ #include "plugin/plugininterface.h" class PluginAPI; -class DeviceSourceAPI; +class DeviceAPI; class DeviceUISet; #define BLADERF2INPUT_DEVICE_TYPE_ID "sdrangel.samplesource.bladerf2input" @@ -43,7 +43,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp index 246b51553..7d0fe9e1f 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.cpp +++ b/plugins/samplesource/fcdpro/fcdprogui.cpp @@ -26,7 +26,7 @@ #include "dsp/dspcommands.h" #include "fcdprogui.h" -#include +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "fcdproconst.h" #include "fcdtraits.h" @@ -38,9 +38,9 @@ FCDProGui::FCDProGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_settings(), m_sampleSource(NULL), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { - m_sampleSource = (FCDProInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (FCDProInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -528,24 +528,24 @@ void FCDProGui::on_transverter_clicked() void FCDProGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/fcdpro/fcdproinput.cpp b/plugins/samplesource/fcdpro/fcdproinput.cpp index 961b074ee..b5c8309df 100644 --- a/plugins/samplesource/fcdpro/fcdproinput.cpp +++ b/plugins/samplesource/fcdpro/fcdproinput.cpp @@ -28,7 +28,7 @@ #include "dsp/dspcommands.h" #include "dsp/dspengine.h" #include "dsp/filerecord.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "fcdproinput.h" #include "fcdprothread.h" @@ -39,7 +39,7 @@ MESSAGE_CLASS_DEFINITION(FCDProInput::MsgConfigureFCDPro, Message) MESSAGE_CLASS_DEFINITION(FCDProInput::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(FCDProInput::MsgFileRecord, Message) -FCDProInput::FCDProInput(DeviceSourceAPI *deviceAPI) : +FCDProInput::FCDProInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_dev(0), m_settings(), @@ -50,7 +50,7 @@ FCDProInput::FCDProInput(DeviceSourceAPI *deviceAPI) : m_fcdFIFO.setSize(20*fcd_traits::convBufSize); openDevice(); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); } @@ -64,7 +64,7 @@ FCDProInput::~FCDProInput() stop(); } - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; closeDevice(); @@ -81,7 +81,7 @@ bool FCDProInput::openDevice() closeDevice(); } - int device = m_deviceAPI->getSampleSourceSequence(); + int device = m_deviceAPI->getSamplingDeviceSequence(); qDebug() << "FCDProInput::openDevice with device #" << device; m_dev = fcdOpen(fcd_traits::vendorId, fcd_traits::productId, device); @@ -275,14 +275,14 @@ bool FCDProInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { diff --git a/plugins/samplesource/fcdpro/fcdproinput.h b/plugins/samplesource/fcdpro/fcdproinput.h index 3ff793474..39d3702d9 100644 --- a/plugins/samplesource/fcdpro/fcdproinput.h +++ b/plugins/samplesource/fcdpro/fcdproinput.h @@ -38,7 +38,7 @@ struct fcd_buffer { class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class FCDProThread; class FileRecord; @@ -106,7 +106,7 @@ public: { } }; - FCDProInput(DeviceSourceAPI *deviceAPI); + FCDProInput(DeviceAPI *deviceAPI); virtual ~FCDProInput(); virtual void destroy(); @@ -165,7 +165,7 @@ public: void set_gain6(int index); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; hid_device *m_dev; AudioInput m_fcdAudioInput; AudioFifo m_fcdFIFO; diff --git a/plugins/samplesource/fcdpro/fcdproplugin.cpp b/plugins/samplesource/fcdpro/fcdproplugin.cpp index f6dcc0e9f..ab6a7f952 100644 --- a/plugins/samplesource/fcdpro/fcdproplugin.cpp +++ b/plugins/samplesource/fcdpro/fcdproplugin.cpp @@ -109,7 +109,7 @@ PluginInstanceGUI* FCDProPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *FCDProPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *FCDProPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == fcd_traits::interfaceIID) { diff --git a/plugins/samplesource/fcdpro/fcdproplugin.h b/plugins/samplesource/fcdpro/fcdproplugin.h index a6769bda7..fd376f2a5 100644 --- a/plugins/samplesource/fcdpro/fcdproplugin.h +++ b/plugins/samplesource/fcdpro/fcdproplugin.h @@ -24,7 +24,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp index 81079da60..fd6d40a5d 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp @@ -27,7 +27,7 @@ #include "dsp/dspcommands.h" #include "fcdproplusgui.h" -#include +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "fcdproplusconst.h" #include "fcdtraits.h" @@ -39,9 +39,9 @@ FCDProPlusGui::FCDProPlusGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_settings(), m_sampleSource(NULL), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { - m_sampleSource = (FCDProPlusInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (FCDProPlusInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); @@ -286,24 +286,24 @@ void FCDProPlusGui::updateHardware() void FCDProPlusGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp index c83210efe..39ed2b3ac 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp @@ -28,7 +28,7 @@ #include "dsp/dspcommands.h" #include "dsp/dspengine.h" #include "dsp/filerecord.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "fcdproplusinput.h" #include "fcdproplusthread.h" @@ -39,7 +39,7 @@ MESSAGE_CLASS_DEFINITION(FCDProPlusInput::MsgConfigureFCDProPlus, Message) MESSAGE_CLASS_DEFINITION(FCDProPlusInput::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(FCDProPlusInput::MsgFileRecord, Message) -FCDProPlusInput::FCDProPlusInput(DeviceSourceAPI *deviceAPI) : +FCDProPlusInput::FCDProPlusInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_dev(0), m_settings(), @@ -50,7 +50,7 @@ FCDProPlusInput::FCDProPlusInput(DeviceSourceAPI *deviceAPI) : m_fcdFIFO.setSize(20*fcd_traits::convBufSize); openDevice(); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); } @@ -64,7 +64,7 @@ FCDProPlusInput::~FCDProPlusInput() stop(); } - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; closeDevice(); @@ -81,7 +81,7 @@ bool FCDProPlusInput::openDevice() closeDevice(); } - int device = m_deviceAPI->getSampleSourceSequence(); + int device = m_deviceAPI->getSamplingDeviceSequence(); qDebug() << "FCDProPlusInput::openDevice with device #" << device; m_dev = fcdOpen(fcd_traits::vendorId, fcd_traits::productId, device); @@ -277,14 +277,14 @@ bool FCDProPlusInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.h b/plugins/samplesource/fcdproplus/fcdproplusinput.h index ed045ad4c..2835adfb9 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusinput.h +++ b/plugins/samplesource/fcdproplus/fcdproplusinput.h @@ -38,7 +38,7 @@ struct fcd_buffer { class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class FCDProPlusThread; class FileRecord; @@ -106,7 +106,7 @@ public: { } }; - FCDProPlusInput(DeviceSourceAPI *deviceAPI); + FCDProPlusInput(DeviceAPI *deviceAPI); virtual ~FCDProPlusInput(); virtual void destroy(); @@ -154,7 +154,7 @@ public: void set_if_filter(int filterIndex); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; hid_device *m_dev; AudioInput m_fcdAudioInput; AudioFifo m_fcdFIFO; diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp index aa762c7a4..59148c991 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp @@ -111,7 +111,7 @@ PluginInstanceGUI* FCDProPlusPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *FCDProPlusPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *FCDProPlusPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if(sourceId == fcd_traits::interfaceIID) { diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.h b/plugins/samplesource/fcdproplus/fcdproplusplugin.h index c82921e13..c4bdd40db 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusplugin.h +++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.h @@ -24,7 +24,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_deviceTypeID; diff --git a/plugins/samplesource/filesource/filesourcegui.cpp b/plugins/samplesource/filesource/filesourcegui.cpp index 0ab1a8604..a63b4340e 100644 --- a/plugins/samplesource/filesource/filesourcegui.cpp +++ b/plugins/samplesource/filesource/filesourcegui.cpp @@ -35,7 +35,7 @@ #include "mainwindow.h" #include "filesourcegui.h" -#include +#include "device/deviceapi.h" #include "device/deviceuiset.h" FileSourceGui::FileSourceGui(DeviceUISet *deviceUISet, QWidget* parent) : @@ -54,7 +54,7 @@ FileSourceGui::FileSourceGui(DeviceUISet *deviceUISet, QWidget* parent) : m_samplesCount(0), m_tickCount(0), m_enableNavTime(false), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -62,7 +62,7 @@ FileSourceGui::FileSourceGui(DeviceUISet *deviceUISet, QWidget* parent) : ui->fileNameText->setText(m_fileName); ui->crcLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }"); - connect(&(m_deviceUISet->m_deviceSourceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); + connect(&(m_deviceUISet->m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); m_statusTimer.start(500); @@ -75,7 +75,7 @@ FileSourceGui::FileSourceGui(DeviceUISet *deviceUISet, QWidget* parent) : ui->navTimeSlider->setEnabled(false); ui->acceleration->setEnabled(false); - m_sampleSource = m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = m_deviceUISet->m_deviceAPI->getSampleSource(); connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection); m_sampleSource->setMessageQueueToGUI(&m_inputMessageQueue); @@ -271,24 +271,24 @@ void FileSourceGui::on_startStop_toggled(bool checked) void FileSourceGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/filesource/filesourceinput.cpp b/plugins/samplesource/filesource/filesourceinput.cpp index 797058921..e4f1c8a18 100644 --- a/plugins/samplesource/filesource/filesourceinput.cpp +++ b/plugins/samplesource/filesource/filesourceinput.cpp @@ -30,9 +30,10 @@ #include "util/simpleserializer.h" #include "dsp/dspcommands.h" +#include "dsp/dspdevicesourceengine.h" #include "dsp/dspengine.h" #include "dsp/filerecord.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "filesourceinput.h" #include "filesourcethread.h" @@ -49,7 +50,7 @@ MESSAGE_CLASS_DEFINITION(FileSourceInput::MsgReportFileSourceStreamData, Message MESSAGE_CLASS_DEFINITION(FileSourceInput::MsgReportFileSourceStreamTiming, Message) MESSAGE_CLASS_DEFINITION(FileSourceInput::MsgReportHeaderCRC, Message) -FileSourceInput::FileSourceInput(DeviceSourceAPI *deviceAPI) : +FileSourceInput::FileSourceInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_fileSourceThread(NULL), @@ -347,14 +348,14 @@ bool FileSourceInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { diff --git a/plugins/samplesource/filesource/filesourceinput.h b/plugins/samplesource/filesource/filesourceinput.h index ca8a490de..0bde89328 100644 --- a/plugins/samplesource/filesource/filesourceinput.h +++ b/plugins/samplesource/filesource/filesourceinput.h @@ -33,7 +33,7 @@ class QNetworkAccessManager; class QNetworkReply; class FileSourceThread; -class DeviceSourceAPI; +class DeviceAPI; class FileSourceInput : public DeviceSampleSource { Q_OBJECT @@ -275,7 +275,7 @@ public: { } }; - FileSourceInput(DeviceSourceAPI *deviceAPI); + FileSourceInput(DeviceAPI *deviceAPI); virtual ~FileSourceInput(); virtual void destroy(); @@ -320,7 +320,7 @@ public: QString& errorMessage); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; FileSourceSettings m_settings; std::ifstream m_ifstream; diff --git a/plugins/samplesource/filesource/filesourceplugin.cpp b/plugins/samplesource/filesource/filesourceplugin.cpp index 445d8ed67..0d4e0fa7e 100644 --- a/plugins/samplesource/filesource/filesourceplugin.cpp +++ b/plugins/samplesource/filesource/filesourceplugin.cpp @@ -100,7 +100,7 @@ PluginInstanceGUI* FileSourcePlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *FileSourcePlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *FileSourcePlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/filesource/filesourceplugin.h b/plugins/samplesource/filesource/filesourceplugin.h index a5af73b1d..7e10e1079 100644 --- a/plugins/samplesource/filesource/filesourceplugin.h +++ b/plugins/samplesource/filesource/filesourceplugin.h @@ -41,7 +41,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/hackrfinput/hackrfinput.cpp b/plugins/samplesource/hackrfinput/hackrfinput.cpp index 463590b16..c27eac1c3 100644 --- a/plugins/samplesource/hackrfinput/hackrfinput.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinput.cpp @@ -29,8 +29,7 @@ #include "dsp/dspcommands.h" #include "dsp/dspengine.h" #include "dsp/filerecord.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "hackrf/devicehackrfvalues.h" #include "hackrf/devicehackrfshared.h" @@ -42,7 +41,7 @@ MESSAGE_CLASS_DEFINITION(HackRFInput::MsgReportHackRF, Message) MESSAGE_CLASS_DEFINITION(HackRFInput::MsgFileRecord, Message) MESSAGE_CLASS_DEFINITION(HackRFInput::MsgStartStop, Message) -HackRFInput::HackRFInput(DeviceSourceAPI *deviceAPI) : +HackRFInput::HackRFInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_dev(0), @@ -53,7 +52,7 @@ HackRFInput::HackRFInput(DeviceSourceAPI *deviceAPI) : openDevice(); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_deviceAPI->setBuddySharedPtr(&m_sharedParams); @@ -70,7 +69,7 @@ HackRFInput::~HackRFInput() stop(); } - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; closeDevice(); m_deviceAPI->setBuddySharedPtr(0); @@ -96,7 +95,7 @@ bool HackRFInput::openDevice() if (m_deviceAPI->getSinkBuddies().size() > 0) { - DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[0]; + DeviceAPI *buddy = m_deviceAPI->getSinkBuddies()[0]; DeviceHackRFParams *buddySharedParams = (DeviceHackRFParams *) buddy->getBuddySharedPtr(); if (buddySharedParams == 0) @@ -116,9 +115,9 @@ bool HackRFInput::openDevice() } else { - if ((m_dev = DeviceHackRF::open_hackrf(qPrintable(m_deviceAPI->getSampleSourceSerial()))) == 0) + if ((m_dev = DeviceHackRF::open_hackrf(qPrintable(m_deviceAPI->getSamplingDeviceSerial()))) == 0) { - qCritical("HackRFInput::openDevice: could not open HackRF %s", qPrintable(m_deviceAPI->getSampleSourceSerial())); + qCritical("HackRFInput::openDevice: could not open HackRF %s", qPrintable(m_deviceAPI->getSamplingDeviceSerial())); return false; } @@ -296,14 +295,14 @@ bool HackRFInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { @@ -450,9 +449,9 @@ bool HackRFInput::applySettings(const HackRFInputSettings& settings, bool force) if (m_deviceAPI->getSinkBuddies().size() > 0) // forward to buddy if necessary { - DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[0]; + DeviceAPI *buddy = m_deviceAPI->getSinkBuddies()[0]; DeviceHackRFShared::MsgSynchronizeFrequency *freqMsg = DeviceHackRFShared::MsgSynchronizeFrequency::create(deviceCenterFrequency); - buddy->getSampleSinkInputMessageQueue()->push(freqMsg); + buddy->getSamplingDeviceInputMessageQueue()->push(freqMsg); } forwardChange = true; diff --git a/plugins/samplesource/hackrfinput/hackrfinput.h b/plugins/samplesource/hackrfinput/hackrfinput.h index 76ad563c9..e25f51615 100644 --- a/plugins/samplesource/hackrfinput/hackrfinput.h +++ b/plugins/samplesource/hackrfinput/hackrfinput.h @@ -30,7 +30,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class HackRFInputThread; class FileRecord; @@ -116,7 +116,7 @@ public: { } }; - HackRFInput(DeviceSourceAPI *deviceAPI); + HackRFInput(DeviceAPI *deviceAPI); virtual ~HackRFInput(); virtual void destroy(); @@ -157,7 +157,7 @@ public: private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; HackRFInputSettings m_settings; struct hackrf_device* m_dev; diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp index 553e2a377..71c119f2d 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp @@ -28,8 +28,7 @@ #include "gui/basicdevicesettingsdialog.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "hackrf/devicehackrfvalues.h" @@ -44,9 +43,9 @@ HackRFInputGui::HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_doApplySettings(true), m_sampleSource(NULL), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { - m_sampleSource = (HackRFInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (HackRFInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -447,25 +446,25 @@ void HackRFInputGui::blockApplySettings(bool block) void HackRFInputGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); ui->startStop->setChecked(false); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp index e3f6ee88e..c3d60644d 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp @@ -152,7 +152,7 @@ PluginInstanceGUI* HackRFInputPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *HackRFInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *HackRFInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.h b/plugins/samplesource/hackrfinput/hackrfinputplugin.h index 40d01452b..8a9858d25 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputplugin.h +++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.h @@ -41,7 +41,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp index 71ea5178d..46b90c2aa 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -31,8 +31,7 @@ #include "SWGDeviceReport.h" #include "SWGLimeSdrInputReport.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "dsp/dspcommands.h" #include "dsp/filerecord.h" #include "dsp/dspengine.h" @@ -49,7 +48,7 @@ MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgReportStreamInfo, Message) MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgFileRecord, Message) MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgStartStop, Message) -LimeSDRInput::LimeSDRInput(DeviceSourceAPI *deviceAPI) : +LimeSDRInput::LimeSDRInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_limeSDRInputThread(0), @@ -65,7 +64,7 @@ LimeSDRInput::LimeSDRInput(DeviceSourceAPI *deviceAPI) : resumeRxBuddies(); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -80,7 +79,7 @@ LimeSDRInput::~LimeSDRInput() stop(); } - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; suspendRxBuddies(); suspendTxBuddies(); @@ -114,7 +113,7 @@ bool LimeSDRInput::openDevice() { qDebug("LimeSDRInput::openDevice: look in Rx buddies"); - DeviceSourceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; + DeviceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; //m_deviceShared = *((DeviceLimeSDRShared *) sourceBuddy->getBuddySharedPtr()); // copy shared data DeviceLimeSDRShared *deviceLimeSDRShared = (DeviceLimeSDRShared*) sourceBuddy->getBuddySharedPtr(); @@ -152,7 +151,7 @@ bool LimeSDRInput::openDevice() for (unsigned int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++) { - DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[i]; + DeviceAPI *buddy = m_deviceAPI->getSourceBuddies()[i]; DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr(); if (buddyShared->m_channel == requestedChannel) @@ -170,7 +169,7 @@ bool LimeSDRInput::openDevice() { qDebug("LimeSDRInput::openDevice: look in Tx buddies"); - DeviceSinkAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; + DeviceAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; //m_deviceShared = *((DeviceLimeSDRShared *) sinkBuddy->getBuddySharedPtr()); // copy parameters DeviceLimeSDRShared *deviceLimeSDRShared = (DeviceLimeSDRShared*) sinkBuddy->getBuddySharedPtr(); @@ -203,7 +202,7 @@ bool LimeSDRInput::openDevice() m_deviceShared.m_deviceParams = new DeviceLimeSDRParams(); char serial[256]; - strcpy(serial, qPrintable(m_deviceAPI->getSampleSourceSerial())); + strcpy(serial, qPrintable(m_deviceAPI->getSamplingDeviceSerial())); m_deviceShared.m_deviceParams->open(serial); m_deviceShared.m_channel = requestedChannel; // acknowledge the requested channel } @@ -215,8 +214,8 @@ bool LimeSDRInput::openDevice() void LimeSDRInput::suspendRxBuddies() { - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); qDebug("LimeSDRInput::suspendRxBuddies (%lu)", sourceBuddies.size()); @@ -238,8 +237,8 @@ void LimeSDRInput::suspendRxBuddies() void LimeSDRInput::suspendTxBuddies() { - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); qDebug("LimeSDRInput::suspendTxBuddies (%lu)", sinkBuddies.size()); @@ -261,8 +260,8 @@ void LimeSDRInput::suspendTxBuddies() void LimeSDRInput::resumeRxBuddies() { - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); qDebug("LimeSDRInput::resumeRxBuddies (%lu)", sourceBuddies.size()); @@ -278,8 +277,8 @@ void LimeSDRInput::resumeRxBuddies() void LimeSDRInput::resumeTxBuddies() { - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); qDebug("LimeSDRInput::resumeTxBuddies (%lu)", sinkBuddies.size()); @@ -656,7 +655,7 @@ bool LimeSDRInput::handleMessage(const Message& message) if (m_streamId.handle && (LMS_GetStreamStatus(&m_streamId, &status) == 0)) { - if (m_deviceAPI->getSampleSourceGUIMessageQueue()) + if (m_deviceAPI->getSamplingDeviceGUIMessageQueue()) { MsgReportStreamInfo *report = MsgReportStreamInfo::create( true, // Success @@ -668,12 +667,12 @@ bool LimeSDRInput::handleMessage(const Message& message) status.droppedPackets, status.linkRate, status.timestamp); - m_deviceAPI->getSampleSourceGUIMessageQueue()->push(report); + m_deviceAPI->getSamplingDeviceGUIMessageQueue()->push(report); } } else { - if (m_deviceAPI->getSampleSourceGUIMessageQueue()) + if (m_deviceAPI->getSamplingDeviceGUIMessageQueue()) { MsgReportStreamInfo *report = MsgReportStreamInfo::create( false, // Success @@ -685,7 +684,7 @@ bool LimeSDRInput::handleMessage(const Message& message) 0, // status.droppedPackets, 0, // status.linkRate, 0); // status.timestamp); - m_deviceAPI->getSampleSourceGUIMessageQueue()->push(report); + m_deviceAPI->getSamplingDeviceGUIMessageQueue()->push(report); } } @@ -709,35 +708,35 @@ bool LimeSDRInput::handleMessage(const Message& message) } // send to oneself - if (m_deviceAPI->getSampleSourceGUIMessageQueue()) + if (m_deviceAPI->getSamplingDeviceGUIMessageQueue()) { DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp, gpioPins); - m_deviceAPI->getSampleSourceGUIMessageQueue()->push(report); + m_deviceAPI->getSamplingDeviceGUIMessageQueue()->push(report); } // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { - if ((*itSource)->getSampleSourceGUIMessageQueue()) + if ((*itSource)->getSamplingDeviceGUIMessageQueue()) { DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp, gpioPins); - (*itSource)->getSampleSourceGUIMessageQueue()->push(report); + (*itSource)->getSamplingDeviceGUIMessageQueue()->push(report); } } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { - if ((*itSink)->getSampleSinkGUIMessageQueue()) + if ((*itSink)->getSamplingDeviceGUIMessageQueue()) { DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp, gpioPins); - (*itSink)->getSampleSinkGUIMessageQueue()->push(report); + (*itSink)->getSamplingDeviceGUIMessageQueue()->push(report); } } @@ -772,14 +771,14 @@ bool LimeSDRInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { @@ -1289,25 +1288,25 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { DeviceLimeSDRShared::MsgReportBuddyChange *report = DeviceLimeSDRShared::MsgReportBuddyChange::create( m_settings.m_devSampleRate, m_settings.m_log2HardDecim, m_settings.m_centerFrequency, true); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { DeviceLimeSDRShared::MsgReportBuddyChange *report = DeviceLimeSDRShared::MsgReportBuddyChange::create( m_settings.m_devSampleRate, m_settings.m_log2HardDecim, m_settings.m_centerFrequency, true); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } } else if (forwardChangeRxDSP) @@ -1322,14 +1321,14 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { DeviceLimeSDRShared::MsgReportBuddyChange *report = DeviceLimeSDRShared::MsgReportBuddyChange::create( m_settings.m_devSampleRate, m_settings.m_log2HardDecim, m_settings.m_centerFrequency, true); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } } else if (forwardChangeOwnDSP) @@ -1346,50 +1345,50 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc if (forwardClockSource) { // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { DeviceLimeSDRShared::MsgReportClockSourceChange *report = DeviceLimeSDRShared::MsgReportClockSourceChange::create( m_settings.m_extClock, m_settings.m_extClockFreq); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { DeviceLimeSDRShared::MsgReportClockSourceChange *report = DeviceLimeSDRShared::MsgReportClockSourceChange::create( m_settings.m_extClock, m_settings.m_extClockFreq); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } } if (forwardGPIOChange) { // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { DeviceLimeSDRShared::MsgReportClockSourceChange *report = DeviceLimeSDRShared::MsgReportClockSourceChange::create( m_settings.m_extClock, m_settings.m_extClockFreq); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { DeviceLimeSDRShared::MsgReportClockSourceChange *report = DeviceLimeSDRShared::MsgReportClockSourceChange::create( m_settings.m_extClock, m_settings.m_extClockFreq); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } } diff --git a/plugins/samplesource/limesdrinput/limesdrinput.h b/plugins/samplesource/limesdrinput/limesdrinput.h index 86913323c..0d47003c9 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.h +++ b/plugins/samplesource/limesdrinput/limesdrinput.h @@ -28,7 +28,7 @@ #include "limesdr/devicelimesdrshared.h" #include "limesdrinputsettings.h" -class DeviceSourceAPI; +class DeviceAPI; class LimeSDRInputThread; class FileRecord; class QNetworkAccessManager; @@ -204,7 +204,7 @@ public: { } }; - LimeSDRInput(DeviceSourceAPI *deviceAPI); + LimeSDRInput(DeviceAPI *deviceAPI); virtual ~LimeSDRInput(); virtual void destroy(); @@ -255,7 +255,7 @@ public: DeviceLimeSDRParams::LimeType getLimeType() const; private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; LimeSDRInputSettings m_settings; LimeSDRInputThread* m_limeSDRInputThread; diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index 7e12a149d..f09d336b3 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -29,7 +29,7 @@ #include "gui/basicdevicesettingsdialog.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : @@ -39,13 +39,13 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_settings(), m_sampleRateMode(true), m_sampleRate(0), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted), + m_lastEngineState(DeviceAPI::StNotStarted), m_doApplySettings(true), m_forceSettings(true), m_statusCounter(0), m_deviceStatusCounter(0) { - m_limeSDRInput = (LimeSDRInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_limeSDRInput = (LimeSDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); @@ -478,24 +478,24 @@ void LimeSDRInputGUI::updateHardware() void LimeSDRInputGUI::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; @@ -521,7 +521,7 @@ void LimeSDRInputGUI::updateStatus() } else { - if (m_deviceUISet->m_deviceSourceAPI->isBuddyLeader()) + if (m_deviceUISet->m_deviceAPI->isBuddyLeader()) { LimeSDRInput::MsgGetDeviceInfo* message = LimeSDRInput::MsgGetDeviceInfo::create(); m_limeSDRInput->getInputMessageQueue()->push(message); diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp index 5423eceeb..4d6b82724 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp @@ -156,7 +156,7 @@ bool LimeSDRInputPlugin::findSerial(const char *lmsInfoStr, std::string& serial) } } -DeviceSampleSource *LimeSDRInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *LimeSDRInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.h b/plugins/samplesource/limesdrinput/limesdrinputplugin.h index 418d74790..23518c254 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputplugin.h +++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.h @@ -41,7 +41,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/localinput/localinput.cpp b/plugins/samplesource/localinput/localinput.cpp index c35ce3e77..7029bd381 100644 --- a/plugins/samplesource/localinput/localinput.cpp +++ b/plugins/samplesource/localinput/localinput.cpp @@ -30,7 +30,7 @@ #include "util/simpleserializer.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "dsp/filerecord.h" #include "localinput.h" @@ -40,7 +40,7 @@ MESSAGE_CLASS_DEFINITION(LocalInput::MsgFileRecord, Message) MESSAGE_CLASS_DEFINITION(LocalInput::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(LocalInput::MsgReportSampleRateAndFrequency, Message) -LocalInput::LocalInput(DeviceSourceAPI *deviceAPI) : +LocalInput::LocalInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_deviceDescription("LocalInput"), @@ -49,7 +49,7 @@ LocalInput::LocalInput(DeviceSourceAPI *deviceAPI) : m_sampleFifo.setSize(96000 * 4); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -60,7 +60,7 @@ LocalInput::~LocalInput() disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); delete m_networkManager; stop(); - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; } @@ -201,14 +201,14 @@ bool LocalInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { diff --git a/plugins/samplesource/localinput/localinput.h b/plugins/samplesource/localinput/localinput.h index 4e9e1d6c4..7732ae07f 100644 --- a/plugins/samplesource/localinput/localinput.h +++ b/plugins/samplesource/localinput/localinput.h @@ -33,7 +33,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class FileRecord; class LocalInput : public DeviceSampleSource { @@ -122,7 +122,7 @@ public: { } }; - LocalInput(DeviceSourceAPI *deviceAPI); + LocalInput(DeviceAPI *deviceAPI); virtual ~LocalInput(); virtual void destroy(); @@ -167,7 +167,7 @@ public: QString& errorMessage); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; LocalInputSettings m_settings; qint64 m_centerFrequency; diff --git a/plugins/samplesource/localinput/localinputgui.cpp b/plugins/samplesource/localinput/localinputgui.cpp index 839e6f92b..118dec3c4 100644 --- a/plugins/samplesource/localinput/localinputgui.cpp +++ b/plugins/samplesource/localinput/localinputgui.cpp @@ -39,7 +39,7 @@ #include "dsp/dspcommands.h" #include "mainwindow.h" #include "util/simpleserializer.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "localinputgui.h" @@ -53,7 +53,7 @@ LocalInputGui::LocalInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_acquisition(false), m_streamSampleRate(0), m_streamCenterFrequency(0), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted), + m_lastEngineState(DeviceAPI::StNotStarted), m_framesDecodingStatus(0), m_bufferLengthInSecs(0.0), m_bufferGauge(-50), @@ -92,7 +92,7 @@ LocalInputGui::LocalInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_statusTimer.start(500); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); - m_sampleSource = (LocalInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (LocalInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection); m_sampleSource->setMessageQueueToGUI(&m_inputMessageQueue); @@ -324,24 +324,24 @@ void LocalInputGui::updateHardware() void LocalInputGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/localinput/localinputplugin.cpp b/plugins/samplesource/localinput/localinputplugin.cpp index d6ce37608..0e0fa638f 100644 --- a/plugins/samplesource/localinput/localinputplugin.cpp +++ b/plugins/samplesource/localinput/localinputplugin.cpp @@ -100,7 +100,7 @@ PluginInstanceGUI* LocalInputPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *LocalInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *LocalInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/localinput/localinputplugin.h b/plugins/samplesource/localinput/localinputplugin.h index 1508f2af1..fb76031ed 100644 --- a/plugins/samplesource/localinput/localinputplugin.h +++ b/plugins/samplesource/localinput/localinputplugin.h @@ -41,7 +41,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/perseus/perseusgui.cpp b/plugins/samplesource/perseus/perseusgui.cpp index 53a2f13a6..3b71982d4 100644 --- a/plugins/samplesource/perseus/perseusgui.cpp +++ b/plugins/samplesource/perseus/perseusgui.cpp @@ -18,9 +18,9 @@ #include #include -#include +#include "device/deviceapi.h" #include "device/deviceuiset.h" -#include +#include "dsp/filerecord.h" #include "ui_perseusgui.h" #include "gui/colormapper.h" @@ -39,9 +39,9 @@ PerseusGui::PerseusGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_settings(), m_sampleSource(0), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { - m_sampleSource = (PerseusInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (PerseusInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -352,24 +352,24 @@ void PerseusGui::updateHardware() void PerseusGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/perseus/perseusinput.cpp b/plugins/samplesource/perseus/perseusinput.cpp index 417c453a4..9b43017ab 100644 --- a/plugins/samplesource/perseus/perseusinput.cpp +++ b/plugins/samplesource/perseus/perseusinput.cpp @@ -27,7 +27,7 @@ #include "dsp/filerecord.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "perseus/deviceperseus.h" #include "perseusinput.h" @@ -37,7 +37,7 @@ MESSAGE_CLASS_DEFINITION(PerseusInput::MsgConfigurePerseus, Message) MESSAGE_CLASS_DEFINITION(PerseusInput::MsgFileRecord, Message) MESSAGE_CLASS_DEFINITION(PerseusInput::MsgStartStop, Message) -PerseusInput::PerseusInput(DeviceSourceAPI *deviceAPI) : +PerseusInput::PerseusInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_fileSink(0), m_deviceDescription("PerseusInput"), @@ -47,7 +47,7 @@ PerseusInput::PerseusInput(DeviceSourceAPI *deviceAPI) : { openDevice(); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -57,7 +57,7 @@ PerseusInput::~PerseusInput() { disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); delete m_networkManager; - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; closeDevice(); } @@ -185,14 +185,14 @@ bool PerseusInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { @@ -241,8 +241,8 @@ bool PerseusInput::openDevice() return false; } - m_deviceAPI->getSampleSourceSerial(); - int deviceSequence = DevicePerseus::instance().getSequenceFromSerial(m_deviceAPI->getSampleSourceSerial().toStdString()); + m_deviceAPI->getSamplingDeviceSerial(); + int deviceSequence = DevicePerseus::instance().getSequenceFromSerial(m_deviceAPI->getSamplingDeviceSerial().toStdString()); if ((m_perseusDescriptor = perseus_open(deviceSequence)) == 0) { diff --git a/plugins/samplesource/perseus/perseusinput.h b/plugins/samplesource/perseus/perseusinput.h index 1f893b922..7b0cad9d6 100644 --- a/plugins/samplesource/perseus/perseusinput.h +++ b/plugins/samplesource/perseus/perseusinput.h @@ -29,7 +29,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class FileRecord; class PerseusThread; @@ -97,7 +97,7 @@ public: { } }; - PerseusInput(DeviceSourceAPI *deviceAPI); + PerseusInput(DeviceAPI *deviceAPI); ~PerseusInput(); virtual void destroy(); @@ -143,7 +143,7 @@ public: const std::vector& getSampleRates() const { return m_sampleRates; } private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; FileRecord *m_fileSink; QString m_deviceDescription; PerseusSettings m_settings; diff --git a/plugins/samplesource/perseus/perseusplugin.cpp b/plugins/samplesource/perseus/perseusplugin.cpp index 8538a4eae..5a8bd4bd9 100644 --- a/plugins/samplesource/perseus/perseusplugin.cpp +++ b/plugins/samplesource/perseus/perseusplugin.cpp @@ -115,7 +115,7 @@ PluginInstanceGUI* PerseusPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *PerseusPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *PerseusPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/perseus/perseusplugin.h b/plugins/samplesource/perseus/perseusplugin.h index ef456d615..0ffd8b6da 100644 --- a/plugins/samplesource/perseus/perseusplugin.h +++ b/plugins/samplesource/perseus/perseusplugin.h @@ -41,7 +41,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp index 3b84bc939..bd90df412 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp @@ -27,8 +27,7 @@ #include "dsp/filerecord.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "plutosdr/deviceplutosdrparams.h" #include "plutosdr/deviceplutosdrbox.h" @@ -41,7 +40,7 @@ MESSAGE_CLASS_DEFINITION(PlutoSDRInput::MsgConfigurePlutoSDR, Message) MESSAGE_CLASS_DEFINITION(PlutoSDRInput::MsgFileRecord, Message) MESSAGE_CLASS_DEFINITION(PlutoSDRInput::MsgStartStop, Message) -PlutoSDRInput::PlutoSDRInput(DeviceSourceAPI *deviceAPI) : +PlutoSDRInput::PlutoSDRInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_fileSink(0), m_deviceDescription("PlutoSDRInput"), @@ -61,7 +60,7 @@ PlutoSDRInput::PlutoSDRInput(DeviceSourceAPI *deviceAPI) : resumeBuddies(); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -71,7 +70,7 @@ PlutoSDRInput::~PlutoSDRInput() { disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); delete m_networkManager; - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; suspendBuddies(); closeDevice(); @@ -224,14 +223,14 @@ bool PlutoSDRInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { @@ -276,7 +275,7 @@ bool PlutoSDRInput::openDevice() { qDebug("PlutoSDRInput::openDevice: look at Tx buddy"); - DeviceSinkAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; + DeviceAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; DevicePlutoSDRShared* buddySharedPtr = (DevicePlutoSDRShared*) sinkBuddy->getBuddySharedPtr(); m_deviceShared.m_deviceParams = buddySharedPtr->m_deviceParams; @@ -298,7 +297,7 @@ bool PlutoSDRInput::openDevice() m_deviceShared.m_deviceParams = new DevicePlutoSDRParams(); char serial[256]; - strcpy(serial, qPrintable(m_deviceAPI->getSampleSourceSerial())); + strcpy(serial, qPrintable(m_deviceAPI->getSamplingDeviceSerial())); m_deviceShared.m_deviceParams->open(serial); } @@ -332,7 +331,7 @@ void PlutoSDRInput::suspendBuddies() for (unsigned int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) { - DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[i]; + DeviceAPI *buddy = m_deviceAPI->getSinkBuddies()[i]; DevicePlutoSDRShared *buddyShared = (DevicePlutoSDRShared *) buddy->getBuddySharedPtr(); if (buddyShared->m_thread) { @@ -347,7 +346,7 @@ void PlutoSDRInput::resumeBuddies() for (unsigned int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) { - DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[i]; + DeviceAPI *buddy = m_deviceAPI->getSinkBuddies()[i]; DevicePlutoSDRShared *buddyShared = (DevicePlutoSDRShared *) buddy->getBuddySharedPtr(); if (buddyShared->m_thread) { @@ -459,8 +458,8 @@ bool PlutoSDRInput::applySettings(const PlutoSDRInputSettings& settings, bool fo if (suspendAllOtherThreads) { - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { @@ -610,8 +609,8 @@ bool PlutoSDRInput::applySettings(const PlutoSDRInputSettings& settings, bool fo if (suspendAllOtherThreads) { - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { @@ -633,8 +632,8 @@ bool PlutoSDRInput::applySettings(const PlutoSDRInputSettings& settings, bool fo qDebug("PlutoSDRInput::applySettings: forwardChangeOtherDSP"); - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { @@ -645,13 +644,13 @@ bool PlutoSDRInput::applySettings(const PlutoSDRInputSettings& settings, bool fo settings.m_lpfFIRBW, settings.m_LOppmTenths); - if ((*itSink)->getSampleSinkGUIMessageQueue()) + if ((*itSink)->getSamplingDeviceGUIMessageQueue()) { DevicePlutoSDRShared::MsgCrossReportToBuddy *msgToGUI = new DevicePlutoSDRShared::MsgCrossReportToBuddy(*msg); - (*itSink)->getSampleSinkGUIMessageQueue()->push(msgToGUI); + (*itSink)->getSamplingDeviceGUIMessageQueue()->push(msgToGUI); } - (*itSink)->getSampleSinkInputMessageQueue()->push(msg); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(msg); } } diff --git a/plugins/samplesource/plutosdrinput/plutosdrinput.h b/plugins/samplesource/plutosdrinput/plutosdrinput.h index b3bbdf9a1..73c19c4fd 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinput.h +++ b/plugins/samplesource/plutosdrinput/plutosdrinput.h @@ -31,7 +31,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class FileRecord; class PlutoSDRInputThread; @@ -99,7 +99,7 @@ public: { } }; - PlutoSDRInput(DeviceSourceAPI *deviceAPI); + PlutoSDRInput(DeviceAPI *deviceAPI); ~PlutoSDRInput(); virtual void destroy(); @@ -152,7 +152,7 @@ public: float getTemperature(); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; FileRecord *m_fileSink; QString m_deviceDescription; PlutoSDRInputSettings m_settings; diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp index fbd022b52..d514d7170 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp @@ -24,7 +24,7 @@ #include "gui/glspectrum.h" #include "gui/crightclickenabler.h" #include "gui/basicdevicesettingsdialog.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "plutosdr/deviceplutosdr.h" #include "plutosdrinput.h" @@ -41,11 +41,11 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource(NULL), m_sampleRate(0), m_deviceCenterFrequency(0), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted), + m_lastEngineState(DeviceAPI::StNotStarted), m_doApplySettings(true), m_statusCounter(0) { - m_sampleSource = (PlutoSDRInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (PlutoSDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -429,24 +429,24 @@ void PlutoSDRInputGui::blockApplySettings(bool block) void PlutoSDRInputGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; @@ -478,7 +478,7 @@ void PlutoSDRInputGui::updateStatus() if (m_statusCounter % 10 == 0) // 5s { - if (m_deviceUISet->m_deviceSourceAPI->isBuddyLeader()) { + if (m_deviceUISet->m_deviceAPI->isBuddyLeader()) { ((PlutoSDRInput *) m_sampleSource)->fetchTemperature(); } diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp index af8cdcd5a..5d9d9e287 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp @@ -27,7 +27,7 @@ #endif #include "plutosdrinputplugin.h" -class DeviceSourceAPI; +class DeviceAPI; const PluginDescriptor PlutoSDRInputPlugin::m_pluginDescriptor = { QString("PlutoSDR Input"), @@ -115,7 +115,7 @@ PluginInstanceGUI* PlutoSDRInputPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *PlutoSDRInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *PlutoSDRInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h index fee851804..c906f7622 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h +++ b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h @@ -41,7 +41,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/remoteinput/remoteinput.cpp b/plugins/samplesource/remoteinput/remoteinput.cpp index 00d6bedc8..04d3ce361 100644 --- a/plugins/samplesource/remoteinput/remoteinput.cpp +++ b/plugins/samplesource/remoteinput/remoteinput.cpp @@ -30,7 +30,7 @@ #include "util/simpleserializer.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "dsp/filerecord.h" #include "remoteinput.h" @@ -44,7 +44,7 @@ MESSAGE_CLASS_DEFINITION(RemoteInput::MsgReportRemoteInputStreamTiming, Message) MESSAGE_CLASS_DEFINITION(RemoteInput::MsgFileRecord, Message) MESSAGE_CLASS_DEFINITION(RemoteInput::MsgStartStop, Message) -RemoteInput::RemoteInput(DeviceSourceAPI *deviceAPI) : +RemoteInput::RemoteInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_remoteInputUDPHandler(0), @@ -55,7 +55,7 @@ RemoteInput::RemoteInput(DeviceSourceAPI *deviceAPI) : m_remoteInputUDPHandler = new RemoteInputUDPHandler(&m_sampleFifo, m_deviceAPI); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -66,7 +66,7 @@ RemoteInput::~RemoteInput() disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); delete m_networkManager; stop(); - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; delete m_remoteInputUDPHandler; } @@ -193,14 +193,14 @@ bool RemoteInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { diff --git a/plugins/samplesource/remoteinput/remoteinput.h b/plugins/samplesource/remoteinput/remoteinput.h index aa0cbacf7..29c35a806 100644 --- a/plugins/samplesource/remoteinput/remoteinput.h +++ b/plugins/samplesource/remoteinput/remoteinput.h @@ -33,7 +33,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class RemoteInputUDPHandler; class FileRecord; @@ -268,7 +268,7 @@ public: { } }; - RemoteInput(DeviceSourceAPI *deviceAPI); + RemoteInput(DeviceAPI *deviceAPI); virtual ~RemoteInput(); virtual void destroy(); @@ -314,7 +314,7 @@ public: QString& errorMessage); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; RemoteInputSettings m_settings; RemoteInputUDPHandler* m_remoteInputUDPHandler; diff --git a/plugins/samplesource/remoteinput/remoteinputgui.cpp b/plugins/samplesource/remoteinput/remoteinputgui.cpp index 3f0132fb5..31dd0649d 100644 --- a/plugins/samplesource/remoteinput/remoteinputgui.cpp +++ b/plugins/samplesource/remoteinput/remoteinputgui.cpp @@ -39,7 +39,7 @@ #include "dsp/dspcommands.h" #include "mainwindow.h" #include "util/simpleserializer.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "remoteinputgui.h" @@ -53,7 +53,7 @@ RemoteInputGui::RemoteInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_acquisition(false), m_streamSampleRate(0), m_streamCenterFrequency(0), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted), + m_lastEngineState(DeviceAPI::StNotStarted), m_framesDecodingStatus(0), m_bufferLengthInSecs(0.0), m_bufferGauge(-50), @@ -92,7 +92,7 @@ RemoteInputGui::RemoteInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_statusTimer.start(500); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); - m_sampleSource = (RemoteInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (RemoteInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection); m_sampleSource->setMessageQueueToGUI(&m_inputMessageQueue); @@ -538,24 +538,24 @@ void RemoteInputGui::updateStatus() { if (m_sampleSource->isStreaming()) { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if (m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/remoteinput/remoteinputplugin.cpp b/plugins/samplesource/remoteinput/remoteinputplugin.cpp index 7fe0be4dd..dbfab1b06 100644 --- a/plugins/samplesource/remoteinput/remoteinputplugin.cpp +++ b/plugins/samplesource/remoteinput/remoteinputplugin.cpp @@ -100,7 +100,7 @@ PluginInstanceGUI* RemoteInputPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *RemoteInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *RemoteInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/remoteinput/remoteinputplugin.h b/plugins/samplesource/remoteinput/remoteinputplugin.h index c1c89a159..8d082981a 100644 --- a/plugins/samplesource/remoteinput/remoteinputplugin.h +++ b/plugins/samplesource/remoteinput/remoteinputplugin.h @@ -41,7 +41,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/remoteinput/remoteinputudphandler.cpp b/plugins/samplesource/remoteinput/remoteinputudphandler.cpp index 3221e2f7d..2d827c668 100644 --- a/plugins/samplesource/remoteinput/remoteinputudphandler.cpp +++ b/plugins/samplesource/remoteinput/remoteinputudphandler.cpp @@ -21,12 +21,12 @@ #include "dsp/dspcommands.h" #include "dsp/dspengine.h" -#include +#include "device/deviceapi.h" #include "remoteinputudphandler.h" #include "remoteinput.h" -RemoteInputUDPHandler::RemoteInputUDPHandler(SampleSinkFifo *sampleFifo, DeviceSourceAPI *deviceAPI) : +RemoteInputUDPHandler::RemoteInputUDPHandler(SampleSinkFifo *sampleFifo, DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_masterTimer(deviceAPI->getMasterTimer()), m_masterTimerConnected(false), diff --git a/plugins/samplesource/remoteinput/remoteinputudphandler.h b/plugins/samplesource/remoteinput/remoteinputudphandler.h index 7d0167368..a8c757daa 100644 --- a/plugins/samplesource/remoteinput/remoteinputudphandler.h +++ b/plugins/samplesource/remoteinput/remoteinputudphandler.h @@ -31,13 +31,13 @@ class SampleSinkFifo; class MessageQueue; class QTimer; -class DeviceSourceAPI; +class DeviceAPI; class RemoteInputUDPHandler : public QObject { Q_OBJECT public: - RemoteInputUDPHandler(SampleSinkFifo* sampleFifo, DeviceSourceAPI *deviceAPI); + RemoteInputUDPHandler(SampleSinkFifo* sampleFifo, DeviceAPI *deviceAPI); ~RemoteInputUDPHandler(); void setMessageQueueToGUI(MessageQueue *queue) { m_outputMessageQueueToGUI = queue; } void start(); @@ -56,7 +56,7 @@ public slots: void dataReadyRead(); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; const QTimer& m_masterTimer; bool m_masterTimerConnected; bool m_running; diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp index e2927b86c..1d8cc286f 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp @@ -20,9 +20,9 @@ #include "rtlsdrgui.h" -#include +#include "device/deviceapi.h" #include "device/deviceuiset.h" -#include +#include "dsp/filerecord.h" #include "ui_rtlsdrgui.h" #include "gui/colormapper.h" @@ -42,9 +42,9 @@ RTLSDRGui::RTLSDRGui(DeviceUISet *deviceUISet, QWidget* parent) : m_settings(), m_sampleRateMode(true), m_sampleSource(0), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { - m_sampleSource = (RTLSDRInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (RTLSDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -439,24 +439,24 @@ void RTLSDRGui::updateHardware() void RTLSDRGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp index f5a75f5d5..f976a07e0 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp @@ -30,7 +30,7 @@ #include "SWGRtlSdrReport.h" #include "rtlsdrinput.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "rtlsdrthread.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" @@ -49,7 +49,7 @@ const int RTLSDRInput::sampleRateLowRangeMax = 300000U; const int RTLSDRInput::sampleRateHighRangeMin = 950000U; const int RTLSDRInput::sampleRateHighRangeMax = 2400000U; -RTLSDRInput::RTLSDRInput(DeviceSourceAPI *deviceAPI) : +RTLSDRInput::RTLSDRInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_dev(0), @@ -60,7 +60,7 @@ RTLSDRInput::RTLSDRInput(DeviceSourceAPI *deviceAPI) : openDevice(); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -75,7 +75,7 @@ RTLSDRInput::~RTLSDRInput() stop(); } - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; closeDevice(); @@ -107,7 +107,7 @@ bool RTLSDRInput::openDevice() int device; - if ((device = rtlsdr_get_index_by_serial(qPrintable(m_deviceAPI->getSampleSourceSerial()))) < 0) + if ((device = rtlsdr_get_index_by_serial(qPrintable(m_deviceAPI->getSamplingDeviceSerial()))) < 0) { qCritical("RTLSDRInput::openDevice: could not get RTLSDR serial number"); return false; @@ -344,13 +344,13 @@ bool RTLSDRInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) { - m_deviceAPI->startAcquisition(); + if (m_deviceAPI->initDeviceEngine()) { + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.h b/plugins/samplesource/rtlsdr/rtlsdrinput.h index 4afedf96e..ba3c780a6 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.h +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.h @@ -27,7 +27,7 @@ #include "rtlsdrsettings.h" #include -class DeviceSourceAPI; +class DeviceAPI; class RTLSDRThread; class FileRecord; class QNetworkAccessManager; @@ -97,7 +97,7 @@ public: { } }; - RTLSDRInput(DeviceSourceAPI *deviceAPI); + RTLSDRInput(DeviceAPI *deviceAPI); virtual ~RTLSDRInput(); virtual void destroy(); @@ -153,7 +153,7 @@ public: static const int sampleRateHighRangeMax; private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; FileRecord *m_fileSink; //!< File sink to record device I/Q output QMutex m_mutex; RTLSDRSettings m_settings; diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp index 77a1520b2..4ffdd03e5 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp @@ -93,7 +93,7 @@ PluginInstanceGUI* RTLSDRPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *RTLSDRPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *RTLSDRPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.h b/plugins/samplesource/rtlsdr/rtlsdrplugin.h index 3337bd1d6..32c1a4387 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.h +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.h @@ -24,7 +24,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/sdrplay/sdrplaygui.cpp b/plugins/samplesource/sdrplay/sdrplaygui.cpp index 184aef5ee..ccf1f8713 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.cpp +++ b/plugins/samplesource/sdrplay/sdrplaygui.cpp @@ -20,7 +20,7 @@ #include "sdrplaygui.h" -#include +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "ui_sdrplaygui.h" @@ -39,7 +39,7 @@ SDRPlayGui::SDRPlayGui(DeviceUISet *deviceUISet, QWidget* parent) : m_doApplySettings(true), m_forceSettings(true) { - m_sampleSource = (SDRPlayInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (SDRPlayInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -302,24 +302,24 @@ void SDRPlayGui::updateHardware() void SDRPlayGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/sdrplay/sdrplaygui.h b/plugins/samplesource/sdrplay/sdrplaygui.h index d26fa20f5..101a8ad33 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.h +++ b/plugins/samplesource/sdrplay/sdrplaygui.h @@ -28,7 +28,6 @@ #include "sdrplayinput.h" #include "sdrplaysettings.h" -class DeviceSourceAPI; class DeviceUISet; namespace Ui { diff --git a/plugins/samplesource/sdrplay/sdrplayinput.cpp b/plugins/samplesource/sdrplay/sdrplayinput.cpp index 4e82b57b4..787effa76 100644 --- a/plugins/samplesource/sdrplay/sdrplayinput.cpp +++ b/plugins/samplesource/sdrplay/sdrplayinput.cpp @@ -33,7 +33,7 @@ #include #include "sdrplayinput.h" -#include +#include #include "sdrplaythread.h" @@ -42,7 +42,7 @@ MESSAGE_CLASS_DEFINITION(SDRPlayInput::MsgReportSDRPlayGains, Message) MESSAGE_CLASS_DEFINITION(SDRPlayInput::MsgFileRecord, Message) MESSAGE_CLASS_DEFINITION(SDRPlayInput::MsgStartStop, Message) -SDRPlayInput::SDRPlayInput(DeviceSourceAPI *deviceAPI) : +SDRPlayInput::SDRPlayInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_variant(SDRPlayUndef), m_settings(), @@ -54,7 +54,7 @@ SDRPlayInput::SDRPlayInput(DeviceSourceAPI *deviceAPI) : { openDevice(); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -69,7 +69,7 @@ SDRPlayInput::~SDRPlayInput() stop(); } - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; closeDevice(); } @@ -81,7 +81,7 @@ void SDRPlayInput::destroy() bool SDRPlayInput::openDevice() { - m_devNumber = m_deviceAPI->getSampleSourceSequence(); + m_devNumber = m_deviceAPI->getSamplingDeviceSequence(); if (m_dev != 0) { @@ -337,14 +337,14 @@ bool SDRPlayInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { diff --git a/plugins/samplesource/sdrplay/sdrplayinput.h b/plugins/samplesource/sdrplay/sdrplayinput.h index 4bed9d8e3..2ac578dae 100644 --- a/plugins/samplesource/sdrplay/sdrplayinput.h +++ b/plugins/samplesource/sdrplay/sdrplayinput.h @@ -30,7 +30,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class SDRPlayThread; class FileRecord; @@ -135,7 +135,7 @@ public: { } }; - SDRPlayInput(DeviceSourceAPI *deviceAPI); + SDRPlayInput(DeviceAPI *deviceAPI); virtual ~SDRPlayInput(); virtual void destroy(); @@ -181,7 +181,7 @@ public: SDRPlayVariant getVariant() const { return m_variant; } private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; SDRPlayVariant m_variant; SDRPlaySettings m_settings; diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.cpp b/plugins/samplesource/sdrplay/sdrplayplugin.cpp index 5faa0d5ba..149334c54 100644 --- a/plugins/samplesource/sdrplay/sdrplayplugin.cpp +++ b/plugins/samplesource/sdrplay/sdrplayplugin.cpp @@ -118,7 +118,7 @@ PluginInstanceGUI* SDRPlayPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *SDRPlayPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *SDRPlayPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.h b/plugins/samplesource/sdrplay/sdrplayplugin.h index 3c25aef66..fce4655e5 100644 --- a/plugins/samplesource/sdrplay/sdrplayplugin.h +++ b/plugins/samplesource/sdrplay/sdrplayplugin.h @@ -41,7 +41,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/soapysdrinput/soapysdrinput.cpp b/plugins/samplesource/soapysdrinput/soapysdrinput.cpp index 5e87d56f5..b7c144600 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinput.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinput.cpp @@ -27,8 +27,7 @@ #include "SWGDeviceReport.h" #include "SWGSoapySDRReport.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "dsp/dspcommands.h" #include "dsp/filerecord.h" #include "dsp/dspengine.h" @@ -42,7 +41,7 @@ MESSAGE_CLASS_DEFINITION(SoapySDRInput::MsgFileRecord, Message) MESSAGE_CLASS_DEFINITION(SoapySDRInput::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(SoapySDRInput::MsgReportGainChange, Message) -SoapySDRInput::SoapySDRInput(DeviceSourceAPI *deviceAPI) : +SoapySDRInput::SoapySDRInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_deviceDescription("SoapySDRInput"), @@ -56,7 +55,7 @@ SoapySDRInput::SoapySDRInput(DeviceSourceAPI *deviceAPI) : initDeviceArgSettings(m_settings); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -71,7 +70,7 @@ SoapySDRInput::~SoapySDRInput() stop(); } - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; closeDevice(); @@ -99,7 +98,7 @@ bool SoapySDRInput::openDevice() { qDebug("SoapySDRInput::openDevice: look in Rx buddies"); - DeviceSourceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; + DeviceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; DeviceSoapySDRShared *deviceSoapySDRShared = (DeviceSoapySDRShared*) sourceBuddy->getBuddySharedPtr(); if (deviceSoapySDRShared == 0) @@ -124,7 +123,7 @@ bool SoapySDRInput::openDevice() { qDebug("SoapySDRInput::openDevice: look in Tx buddies"); - DeviceSinkAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; + DeviceAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; DeviceSoapySDRShared *deviceSoapySDRShared = (DeviceSoapySDRShared*) sinkBuddy->getBuddySharedPtr(); if (deviceSoapySDRShared == 0) @@ -149,7 +148,7 @@ bool SoapySDRInput::openDevice() { qDebug("SoapySDRInput::openDevice: open device here"); DeviceSoapySDR& deviceSoapySDR = DeviceSoapySDR::instance(); - m_deviceShared.m_device = deviceSoapySDR.openSoapySDR(m_deviceAPI->getSampleSourceSequence()); + m_deviceShared.m_device = deviceSoapySDR.openSoapySDR(m_deviceAPI->getSamplingDeviceSequence()); if (!m_deviceShared.m_device) { @@ -398,8 +397,8 @@ SoapySDRInputThread *SoapySDRInput::findThread() SoapySDRInputThread *soapySDRInputThread = 0; // find a buddy that has allocated the thread - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { @@ -425,8 +424,8 @@ SoapySDRInputThread *SoapySDRInput::findThread() void SoapySDRInput::moveThreadToBuddy() { - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { @@ -520,8 +519,8 @@ bool SoapySDRInput::start() } // remove old thread address from buddies (reset in all buddies). The address being held only in the owning source. - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { ((DeviceSoapySDRShared*) (*it)->getBuddySharedPtr())->m_source->setThread(0); @@ -605,8 +604,8 @@ void SoapySDRInput::stop() m_thread = 0; // remove old thread address from buddies (reset in all buddies) - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { ((DeviceSoapySDRShared*) (*it)->getBuddySharedPtr())->m_source->setThread(0); @@ -654,8 +653,8 @@ void SoapySDRInput::stop() } // remove old thread address from buddies (reset in all buddies). The address being held only in the owning source. - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { ((DeviceSoapySDRShared*) (*it)->getBuddySharedPtr())->m_source->setThread(0); @@ -824,14 +823,14 @@ bool SoapySDRInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { @@ -1275,8 +1274,8 @@ bool SoapySDRInput::applySettings(const SoapySDRInputSettings& settings, bool fo if (forwardChangeToBuddies) { // send to buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); for (const auto &itSource : sourceBuddies) { @@ -1286,7 +1285,7 @@ bool SoapySDRInput::applySettings(const SoapySDRInputSettings& settings, bool fo (int) settings.m_fcPos, settings.m_devSampleRate, true); - itSource->getSampleSourceInputMessageQueue()->push(report); + itSource->getSamplingDeviceInputMessageQueue()->push(report); } for (const auto &itSink : sinkBuddies) @@ -1297,28 +1296,28 @@ bool SoapySDRInput::applySettings(const SoapySDRInputSettings& settings, bool fo (int) settings.m_fcPos, settings.m_devSampleRate, true); - itSink->getSampleSinkInputMessageQueue()->push(report); + itSink->getSamplingDeviceInputMessageQueue()->push(report); } } if (deviceArgsChanged) { // send to buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); for (const auto &itSource : sourceBuddies) { DeviceSoapySDRShared::MsgReportDeviceArgsChange *report = DeviceSoapySDRShared::MsgReportDeviceArgsChange::create( settings.m_deviceArgSettings); - itSource->getSampleSourceInputMessageQueue()->push(report); + itSource->getSamplingDeviceInputMessageQueue()->push(report); } for (const auto &itSink : sinkBuddies) { DeviceSoapySDRShared::MsgReportDeviceArgsChange *report = DeviceSoapySDRShared::MsgReportDeviceArgsChange::create( settings.m_deviceArgSettings); - itSink->getSampleSinkInputMessageQueue()->push(report); + itSink->getSamplingDeviceInputMessageQueue()->push(report); } } diff --git a/plugins/samplesource/soapysdrinput/soapysdrinput.h b/plugins/samplesource/soapysdrinput/soapysdrinput.h index d76ddd62c..488f1e886 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinput.h +++ b/plugins/samplesource/soapysdrinput/soapysdrinput.h @@ -31,7 +31,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class SoapySDRInputThread; class FileRecord; @@ -138,7 +138,7 @@ public: { } }; - SoapySDRInput(DeviceSourceAPI *deviceAPI); + SoapySDRInput(DeviceAPI *deviceAPI); virtual ~SoapySDRInput(); virtual void destroy(); @@ -204,7 +204,7 @@ public: QString& errorMessage); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; SoapySDRInputSettings m_settings; QString m_deviceDescription; diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp index e259f97a6..242b9d478 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp @@ -20,7 +20,7 @@ #include "dsp/dspengine.h" #include "dsp/dspcommands.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "util/simpleserializer.h" #include "gui/glspectrum.h" @@ -47,7 +47,7 @@ SoapySDRInputGui::SoapySDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource(0), m_sampleRate(0), m_deviceCenterFrequency(0), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted), + m_lastEngineState(DeviceAPI::StNotStarted), m_antennas(0), m_sampleRateGUI(0), m_bandwidthGUI(0), @@ -58,7 +58,7 @@ SoapySDRInputGui::SoapySDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_autoDCCorrection(0), m_autoIQCorrection(0) { - m_sampleSource = (SoapySDRInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = (SoapySDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -905,24 +905,24 @@ void SoapySDRInputGui::updateHardware() void SoapySDRInputGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp index e08ed5c80..4ffe4e0e2 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp @@ -116,7 +116,7 @@ PluginInstanceGUI* SoapySDRInputPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *SoapySDRInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *SoapySDRInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.h b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.h index 330431f38..64633db4b 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.h +++ b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.h @@ -22,7 +22,7 @@ #include "plugin/plugininterface.h" class PluginAPI; -class DeviceSourceAPI; +class DeviceAPI; class DeviceUISet; #define SOAPYSDRINPUT_DEVICE_TYPE_ID "sdrangel.samplesource.soapysdrinput" @@ -43,7 +43,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/testsource/testsourcegui.cpp b/plugins/samplesource/testsource/testsourcegui.cpp index b7856d08b..15fe7a48f 100644 --- a/plugins/samplesource/testsource/testsourcegui.cpp +++ b/plugins/samplesource/testsource/testsourcegui.cpp @@ -35,7 +35,7 @@ #include "mainwindow.h" #include "testsourcegui.h" -#include +#include "device/deviceapi.h" #include "device/deviceuiset.h" TestSourceGui::TestSourceGui(DeviceUISet *deviceUISet, QWidget* parent) : @@ -47,10 +47,10 @@ TestSourceGui::TestSourceGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_sampleSource(0), m_tickCount(0), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) + m_lastEngineState(DeviceAPI::StNotStarted) { qDebug("TestSourceGui::TestSourceGui"); - m_sampleSource = m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_sampleSource = m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -430,24 +430,24 @@ void TestSourceGui::updateHardware() void TestSourceGui::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; diff --git a/plugins/samplesource/testsource/testsourceinput.cpp b/plugins/samplesource/testsource/testsourceinput.cpp index 8af0cd236..db6841655 100644 --- a/plugins/samplesource/testsource/testsourceinput.cpp +++ b/plugins/samplesource/testsource/testsourceinput.cpp @@ -27,7 +27,7 @@ #include "SWGDeviceState.h" #include "testsourceinput.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "testsourcethread.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" @@ -38,7 +38,7 @@ MESSAGE_CLASS_DEFINITION(TestSourceInput::MsgFileRecord, Message) MESSAGE_CLASS_DEFINITION(TestSourceInput::MsgStartStop, Message) -TestSourceInput::TestSourceInput(DeviceSourceAPI *deviceAPI) : +TestSourceInput::TestSourceInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_testSourceThread(0), @@ -47,7 +47,7 @@ TestSourceInput::TestSourceInput(DeviceSourceAPI *deviceAPI) : m_masterTimer(deviceAPI->getMasterTimer()) { m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); if (!m_sampleFifo.setSize(96000 * 4)) { qCritical("TestSourceInput::TestSourceInput: Could not allocate SampleFifo"); @@ -66,7 +66,7 @@ TestSourceInput::~TestSourceInput() stop(); } - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; } @@ -214,14 +214,14 @@ bool TestSourceInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } if (m_settings.m_useReverseAPI) { diff --git a/plugins/samplesource/testsource/testsourceinput.h b/plugins/samplesource/testsource/testsourceinput.h index 8b3306520..54ecd3bb4 100644 --- a/plugins/samplesource/testsource/testsourceinput.h +++ b/plugins/samplesource/testsource/testsourceinput.h @@ -26,7 +26,7 @@ #include #include "testsourcesettings.h" -class DeviceSourceAPI; +class DeviceAPI; class TestSourceThread; class FileRecord; class QNetworkAccessManager; @@ -96,7 +96,7 @@ public: { } }; - TestSourceInput(DeviceSourceAPI *deviceAPI); + TestSourceInput(DeviceAPI *deviceAPI); virtual ~TestSourceInput(); virtual void destroy(); @@ -136,7 +136,7 @@ public: QString& errorMessage); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; FileRecord *m_fileSink; //!< File sink to record device I/Q output QMutex m_mutex; TestSourceSettings m_settings; diff --git a/plugins/samplesource/testsource/testsourceplugin.cpp b/plugins/samplesource/testsource/testsourceplugin.cpp index e17c10c4f..4691cf223 100644 --- a/plugins/samplesource/testsource/testsourceplugin.cpp +++ b/plugins/samplesource/testsource/testsourceplugin.cpp @@ -97,7 +97,7 @@ PluginInstanceGUI* TestSourcePlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *TestSourcePlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *TestSourcePlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/testsource/testsourceplugin.h b/plugins/samplesource/testsource/testsourceplugin.h index 912c3676b..893730697 100644 --- a/plugins/samplesource/testsource/testsourceplugin.h +++ b/plugins/samplesource/testsource/testsourceplugin.h @@ -41,7 +41,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/xtrxinput/xtrxinput.cpp b/plugins/samplesource/xtrxinput/xtrxinput.cpp index 72a6f8d0a..9755bd242 100644 --- a/plugins/samplesource/xtrxinput/xtrxinput.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinput.cpp @@ -30,8 +30,7 @@ #include "SWGDeviceReport.h" #include "SWGXtrxInputReport.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "dsp/dspcommands.h" #include "dsp/filerecord.h" #include "xtrxinput.h" @@ -48,7 +47,7 @@ MESSAGE_CLASS_DEFINITION(XTRXInput::MsgReportStreamInfo, Message) MESSAGE_CLASS_DEFINITION(XTRXInput::MsgFileRecord, Message) MESSAGE_CLASS_DEFINITION(XTRXInput::MsgStartStop, Message) -XTRXInput::XTRXInput(DeviceSourceAPI *deviceAPI) : +XTRXInput::XTRXInput(DeviceAPI *deviceAPI) : m_deviceAPI(deviceAPI), m_settings(), m_XTRXInputThread(0), @@ -58,7 +57,7 @@ XTRXInput::XTRXInput(DeviceSourceAPI *deviceAPI) : openDevice(); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); - m_deviceAPI->addSink(m_fileSink); + m_deviceAPI->addAncillarySink(m_fileSink); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); @@ -73,7 +72,7 @@ XTRXInput::~XTRXInput() stop(); } - m_deviceAPI->removeSink(m_fileSink); + m_deviceAPI->removeAncillarySink(m_fileSink); delete m_fileSink; closeDevice(); } @@ -100,7 +99,7 @@ bool XTRXInput::openDevice() { qDebug("XTRXInput::openDevice: look in Rx buddies"); - DeviceSourceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; + DeviceAPI *sourceBuddy = m_deviceAPI->getSourceBuddies()[0]; DeviceXTRXShared *deviceXTRXShared = (DeviceXTRXShared*) sourceBuddy->getBuddySharedPtr(); if (deviceXTRXShared == 0) @@ -124,7 +123,7 @@ bool XTRXInput::openDevice() { qDebug("XTRXInput::openDevice: look in Tx buddies"); - DeviceSinkAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; + DeviceAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0]; DeviceXTRXShared *deviceXTRXShared = (DeviceXTRXShared*) sinkBuddy->getBuddySharedPtr(); if (deviceXTRXShared == 0) @@ -150,7 +149,7 @@ bool XTRXInput::openDevice() m_deviceShared.m_dev = new DeviceXTRX(); char serial[256]; - strcpy(serial, qPrintable(m_deviceAPI->getSampleSourceSerial())); + strcpy(serial, qPrintable(m_deviceAPI->getSamplingDeviceSerial())); if (!m_deviceShared.m_dev->open(serial)) { @@ -204,8 +203,8 @@ XTRXInputThread *XTRXInput::findThread() XTRXInputThread *xtrxInputThread = 0; // find a buddy that has allocated the thread - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { @@ -231,8 +230,8 @@ XTRXInputThread *XTRXInput::findThread() void XTRXInput::moveThreadToBuddy() { - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { @@ -316,8 +315,8 @@ bool XTRXInput::start() } // remove old thread address from buddies (reset in all buddies). The address being held only in the owning source. - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { @@ -396,8 +395,8 @@ void XTRXInput::stop() m_deviceShared.m_thread = 0; // remove old thread address from buddies (reset in all buddies) - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { @@ -418,8 +417,8 @@ void XTRXInput::stop() xtrxInputThread->setLog2Decimation(requestedChannel, m_settings.m_log2SoftDecim); // remove old thread address from buddies (reset in all buddies). The address being held only in the owning source. - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator it = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator it = sourceBuddies.begin(); for (; it != sourceBuddies.end(); ++it) { @@ -436,8 +435,8 @@ void XTRXInput::stop() void XTRXInput::suspendTxThread() { - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); qDebug("XTRXInput::suspendTxThread (%lu)", sinkBuddies.size()); @@ -459,8 +458,8 @@ void XTRXInput::suspendTxThread() void XTRXInput::resumeTxThread() { - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); qDebug("XTRXInput::resumeTxThread (%lu)", sinkBuddies.size()); @@ -674,7 +673,7 @@ bool XTRXInput::handleMessage(const Message& message) } else if (MsgGetStreamInfo::match(message)) { - if (m_deviceAPI->getSampleSourceGUIMessageQueue()) + if (m_deviceAPI->getSamplingDeviceGUIMessageQueue()) { uint64_t fifolevel = 0; @@ -688,8 +687,8 @@ bool XTRXInput::handleMessage(const Message& message) fifolevel, 65536); - if (m_deviceAPI->getSampleSourceGUIMessageQueue()) { - m_deviceAPI->getSampleSourceGUIMessageQueue()->push(report); + if (m_deviceAPI->getSamplingDeviceGUIMessageQueue()) { + m_deviceAPI->getSamplingDeviceGUIMessageQueue()->push(report); } } @@ -711,35 +710,35 @@ bool XTRXInput::handleMessage(const Message& message) } // send to oneself - if (m_deviceAPI->getSampleSourceGUIMessageQueue()) + if (m_deviceAPI->getSamplingDeviceGUIMessageQueue()) { DeviceXTRXShared::MsgReportDeviceInfo *report = DeviceXTRXShared::MsgReportDeviceInfo::create(board_temp, gps_locked); - m_deviceAPI->getSampleSourceGUIMessageQueue()->push(report); + m_deviceAPI->getSamplingDeviceGUIMessageQueue()->push(report); } // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { - if ((*itSource)->getSampleSourceGUIMessageQueue()) + if ((*itSource)->getSamplingDeviceGUIMessageQueue()) { DeviceXTRXShared::MsgReportDeviceInfo *report = DeviceXTRXShared::MsgReportDeviceInfo::create(board_temp, gps_locked); - (*itSource)->getSampleSourceGUIMessageQueue()->push(report); + (*itSource)->getSamplingDeviceGUIMessageQueue()->push(report); } } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { - if ((*itSink)->getSampleSinkGUIMessageQueue()) + if ((*itSink)->getSamplingDeviceGUIMessageQueue()) { DeviceXTRXShared::MsgReportDeviceInfo *report = DeviceXTRXShared::MsgReportDeviceInfo::create(board_temp, gps_locked); - (*itSink)->getSampleSinkGUIMessageQueue()->push(report); + (*itSink)->getSamplingDeviceGUIMessageQueue()->push(report); } } @@ -765,14 +764,14 @@ bool XTRXInput::handleMessage(const Message& message) if (cmd.getStartStop()) { - if (m_deviceAPI->initAcquisition()) + if (m_deviceAPI->initDeviceEngine()) { - m_deviceAPI->startAcquisition(); + m_deviceAPI->startDeviceEngine(); } } else { - m_deviceAPI->stopAcquisition(); + m_deviceAPI->stopDeviceEngine(); } return true; @@ -1230,25 +1229,25 @@ bool XTRXInput::applySettings(const XTRXInputSettings& settings, bool force, boo } // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { DeviceXTRXShared::MsgReportBuddyChange *report = DeviceXTRXShared::MsgReportBuddyChange::create( getDevSampleRate(), getLog2HardDecim(), m_settings.m_centerFrequency, true); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { DeviceXTRXShared::MsgReportBuddyChange *report = DeviceXTRXShared::MsgReportBuddyChange::create( getDevSampleRate(), getLog2HardDecim(), m_settings.m_centerFrequency, true); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } } else if (forwardChangeRxDSP) @@ -1268,14 +1267,14 @@ bool XTRXInput::applySettings(const XTRXInputSettings& settings, bool force, boo } // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { DeviceXTRXShared::MsgReportBuddyChange *report = DeviceXTRXShared::MsgReportBuddyChange::create( getDevSampleRate(), getLog2HardDecim(), m_settings.m_centerFrequency, true); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } } else if (forwardChangeOwnDSP) @@ -1298,25 +1297,25 @@ bool XTRXInput::applySettings(const XTRXInputSettings& settings, bool force, boo if (forwardClockSource) { // send to source buddies - const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); - std::vector::const_iterator itSource = sourceBuddies.begin(); + const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); + std::vector::const_iterator itSource = sourceBuddies.begin(); for (; itSource != sourceBuddies.end(); ++itSource) { DeviceXTRXShared::MsgReportClockSourceChange *report = DeviceXTRXShared::MsgReportClockSourceChange::create( m_settings.m_extClock, m_settings.m_extClockFreq); - (*itSource)->getSampleSourceInputMessageQueue()->push(report); + (*itSource)->getSamplingDeviceInputMessageQueue()->push(report); } // send to sink buddies - const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); - std::vector::const_iterator itSink = sinkBuddies.begin(); + const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); + std::vector::const_iterator itSink = sinkBuddies.begin(); for (; itSink != sinkBuddies.end(); ++itSink) { DeviceXTRXShared::MsgReportClockSourceChange *report = DeviceXTRXShared::MsgReportClockSourceChange::create( m_settings.m_extClock, m_settings.m_extClockFreq); - (*itSink)->getSampleSinkInputMessageQueue()->push(report); + (*itSink)->getSamplingDeviceInputMessageQueue()->push(report); } } diff --git a/plugins/samplesource/xtrxinput/xtrxinput.h b/plugins/samplesource/xtrxinput/xtrxinput.h index a2b68564f..a32e72418 100644 --- a/plugins/samplesource/xtrxinput/xtrxinput.h +++ b/plugins/samplesource/xtrxinput/xtrxinput.h @@ -30,7 +30,7 @@ class QNetworkAccessManager; class QNetworkReply; -class DeviceSourceAPI; +class DeviceAPI; class XTRXInputThread; struct DeviceXTRXParams; class FileRecord; @@ -190,7 +190,7 @@ public: { } }; - XTRXInput(DeviceSourceAPI *deviceAPI); + XTRXInput(DeviceAPI *deviceAPI); virtual ~XTRXInput(); virtual void destroy(); @@ -249,7 +249,7 @@ public: void apply_gain_pga(double gain); private: - DeviceSourceAPI *m_deviceAPI; + DeviceAPI *m_deviceAPI; QMutex m_mutex; XTRXInputSettings m_settings; XTRXInputThread* m_XTRXInputThread; diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp index f637d54fd..cdde327ff 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp @@ -30,7 +30,7 @@ #include "gui/basicdevicesettingsdialog.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" XTRXInputGUI::XTRXInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : @@ -40,13 +40,13 @@ XTRXInputGUI::XTRXInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_settings(), m_sampleRateMode(true), m_sampleRate(0), - m_lastEngineState((DSPDeviceSourceEngine::State)-1), + m_lastEngineState(DeviceAPI::StNotStarted), m_doApplySettings(true), m_forceSettings(true), m_statusCounter(0), m_deviceStatusCounter(0) { - m_XTRXInput = (XTRXInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); + m_XTRXInput = (XTRXInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(this); @@ -424,24 +424,24 @@ void XTRXInputGUI::updateHardware() void XTRXInputGUI::updateStatus() { - int state = m_deviceUISet->m_deviceSourceAPI->state(); + int state = m_deviceUISet->m_deviceAPI->state(); if(m_lastEngineState != state) { switch(state) { - case DSPDeviceSourceEngine::StNotStarted: + case DeviceAPI::StNotStarted: ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); break; - case DSPDeviceSourceEngine::StIdle: + case DeviceAPI::StIdle: ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); break; - case DSPDeviceSourceEngine::StRunning: + case DeviceAPI::StRunning: ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); break; - case DSPDeviceSourceEngine::StError: + case DeviceAPI::StError: ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); - QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage()); + QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceAPI->errorMessage()); break; default: break; @@ -467,7 +467,7 @@ void XTRXInputGUI::updateStatus() } else { - if (m_deviceUISet->m_deviceSourceAPI->isBuddyLeader()) + if (m_deviceUISet->m_deviceAPI->isBuddyLeader()) { XTRXInput::MsgGetDeviceInfo* message = XTRXInput::MsgGetDeviceInfo::create(); m_XTRXInput->getInputMessageQueue()->push(message); diff --git a/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp b/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp index 97c3bd6a9..fa1fc9bcc 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp @@ -114,7 +114,7 @@ PluginInstanceGUI* XTRXInputPlugin::createSampleSourcePluginInstanceGUI( } #endif -DeviceSampleSource *XTRXInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) +DeviceSampleSource *XTRXInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/xtrxinput/xtrxinputplugin.h b/plugins/samplesource/xtrxinput/xtrxinputplugin.h index e20d62f6b..608ee31cc 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputplugin.h +++ b/plugins/samplesource/xtrxinput/xtrxinputplugin.h @@ -42,7 +42,7 @@ public: const QString& sourceId, QWidget **widget, DeviceUISet *deviceUISet); - virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI); + virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt index b2f4ed908..297d6b010 100644 --- a/sdrbase/CMakeLists.txt +++ b/sdrbase/CMakeLists.txt @@ -67,8 +67,8 @@ set(sdrbase_SOURCES dsp/devicesamplesource.cpp dsp/devicesamplesink.cpp - device/devicesourceapi.cpp - device/devicesinkapi.cpp + # device/devicesourceapi.cpp + # device/devicesinkapi.cpp device/deviceapi.cpp device/deviceenumerator.cpp @@ -189,8 +189,8 @@ set(sdrbase_HEADERS dsp/devicesamplesource.h dsp/devicesamplesink.h - device/devicesourceapi.h - device/devicesinkapi.h + # device/devicesourceapi.h + # device/devicesinkapi.h device/deviceapi.h device/deviceenumerator.h diff --git a/sdrbase/channel/channelsinkapi.h b/sdrbase/channel/channelsinkapi.h index 53acd8ec9..d7d9ab244 100644 --- a/sdrbase/channel/channelsinkapi.h +++ b/sdrbase/channel/channelsinkapi.h @@ -26,7 +26,7 @@ #include "export.h" -class DeviceSourceAPI; +class DeviceAPI; namespace SWGSDRangel { @@ -81,8 +81,8 @@ public: void setIndexInDeviceSet(int indexInDeviceSet) { m_indexInDeviceSet = indexInDeviceSet; } int getDeviceSetIndex() const { return m_deviceSetIndex; } void setDeviceSetIndex(int deviceSetIndex) { m_deviceSetIndex = deviceSetIndex; } - DeviceSourceAPI *getDeviceSourceAPI() { return m_deviceSourceAPI; } - void setDeviceSourceAPI(DeviceSourceAPI *deviceSourceAPI) { m_deviceSourceAPI = deviceSourceAPI; } + DeviceAPI *getDeviceSourceAPI() { return m_deviceSourceAPI; } + void setDeviceSourceAPI(DeviceAPI *deviceSourceAPI) { m_deviceSourceAPI = deviceSourceAPI; } uint64_t getUID() const { return m_uid; } private: @@ -93,7 +93,7 @@ private: int m_indexInDeviceSet; int m_deviceSetIndex; - DeviceSourceAPI *m_deviceSourceAPI; + DeviceAPI *m_deviceSourceAPI; uint64_t m_uid; }; diff --git a/sdrbase/channel/channelsourceapi.h b/sdrbase/channel/channelsourceapi.h index 28ed6cf17..137513b37 100644 --- a/sdrbase/channel/channelsourceapi.h +++ b/sdrbase/channel/channelsourceapi.h @@ -25,7 +25,7 @@ #include "export.h" -class DeviceSinkAPI; +class DeviceAPI; namespace SWGSDRangel { @@ -80,8 +80,8 @@ public: void setIndexInDeviceSet(int indexInDeviceSet) { m_indexInDeviceSet = indexInDeviceSet; } int getDeviceSetIndex() const { return m_deviceSetIndex; } void setDeviceSetIndex(int deviceSetIndex) { m_deviceSetIndex = deviceSetIndex; } - DeviceSinkAPI *getDeviceSinkAPI() { return m_deviceSinkAPI; } - void setDeviceSinkAPI(DeviceSinkAPI *deviceSinkAPI) { m_deviceSinkAPI = deviceSinkAPI; } + DeviceAPI *getDeviceSinkAPI() { return m_deviceSinkAPI; } + void setDeviceSinkAPI(DeviceAPI *deviceSinkAPI) { m_deviceSinkAPI = deviceSinkAPI; } uint64_t getUID() const { return m_uid; } private: @@ -92,7 +92,7 @@ private: int m_indexInDeviceSet; int m_deviceSetIndex; - DeviceSinkAPI *m_deviceSinkAPI; + DeviceAPI *m_deviceSinkAPI; uint64_t m_uid; }; diff --git a/sdrbase/device/deviceapi.cpp b/sdrbase/device/deviceapi.cpp index 60bef4790..8aa78e09a 100644 --- a/sdrbase/device/deviceapi.cpp +++ b/sdrbase/device/deviceapi.cpp @@ -40,14 +40,12 @@ DeviceAPI::DeviceAPI( m_itemIndex(0), m_pluginInterface(0), m_masterTimer(DSPEngine::instance()->getMasterTimer()), + m_samplingDeviceSequence(0), + m_samplingDevicePluginInstanceUI(0), m_buddySharedPtr(0), m_isBuddyLeader(false), m_deviceSourceEngine(deviceSourceEngine), - m_sampleSourceSequence(0), - m_sampleSourcePluginInstanceUI(0), - m_deviceSinkEngine(deviceSinkEngine), - m_sampleSinkSequence(0), - m_sampleSinkPluginInstanceUI(0) + m_deviceSinkEngine(deviceSinkEngine) { } @@ -282,56 +280,6 @@ void DeviceAPI::setHardwareId(const QString& id) m_hardwareId = id; } -void DeviceAPI::setSamplingDeviceId(const QString& id) -{ - if (m_streamType == StreamSingleRx) { - m_sampleSourceId = id; - } else if (m_streamType == StreamSingleTx) { - m_sampleSinkId = id; - } -} - -void DeviceAPI::resetSamplingDeviceId() -{ - if (m_streamType == StreamSingleRx) { - m_sampleSourceId.clear(); - } else if (m_streamType == StreamSingleTx) { - m_sampleSinkId.clear(); - } -} - -void DeviceAPI::setSamplingDeviceSerial(const QString& serial) -{ - if (m_streamType == StreamSingleRx) { - m_sampleSourceSerial = serial; - } else if (m_streamType == StreamSingleTx) { - m_sampleSinkSerial = serial; - } -} - -void DeviceAPI::setSamplingDeviceDisplayName(const QString& name) -{ - if (m_streamType == StreamSingleRx) { - m_sampleSourceDisplayName = name; - } else if (m_streamType == StreamSingleTx) { - m_sampleSinkDisplayName = name; - } -} - -void DeviceAPI::setSamplingDeviceSequence(int sequence) -{ - if (m_deviceSourceEngine) - { - m_sampleSourceSequence = sequence; - m_deviceSourceEngine->setSourceSequence(sequence); - } - else if (m_deviceSinkEngine) - { - m_sampleSinkSequence = sequence; - m_deviceSinkEngine->setSinkSequence(sequence); - } -} - void DeviceAPI::setNbItems(uint32_t nbItems) { m_nbItems = nbItems; @@ -349,7 +297,7 @@ void DeviceAPI::setSamplingDevicePluginInterface(PluginInterface *iface) void DeviceAPI::setSamplingDevicePluginInstanceGUI(PluginInstanceGUI *gui) { - m_sampleSinkPluginInstanceUI = gui; + m_samplingDevicePluginInstanceUI = gui; } void DeviceAPI::getDeviceEngineStateStr(QString& state) @@ -446,17 +394,18 @@ void DeviceAPI::loadSamplingDeviceSettings(const Preset* preset) { qDebug("DeviceAPI::loadSamplingDeviceSettings: Loading preset [%s | %s]", qPrintable(preset->getGroup()), qPrintable(preset->getDescription())); - const QByteArray* sourceConfig = preset->findBestDeviceConfig(m_sampleSourceId, m_sampleSourceSerial, m_sampleSourceSequence); + const QByteArray* sourceConfig = preset->findBestDeviceConfig(m_samplingDeviceId, m_samplingDeviceSerial, m_samplingDeviceSequence); qint64 centerFrequency = preset->getCenterFrequency(); qDebug("DeviceAPI::loadSamplingDeviceSettings: center frequency: %llu Hz", centerFrequency); if (sourceConfig != 0) { - qDebug("DeviceAPI::loadSamplingDeviceSettings: deserializing source %s[%d]: %s", qPrintable(m_sampleSourceId), m_sampleSourceSequence, qPrintable(m_sampleSourceSerial)); + qDebug("DeviceAPI::loadSamplingDeviceSettings: deserializing source %s[%d]: %s", + qPrintable(m_samplingDeviceId), m_samplingDeviceSequence, qPrintable(m_samplingDeviceSerial)); - if (m_sampleSourcePluginInstanceUI != 0) // GUI flavor + if (m_samplingDevicePluginInstanceUI != 0) // GUI flavor { - m_sampleSourcePluginInstanceUI->deserialize(*sourceConfig); + m_samplingDevicePluginInstanceUI->deserialize(*sourceConfig); } else if (m_deviceSourceEngine->getSource() != 0) // Server flavor { @@ -469,13 +418,14 @@ void DeviceAPI::loadSamplingDeviceSettings(const Preset* preset) } else { - qDebug("DeviceAPI::loadSamplingDeviceSettings: source %s[%d]: %s not found", qPrintable(m_sampleSourceId), m_sampleSourceSequence, qPrintable(m_sampleSourceSerial)); + qDebug("DeviceAPI::loadSamplingDeviceSettings: source %s[%d]: %s not found", + qPrintable(m_samplingDeviceId), m_samplingDeviceSequence, qPrintable(m_samplingDeviceSerial)); } // set center frequency anyway - if (m_sampleSourcePluginInstanceUI != 0) // GUI flavor + if (m_samplingDevicePluginInstanceUI != 0) // GUI flavor { - m_sampleSourcePluginInstanceUI->setCenterFrequency(centerFrequency); + m_samplingDevicePluginInstanceUI->setCenterFrequency(centerFrequency); } else if (m_deviceSourceEngine->getSource() != 0) // Server flavor { @@ -490,18 +440,19 @@ void DeviceAPI::loadSamplingDeviceSettings(const Preset* preset) { qDebug("DeviceAPI::loadSamplingDeviceSettings: Loading preset [%s | %s]", qPrintable(preset->getGroup()), qPrintable(preset->getDescription())); - const QByteArray* sinkConfig = preset->findBestDeviceConfig(m_sampleSinkId, m_sampleSinkSerial, m_sampleSinkSequence); + const QByteArray* sinkConfig = preset->findBestDeviceConfig(m_samplingDeviceId, m_samplingDeviceSerial, m_samplingDeviceSequence); qint64 centerFrequency = preset->getCenterFrequency(); qDebug("DeviceAPI::loadSamplingDeviceSettings: center frequency: %llu Hz", centerFrequency); if (sinkConfig != 0) { - qDebug("DeviceAPI::loadSamplingDeviceSettings: deserializing sink %s[%d]: %s", qPrintable(m_sampleSinkId), m_sampleSinkSequence, qPrintable(m_sampleSinkSerial)); + qDebug("DeviceAPI::loadSamplingDeviceSettings: deserializing sink %s[%d]: %s", + qPrintable(m_samplingDeviceId), m_samplingDeviceSequence, qPrintable(m_samplingDeviceSerial)); - if (m_sampleSinkPluginInstanceUI != 0) // GUI flavor + if (m_samplingDevicePluginInstanceUI != 0) // GUI flavor { - m_sampleSinkPluginInstanceUI->deserialize(*sinkConfig); - m_sampleSinkPluginInstanceUI->setCenterFrequency(centerFrequency); + m_samplingDevicePluginInstanceUI->deserialize(*sinkConfig); + m_samplingDevicePluginInstanceUI->setCenterFrequency(centerFrequency); } else if (m_deviceSinkEngine->getSink() != 0) // Server flavor { @@ -515,7 +466,8 @@ void DeviceAPI::loadSamplingDeviceSettings(const Preset* preset) } else { - qDebug("DeviceAPI::loadSamplingDeviceSettings: sink %s[%d]: %s not found", qPrintable(m_sampleSinkId), m_sampleSinkSequence, qPrintable(m_sampleSinkSerial)); + qDebug("DeviceAPI::loadSamplingDeviceSettings: sink %s[%d]: %s not found", + qPrintable(m_samplingDeviceId), m_samplingDeviceSequence, qPrintable(m_samplingDeviceSerial)); } } else @@ -528,16 +480,17 @@ void DeviceAPI::saveSamplingDeviceSettings(Preset* preset) { if (m_deviceSourceEngine && (preset->isSourcePreset())) { - qDebug("DeviceAPI::saveSamplingDeviceSettings: serializing source %s[%d]: %s", qPrintable(m_sampleSourceId), m_sampleSourceSequence, qPrintable(m_sampleSourceSerial)); + qDebug("DeviceAPI::saveSamplingDeviceSettings: serializing source %s[%d]: %s", + qPrintable(m_samplingDeviceId), m_samplingDeviceSequence, qPrintable(m_samplingDeviceSerial)); - if (m_sampleSourcePluginInstanceUI != 0) + if (m_samplingDevicePluginInstanceUI != 0) { - preset->addOrUpdateDeviceConfig(m_sampleSourceId, m_sampleSourceSerial, m_sampleSourceSequence, m_sampleSourcePluginInstanceUI->serialize()); - preset->setCenterFrequency(m_sampleSourcePluginInstanceUI->getCenterFrequency()); + preset->addOrUpdateDeviceConfig(m_samplingDeviceId, m_samplingDeviceSerial, m_samplingDeviceSequence, m_samplingDevicePluginInstanceUI->serialize()); + preset->setCenterFrequency(m_samplingDevicePluginInstanceUI->getCenterFrequency()); } else if (m_deviceSourceEngine->getSource() != 0) { - preset->addOrUpdateDeviceConfig(m_sampleSourceId, m_sampleSourceSerial, m_sampleSourceSequence, m_deviceSourceEngine->getSource()->serialize()); + preset->addOrUpdateDeviceConfig(m_samplingDeviceId, m_samplingDeviceSerial, m_samplingDeviceSequence, m_deviceSourceEngine->getSource()->serialize()); preset->setCenterFrequency(m_deviceSourceEngine->getSource()->getCenterFrequency()); } else @@ -547,16 +500,17 @@ void DeviceAPI::saveSamplingDeviceSettings(Preset* preset) } else if (m_deviceSinkEngine && (!preset->isSourcePreset())) // TODO: refine preset stream type { - qDebug("DeviceAPI::saveSamplingDeviceSettings: serializing sink %s[%d]: %s", qPrintable(m_sampleSinkId), m_sampleSinkSequence, qPrintable(m_sampleSinkSerial)); + qDebug("DeviceAPI::saveSamplingDeviceSettings: serializing sink %s[%d]: %s", + qPrintable(m_samplingDeviceId), m_samplingDeviceSequence, qPrintable(m_samplingDeviceSerial)); - if (m_sampleSinkPluginInstanceUI != 0) // GUI flavor + if (m_samplingDevicePluginInstanceUI != 0) // GUI flavor { - preset->addOrUpdateDeviceConfig(m_sampleSinkId, m_sampleSinkSerial, m_sampleSinkSequence, m_deviceSinkEngine->getSink()->serialize()); + preset->addOrUpdateDeviceConfig(m_samplingDeviceId, m_samplingDeviceSerial, m_samplingDeviceSequence, m_deviceSinkEngine->getSink()->serialize()); preset->setCenterFrequency(m_deviceSinkEngine->getSink()->getCenterFrequency()); } else if (m_deviceSinkEngine->getSink() != 0) // Server flavor { - preset->addOrUpdateDeviceConfig(m_sampleSinkId, m_sampleSinkSerial, m_sampleSinkSequence, m_deviceSinkEngine->getSink()->serialize()); + preset->addOrUpdateDeviceConfig(m_samplingDeviceId, m_samplingDeviceSerial, m_samplingDeviceSequence, m_deviceSinkEngine->getSink()->serialize()); preset->setCenterFrequency(m_deviceSinkEngine->getSink()->getCenterFrequency()); } else diff --git a/sdrbase/device/deviceapi.h b/sdrbase/device/deviceapi.h index 0eb97cd38..ee67b520a 100644 --- a/sdrbase/device/deviceapi.h +++ b/sdrbase/device/deviceapi.h @@ -36,8 +36,6 @@ class PluginInterface; class PluginInstanceGUI; class DSPDeviceSourceEngine; class DSPDeviceSinkEngine; -class DeviceSourceAPI; -class DeviceSinkAPI; class Preset; class SDRBASE_API DeviceAPI : public QObject { @@ -102,19 +100,19 @@ public: void configureCorrections(bool dcOffsetCorrection, bool iqImbalanceCorrection, int streamIndex = 0); //!< Configure current device engine DSP corrections (Rx) void setHardwareId(const QString& id); - void setSamplingDeviceId(const QString& id); + void setSamplingDeviceId(const QString& id) { m_samplingDeviceId = id; } // void setSampleSourceId(const QString& id); // void setSampleSinkId(const QString& id); - void resetSamplingDeviceId(); + void resetSamplingDeviceId() { m_samplingDeviceId.clear(); } // void resetSampleSourceId(); // void resetSampleSinkId(); - void setSamplingDeviceSerial(const QString& serial); + void setSamplingDeviceSerial(const QString& serial) { m_samplingDeviceSerial = serial; } // void setSampleSourceSerial(const QString& serial); // void setSampleSinkSerial(const QString& serial); - void setSamplingDeviceDisplayName(const QString& name); + void setSamplingDeviceDisplayName(const QString& name) { m_samplingDeviceDisplayName = name; } // void setSampleSourceDisplayName(const QString& serial); // void setSampleSinkDisplayName(const QString& serial); - void setSamplingDeviceSequence(int sequence); + void setSamplingDeviceSequence(int sequence) { m_samplingDeviceSequence = sequence; } // void setSampleSourceSequence(int sequence); // void setSampleSinkSequence(int sequence); void setNbItems(uint32_t nbItems); @@ -127,17 +125,16 @@ public: // void setSampleSinkPluginInstanceUI(PluginInstanceGUI *gui); const QString& getHardwareId() const { return m_hardwareId; } - const QString& getSamplingDeviceId() const { return m_sampleSourceId; } + const QString& getSamplingDeviceId() const { return m_samplingDeviceId; } // const QString& getSampleSourceId() const { return m_sampleSourceId; } // const QString& getSampleSinkId() const { return m_sampleSinkId; } - const QString& getSamplingDeviceSerial() const { return m_sampleSourceSerial; } + const QString& getSamplingDeviceSerial() const { return m_samplingDeviceSerial; } // const QString& getSampleSourceSerial() const { return m_sampleSourceSerial; } // const QString& getSampleSinkSerial() const { return m_sampleSinkSerial; } - const QString& getSamplingDeviceDisplayName() const { return m_sampleSourceDisplayName; } + const QString& getSamplingDeviceDisplayName() const { return m_samplingDeviceDisplayName; } // const QString& getSampleSourceDisplayName() const { return m_sampleSourceDisplayName; } // const QString& getSampleSinkDisplayName() const { return m_sampleSinkDisplayName; } - - uint32_t getSamplingDeviceSequence() const { return m_sampleSourceSequence; } + uint32_t getSamplingDeviceSequence() const { return m_samplingDeviceSequence; } // uint32_t getSampleSourceSequence() const { return m_sampleSourceSequence; } // uint32_t getSampleSinkSequence() const { return m_sampleSinkSequence; } @@ -146,7 +143,7 @@ public: int getDeviceSetIndex() const { return m_deviceTabIndex; } PluginInterface *getPluginInterface() { return m_pluginInterface; } - PluginInstanceGUI *getSamplingDevicePluginInstanceGUI() { return m_sampleSourcePluginInstanceUI; } + PluginInstanceGUI *getSamplingDevicePluginInstanceGUI() { return m_samplingDevicePluginInstanceUI; } // PluginInstanceGUI *getSampleSourcePluginInstanceGUI() { return m_sampleSourcePluginInstanceUI; } // PluginInstanceGUI *getSampleSinkPluginInstanceGUI() { return m_sampleSinkPluginInstanceUI; } @@ -186,12 +183,17 @@ protected: // common StreamType m_streamType; - int m_deviceTabIndex; //!< This is the tab index in the GUI and also the device set index - QString m_hardwareId; //!< The internal id that identifies the type of hardware (i.e. HackRF, BladeRF, ...) - uint32_t m_nbItems; //!< Number of items or streams in the device. Can be >1 for NxM devices (i.e. 2 for LimeSDR) - uint32_t m_itemIndex; //!< The Rx stream index. Can be >0 for NxM devices (i.e. 0 or 1 for LimeSDR) + int m_deviceTabIndex; //!< This is the tab index in the GUI and also the device set index + QString m_hardwareId; //!< The internal id that identifies the type of hardware (i.e. HackRF, BladeRF, ...) + uint32_t m_nbItems; //!< Number of items or streams in the device. Can be >1 for NxM devices (i.e. 2 for LimeSDR) + uint32_t m_itemIndex; //!< The Rx stream index. Can be >0 for NxM devices (i.e. 0 or 1 for LimeSDR) PluginInterface* m_pluginInterface; - const QTimer& m_masterTimer; //!< This is the DSPEngine master timer + const QTimer& m_masterTimer; //!< This is the DSPEngine master timer + QString m_samplingDeviceId; //!< The internal plugin ID corresponding to the device (i.e. for HackRF input, for HackRF output ...) + QString m_samplingDeviceSerial; //!< The device serial number defined by the vendor or a fake one (SDRplay) + QString m_samplingDeviceDisplayName; //!< The human readable name identifying this instance + uint32_t m_samplingDeviceSequence; //!< The device sequence. >0 when more than one device of the same type is connected + PluginInstanceGUI* m_samplingDevicePluginInstanceUI; // Buddies (single Rx or single Tx) @@ -203,30 +205,13 @@ protected: // Single Rx (i.e. source) DSPDeviceSourceEngine *m_deviceSourceEngine; - QString m_sampleSourceId; //!< The internal plugin ID corresponding to the device (i.e. for HackRF input, for HackRF output ...) - QString m_sampleSourceSerial; //!< The device serial number defined by the vendor or a fake one (SDRplay) - QString m_sampleSourceDisplayName; //!< The human readable name identifying this instance - uint32_t m_sampleSourceSequence; //!< The device sequence. >0 when more than one device of the same type is connected - PluginInstanceGUI* m_sampleSourcePluginInstanceUI; // TODO: factorize - QList m_channelSinkAPIs; // Single Tx (i.e. sink) DSPDeviceSinkEngine *m_deviceSinkEngine; - QString m_sampleSinkId; //!< The internal plugin ID corresponding to the device (i.e. for HackRF input, for HackRF output ...) - QString m_sampleSinkSerial; //!< The device serial number defined by the vendor - QString m_sampleSinkDisplayName; //!< The human readable name identifying this instance - uint32_t m_sampleSinkSequence; //!< The device sequence. >0 when more than one device of the same type is connected - PluginInstanceGUI* m_sampleSinkPluginInstanceUI; // TODO: factorize - QList m_channelSourceAPIs; - // Friends - - friend class DeviceSinkAPI; - friend class DeviceSourceAPI; - private: void renumerateChannels(); }; diff --git a/sdrbase/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h index 966e0c0e5..ea94e5a11 100644 --- a/sdrbase/plugin/plugininterface.h +++ b/sdrbase/plugin/plugininterface.h @@ -17,9 +17,8 @@ struct SDRBASE_API PluginDescriptor { }; class PluginAPI; -class DeviceSourceAPI; +class DeviceAPI; class DeviceUISet; -class DeviceSinkAPI; class PluginInstanceGUI; class QWidget; class DeviceSampleSource; @@ -97,14 +96,14 @@ public: } virtual BasebandSampleSink* createRxChannelBS( - DeviceSourceAPI *deviceAPI) + DeviceAPI *deviceAPI) { (void) deviceAPI; return nullptr; } virtual ChannelSinkAPI* createRxChannelCS( - DeviceSourceAPI *deviceAPI) + DeviceAPI *deviceAPI) { (void) deviceAPI; return nullptr; @@ -122,14 +121,14 @@ public: } virtual BasebandSampleSource* createTxChannelBS( - DeviceSinkAPI *deviceAPI) + DeviceAPI *deviceAPI) { (void) deviceAPI; return nullptr; } virtual ChannelSourceAPI* createTxChannelCS( - DeviceSinkAPI *deviceAPI) + DeviceAPI *deviceAPI) { (void) deviceAPI; return nullptr; @@ -152,7 +151,7 @@ public: virtual DeviceSampleSource* createSampleSourcePluginInstanceInput( // creates the input "core" const QString& sourceId, - DeviceSourceAPI *deviceAPI) + DeviceAPI *deviceAPI) { (void) sourceId; (void) deviceAPI; @@ -178,7 +177,7 @@ public: virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput( // creates the output "core" const QString& sinkId, - DeviceSinkAPI *deviceAPI) + DeviceAPI *deviceAPI) { (void) sinkId; (void) deviceAPI; diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp index 4433bc70f..616efffe8 100644 --- a/sdrbase/plugin/pluginmanager.cpp +++ b/sdrbase/plugin/pluginmanager.cpp @@ -194,7 +194,7 @@ void PluginManager::listRxChannels(QList& list) } } -void PluginManager::createRxChannelInstance(int channelPluginIndex, DeviceUISet *deviceUISet, DeviceSourceAPI *deviceAPI) +void PluginManager::createRxChannelInstance(int channelPluginIndex, DeviceUISet *deviceUISet, DeviceAPI *deviceAPI) { if (channelPluginIndex < m_rxChannelRegistrations.size()) { @@ -204,7 +204,7 @@ void PluginManager::createRxChannelInstance(int channelPluginIndex, DeviceUISet } } -void PluginManager::createTxChannelInstance(int channelPluginIndex, DeviceUISet *deviceUISet, DeviceSinkAPI *deviceAPI) +void PluginManager::createTxChannelInstance(int channelPluginIndex, DeviceUISet *deviceUISet, DeviceAPI *deviceAPI) { if (channelPluginIndex < m_txChannelRegistrations.size()) { diff --git a/sdrbase/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h index 08e957e6e..a93839d03 100644 --- a/sdrbase/plugin/pluginmanager.h +++ b/sdrbase/plugin/pluginmanager.h @@ -16,8 +16,7 @@ class QPluginLoader; class Preset; class Message; class MessageQueue; -class DeviceSourceAPI; -class DeviceSinkAPI; +class DeviceAPI; class SDRBASE_API PluginManager : public QObject { Q_OBJECT @@ -58,10 +57,10 @@ public: PluginAPI::ChannelRegistrations *getRxChannelRegistrations() { return &m_rxChannelRegistrations; } PluginAPI::ChannelRegistrations *getTxChannelRegistrations() { return &m_txChannelRegistrations; } - void createRxChannelInstance(int channelPluginIndex, DeviceUISet *deviceUISet, DeviceSourceAPI *deviceAPI); + void createRxChannelInstance(int channelPluginIndex, DeviceUISet *deviceUISet, DeviceAPI *deviceAPI); void listRxChannels(QList& list); - void createTxChannelInstance(int channelPluginIndex, DeviceUISet *deviceUISet, DeviceSinkAPI *deviceAPI); + void createTxChannelInstance(int channelPluginIndex, DeviceUISet *deviceUISet, DeviceAPI *deviceAPI); void listTxChannels(QList& list); static const QString& getFileSourceDeviceId() { return m_fileSourceDeviceTypeID; } diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp index 359feb5f5..1bd9dc20f 100644 --- a/sdrgui/device/deviceuiset.cpp +++ b/sdrgui/device/deviceuiset.cpp @@ -47,9 +47,8 @@ DeviceUISet::DeviceUISet(int tabIndex, bool rxElseTx, QTimer& timer) m_channelWindow = new ChannelWindow; m_samplingDeviceControl = new SamplingDeviceControl(tabIndex, rxElseTx); m_deviceSourceEngine = 0; - m_deviceSourceAPI = 0; + m_deviceAPI = 0; m_deviceSinkEngine = 0; - m_deviceSinkAPI = 0; m_deviceTabIndex = tabIndex; // m_spectrum needs to have its font to be set since it cannot be inherited from the main window @@ -199,7 +198,7 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA qPrintable((*channelRegistrations)[i].m_channelIdURI), qPrintable(channelConfig.m_channelIdURI)); BasebandSampleSink *rxChannel = - (*channelRegistrations)[i].m_plugin->createRxChannelBS(m_deviceSourceAPI); + (*channelRegistrations)[i].m_plugin->createRxChannelBS(m_deviceAPI); PluginInstanceGUI *rxChannelGUI = (*channelRegistrations)[i].m_plugin->createRxChannelGUI(this, rxChannel); reg = ChannelInstanceRegistration(channelConfig.m_channelIdURI, rxChannelGUI); @@ -280,7 +279,7 @@ void DeviceUISet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginA qPrintable((*channelRegistrations)[i].m_channelIdURI), qPrintable(channelConfig.m_channelIdURI)); BasebandSampleSource *txChannel = - (*channelRegistrations)[i].m_plugin->createTxChannelBS(m_deviceSinkAPI); + (*channelRegistrations)[i].m_plugin->createTxChannelBS(m_deviceAPI); PluginInstanceGUI *txChannelGUI = (*channelRegistrations)[i].m_plugin->createTxChannelGUI(this, txChannel); reg = ChannelInstanceRegistration(channelConfig.m_channelIdURI, txChannelGUI); diff --git a/sdrgui/device/deviceuiset.h b/sdrgui/device/deviceuiset.h index 90349fe15..b1a7bff23 100644 --- a/sdrgui/device/deviceuiset.h +++ b/sdrgui/device/deviceuiset.h @@ -29,9 +29,8 @@ class GLSpectrumGUI; class ChannelWindow; class SamplingDeviceControl; class DSPDeviceSourceEngine; -class DeviceSourceAPI; +class DeviceAPI; class DSPDeviceSinkEngine; -class DeviceSinkAPI; class ChannelMarker; class PluginAPI; @@ -44,9 +43,8 @@ public: ChannelWindow *m_channelWindow; SamplingDeviceControl *m_samplingDeviceControl; DSPDeviceSourceEngine *m_deviceSourceEngine; - DeviceSourceAPI *m_deviceSourceAPI; + DeviceAPI *m_deviceAPI; DSPDeviceSinkEngine *m_deviceSinkEngine; - DeviceSinkAPI *m_deviceSinkAPI; QByteArray m_mainWindowState; DeviceUISet(int tabIndex, bool rxElseTx, QTimer& timer); diff --git a/sdrgui/gui/samplingdevicecontrol.h b/sdrgui/gui/samplingdevicecontrol.h index 4e2def754..46f767f85 100644 --- a/sdrgui/gui/samplingdevicecontrol.h +++ b/sdrgui/gui/samplingdevicecontrol.h @@ -31,8 +31,6 @@ namespace Ui { class ChannelMarker; class PluginManager; -class DeviceSourceAPI; -class DeviceSinkAPI; class SDRGUI_API SamplingDeviceControl : public QWidget { Q_OBJECT diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 299ce1e90..759e66c1f 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -32,8 +32,7 @@ #include #include -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "device/deviceenumerator.h" #include "gui/indicator.h" @@ -55,6 +54,8 @@ #include "dsp/dspcommands.h" #include "dsp/devicesamplesource.h" #include "dsp/devicesamplesink.h" +#include "dsp/dspdevicesourceengine.h" +#include "dsp/dspdevicesinkengine.h" #include "plugin/pluginapi.h" #include "gui/glspectrum.h" #include "gui/glspectrumgui.h" @@ -91,7 +92,7 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse m_settings(), m_masterTabIndex(0), m_dspEngine(DSPEngine::instance()), - m_lastEngineState(DSPDeviceSourceEngine::StNotStarted), + m_lastEngineState(DeviceAPI::StNotStarted), m_inputGUI(0), m_sampleRate(0), m_centerFrequency(0), @@ -178,7 +179,7 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse int deviceIndex = DeviceEnumerator::instance()->getRxSamplingDeviceIndex(m_settings.getSourceDeviceId(), m_settings.getSourceIndex()); addSourceDevice(deviceIndex); // add the first device set with file source device as default if device in settings is not enumerated - m_deviceUIs.back()->m_deviceSourceAPI->setBuddyLeader(true); // the first device is always the leader + m_deviceUIs.back()->m_deviceAPI->setBuddyLeader(true); // the first device is always the leader qDebug() << "MainWindow::MainWindow: load current preset settings..."; @@ -251,9 +252,9 @@ void MainWindow::addSourceDevice(int deviceIndex) char tabNameCStr[16]; sprintf(tabNameCStr, "R%d", deviceTabIndex); - DeviceSourceAPI *deviceSourceAPI = new DeviceSourceAPI(deviceTabIndex, dspDeviceSourceEngine); + DeviceAPI *deviceAPI = new DeviceAPI(DeviceAPI::StreamSingleRx, deviceTabIndex, dspDeviceSourceEngine, nullptr); - m_deviceUIs.back()->m_deviceSourceAPI = deviceSourceAPI; + m_deviceUIs.back()->m_deviceAPI = deviceAPI; m_deviceUIs.back()->m_samplingDeviceControl->setPluginManager(m_pluginManager); QList channelNames; m_pluginManager->listRxChannels(channelNames); @@ -278,34 +279,34 @@ void MainWindow::addSourceDevice(int deviceIndex) } PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceIndex); - m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceSequence(samplingDevice.sequence); - m_deviceUIs.back()->m_deviceSourceAPI->setNbItems(samplingDevice.deviceNbItems); - m_deviceUIs.back()->m_deviceSourceAPI->setItemIndex(samplingDevice.deviceItemIndex); - m_deviceUIs.back()->m_deviceSourceAPI->setHardwareId(samplingDevice.hardwareId); - m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceId(samplingDevice.id); - m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceSerial(samplingDevice.serial); - m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceDisplayName(samplingDevice.displayedName); - m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourcePluginInterface(DeviceEnumerator::instance()->getRxPluginInterface(deviceIndex)); + m_deviceUIs.back()->m_deviceAPI->setSamplingDeviceSequence(samplingDevice.sequence); + m_deviceUIs.back()->m_deviceAPI->setNbItems(samplingDevice.deviceNbItems); + m_deviceUIs.back()->m_deviceAPI->setItemIndex(samplingDevice.deviceItemIndex); + m_deviceUIs.back()->m_deviceAPI->setHardwareId(samplingDevice.hardwareId); + m_deviceUIs.back()->m_deviceAPI->setSamplingDeviceId(samplingDevice.id); + m_deviceUIs.back()->m_deviceAPI->setSamplingDeviceSerial(samplingDevice.serial); + m_deviceUIs.back()->m_deviceAPI->setSamplingDeviceDisplayName(samplingDevice.displayedName); + m_deviceUIs.back()->m_deviceAPI->setSamplingDevicePluginInterface(DeviceEnumerator::instance()->getRxPluginInterface(deviceIndex)); m_deviceUIs.back()->m_samplingDeviceControl->setSelectedDeviceIndex(deviceIndex); // delete previous plugin GUI - m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( - m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourcePluginInstanceGUI()); + m_deviceUIs.back()->m_deviceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( + m_deviceUIs.back()->m_deviceAPI->getSamplingDevicePluginInstanceGUI()); - DeviceSampleSource *source = m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceInput( - m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceId(), m_deviceUIs.back()->m_deviceSourceAPI); - m_deviceUIs.back()->m_deviceSourceAPI->setSampleSource(source); + DeviceSampleSource *source = m_deviceUIs.back()->m_deviceAPI->getPluginInterface()->createSampleSourcePluginInstanceInput( + m_deviceUIs.back()->m_deviceAPI->getSamplingDeviceId(), m_deviceUIs.back()->m_deviceAPI); + m_deviceUIs.back()->m_deviceAPI->setSampleSource(source); QWidget *gui; - PluginInstanceGUI *pluginGUI = m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceGUI( - m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceId(), + PluginInstanceGUI *pluginGUI = m_deviceUIs.back()->m_deviceAPI->getPluginInterface()->createSampleSourcePluginInstanceGUI( + m_deviceUIs.back()->m_deviceAPI->getSamplingDeviceId(), &gui, m_deviceUIs.back()); - m_deviceUIs.back()->m_deviceSourceAPI->getSampleSource()->setMessageQueueToGUI(pluginGUI->getInputMessageQueue()); - m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourcePluginInstanceGUI(pluginGUI); - m_deviceUIs.back()->m_deviceSourceAPI->getSampleSource()->init(); - setDeviceGUI(deviceTabIndex, gui, m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceDisplayName()); + m_deviceUIs.back()->m_deviceAPI->getSampleSource()->setMessageQueueToGUI(pluginGUI->getInputMessageQueue()); + m_deviceUIs.back()->m_deviceAPI->setSamplingDevicePluginInstanceGUI(pluginGUI); + m_deviceUIs.back()->m_deviceAPI->getSampleSource()->init(); + setDeviceGUI(deviceTabIndex, gui, m_deviceUIs.back()->m_deviceAPI->getSamplingDeviceDisplayName()); } void MainWindow::addSinkDevice() @@ -325,10 +326,9 @@ void MainWindow::addSinkDevice() char tabNameCStr[16]; sprintf(tabNameCStr, "T%d", deviceTabIndex); - DeviceSinkAPI *deviceSinkAPI = new DeviceSinkAPI(deviceTabIndex, dspDeviceSinkEngine); + DeviceAPI *deviceAPI = new DeviceAPI(DeviceAPI::StreamSingleTx, deviceTabIndex, nullptr, dspDeviceSinkEngine); - m_deviceUIs.back()->m_deviceSourceAPI = 0; - m_deviceUIs.back()->m_deviceSinkAPI = deviceSinkAPI; + m_deviceUIs.back()->m_deviceAPI = deviceAPI; m_deviceUIs.back()->m_samplingDeviceControl->setPluginManager(m_pluginManager); QList channelNames; m_pluginManager->listTxChannels(channelNames); @@ -350,33 +350,33 @@ void MainWindow::addSinkDevice() // create a file sink by default int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileSinkDeviceIndex(); PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex); - m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkSequence(samplingDevice.sequence); - m_deviceUIs.back()->m_deviceSinkAPI->setNbItems(samplingDevice.deviceNbItems); - m_deviceUIs.back()->m_deviceSinkAPI->setItemIndex(samplingDevice.deviceItemIndex); - m_deviceUIs.back()->m_deviceSinkAPI->setHardwareId(samplingDevice.hardwareId); - m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkId(samplingDevice.id); - m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkSerial(samplingDevice.serial); - m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkDisplayName(samplingDevice.displayedName); - m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkPluginInterface(DeviceEnumerator::instance()->getTxPluginInterface(fileSinkDeviceIndex)); + m_deviceUIs.back()->m_deviceAPI->setSamplingDeviceSequence(samplingDevice.sequence); + m_deviceUIs.back()->m_deviceAPI->setNbItems(samplingDevice.deviceNbItems); + m_deviceUIs.back()->m_deviceAPI->setItemIndex(samplingDevice.deviceItemIndex); + m_deviceUIs.back()->m_deviceAPI->setHardwareId(samplingDevice.hardwareId); + m_deviceUIs.back()->m_deviceAPI->setSamplingDeviceId(samplingDevice.id); + m_deviceUIs.back()->m_deviceAPI->setSamplingDeviceSerial(samplingDevice.serial); + m_deviceUIs.back()->m_deviceAPI->setSamplingDeviceDisplayName(samplingDevice.displayedName); + m_deviceUIs.back()->m_deviceAPI->setSamplingDevicePluginInterface(DeviceEnumerator::instance()->getTxPluginInterface(fileSinkDeviceIndex)); m_deviceUIs.back()->m_samplingDeviceControl->setSelectedDeviceIndex(fileSinkDeviceIndex); // delete previous plugin GUI if it exists - m_deviceUIs.back()->m_deviceSinkAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( - m_deviceUIs.back()->m_deviceSinkAPI->getSampleSinkPluginInstanceGUI()); + m_deviceUIs.back()->m_deviceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( + m_deviceUIs.back()->m_deviceAPI->getSamplingDevicePluginInstanceGUI()); - DeviceSampleSink *sink = m_deviceUIs.back()->m_deviceSinkAPI->getPluginInterface()->createSampleSinkPluginInstanceOutput( - m_deviceUIs.back()->m_deviceSinkAPI->getSampleSinkId(), m_deviceUIs.back()->m_deviceSinkAPI); - m_deviceUIs.back()->m_deviceSinkAPI->setSampleSink(sink); + DeviceSampleSink *sink = m_deviceUIs.back()->m_deviceAPI->getPluginInterface()->createSampleSinkPluginInstanceOutput( + m_deviceUIs.back()->m_deviceAPI->getSamplingDeviceId(), m_deviceUIs.back()->m_deviceAPI); + m_deviceUIs.back()->m_deviceAPI->setSampleSink(sink); QWidget *gui; - PluginInstanceGUI *pluginUI = m_deviceUIs.back()->m_deviceSinkAPI->getPluginInterface()->createSampleSinkPluginInstanceGUI( - m_deviceUIs.back()->m_deviceSinkAPI->getSampleSinkId(), + PluginInstanceGUI *pluginUI = m_deviceUIs.back()->m_deviceAPI->getPluginInterface()->createSampleSinkPluginInstanceGUI( + m_deviceUIs.back()->m_deviceAPI->getSamplingDeviceId(), &gui, m_deviceUIs.back()); - m_deviceUIs.back()->m_deviceSinkAPI->getSampleSink()->setMessageQueueToGUI(pluginUI->getInputMessageQueue()); - m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkPluginInstanceUI(pluginUI); - m_deviceUIs.back()->m_deviceSinkAPI->getSampleSink()->init(); - setDeviceGUI(deviceTabIndex, gui, m_deviceUIs.back()->m_deviceSinkAPI->getSampleSinkDisplayName(), false); + m_deviceUIs.back()->m_deviceAPI->getSampleSink()->setMessageQueueToGUI(pluginUI->getInputMessageQueue()); + m_deviceUIs.back()->m_deviceAPI->setSamplingDevicePluginInstanceGUI(pluginUI); + m_deviceUIs.back()->m_deviceAPI->getSampleSink()->init(); + setDeviceGUI(deviceTabIndex, gui, m_deviceUIs.back()->m_deviceAPI->getSamplingDeviceDisplayName(), false); } void MainWindow::removeLastDevice() @@ -392,13 +392,13 @@ void MainWindow::removeLastDevice() // deletes old UI and input object m_deviceUIs.back()->freeRxChannels(); // destroys the channel instances - m_deviceUIs.back()->m_deviceSourceAPI->getSampleSource()->setMessageQueueToGUI(0); // have source stop sending messages to the GUI - m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( - m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourcePluginInstanceGUI()); - m_deviceUIs.back()->m_deviceSourceAPI->resetSampleSourceId(); - m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceInput( - m_deviceUIs.back()->m_deviceSourceAPI->getSampleSource()); - m_deviceUIs.back()->m_deviceSourceAPI->clearBuddiesLists(); // clear old API buddies lists + m_deviceUIs.back()->m_deviceAPI->getSampleSource()->setMessageQueueToGUI(0); // have source stop sending messages to the GUI + m_deviceUIs.back()->m_deviceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( + m_deviceUIs.back()->m_deviceAPI->getSamplingDevicePluginInstanceGUI()); + m_deviceUIs.back()->m_deviceAPI->resetSamplingDeviceId(); + m_deviceUIs.back()->m_deviceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceInput( + m_deviceUIs.back()->m_deviceAPI->getSampleSource()); + m_deviceUIs.back()->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists m_deviceUIs.back()->m_samplingDeviceControl->removeSelectedDeviceIndex(); // This releases the device in the device list ui->tabChannels->removeTab(ui->tabChannels->count() - 1); @@ -415,7 +415,7 @@ void MainWindow::removeLastDevice() ui->tabInputsView->setTabToolTip(i, m_deviceWidgetTabs[i].displayName); } - DeviceSourceAPI *sourceAPI = m_deviceUIs.back()->m_deviceSourceAPI; + DeviceAPI *sourceAPI = m_deviceUIs.back()->m_deviceAPI; delete m_deviceUIs.back(); lastDeviceEngine->stop(); @@ -434,13 +434,13 @@ void MainWindow::removeLastDevice() // deletes old UI and output object m_deviceUIs.back()->freeTxChannels(); - m_deviceUIs.back()->m_deviceSinkAPI->getSampleSink()->setMessageQueueToGUI(0); // have sink stop sending messages to the GUI - m_deviceUIs.back()->m_deviceSinkAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( - m_deviceUIs.back()->m_deviceSinkAPI->getSampleSinkPluginInstanceGUI()); - m_deviceUIs.back()->m_deviceSinkAPI->resetSampleSinkId(); - m_deviceUIs.back()->m_deviceSinkAPI->getPluginInterface()->deleteSampleSinkPluginInstanceOutput( - m_deviceUIs.back()->m_deviceSinkAPI->getSampleSink()); - m_deviceUIs.back()->m_deviceSinkAPI->clearBuddiesLists(); // clear old API buddies lists + m_deviceUIs.back()->m_deviceAPI->getSampleSink()->setMessageQueueToGUI(0); // have sink stop sending messages to the GUI + m_deviceUIs.back()->m_deviceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( + m_deviceUIs.back()->m_deviceAPI->getSamplingDevicePluginInstanceGUI()); + m_deviceUIs.back()->m_deviceAPI->resetSamplingDeviceId(); + m_deviceUIs.back()->m_deviceAPI->getPluginInterface()->deleteSampleSinkPluginInstanceOutput( + m_deviceUIs.back()->m_deviceAPI->getSampleSink()); + m_deviceUIs.back()->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists m_deviceUIs.back()->m_samplingDeviceControl->removeSelectedDeviceIndex(); // This releases the device in the device list ui->tabChannels->removeTab(ui->tabChannels->count() - 1); @@ -457,7 +457,7 @@ void MainWindow::removeLastDevice() ui->tabInputsView->setTabToolTip(i, m_deviceWidgetTabs[i].displayName); } - DeviceSinkAPI *sinkAPI = m_deviceUIs.back()->m_deviceSinkAPI; + DeviceAPI *sinkAPI = m_deviceUIs.back()->m_deviceAPI; delete m_deviceUIs.back(); lastDeviceEngine->stop(); @@ -579,13 +579,13 @@ void MainWindow::loadPresetSettings(const Preset* preset, int tabIndex) if (deviceUI->m_deviceSourceEngine) // source device { deviceUI->m_spectrumGUI->deserialize(preset->getSpectrumConfig()); - deviceUI->m_deviceSourceAPI->loadSourceSettings(preset); + deviceUI->m_deviceAPI->loadSamplingDeviceSettings(preset); deviceUI->loadRxChannelSettings(preset, m_pluginManager->getPluginAPI()); } else if (deviceUI->m_deviceSinkEngine) // sink device { deviceUI->m_spectrumGUI->deserialize(preset->getSpectrumConfig()); - deviceUI->m_deviceSinkAPI->loadSinkSettings(preset); + deviceUI->m_deviceAPI->loadSamplingDeviceSettings(preset); deviceUI->loadTxChannelSettings(preset, m_pluginManager->getPluginAPI()); } } @@ -611,7 +611,7 @@ void MainWindow::savePresetSettings(Preset* preset, int tabIndex) preset->setSpectrumConfig(deviceUI->m_spectrumGUI->serialize()); preset->clearChannels(); deviceUI->saveRxChannelSettings(preset); - deviceUI->m_deviceSourceAPI->saveSourceSettings(preset); + deviceUI->m_deviceAPI->saveSamplingDeviceSettings(preset); } else if (deviceUI->m_deviceSinkEngine) // sink device { @@ -619,7 +619,7 @@ void MainWindow::savePresetSettings(Preset* preset, int tabIndex) preset->clearChannels(); preset->setSourcePreset(false); deviceUI->saveTxChannelSettings(preset); - deviceUI->m_deviceSinkAPI->saveSinkSettings(preset); + deviceUI->m_deviceAPI->saveSamplingDeviceSettings(preset); } preset->setLayout(saveState()); @@ -1494,27 +1494,28 @@ void MainWindow::sampleSourceChanged() { qDebug("MainWindow::sampleSourceChanged: tab at %d", currentSourceTabIndex); DeviceUISet *deviceUI = m_deviceUIs[currentSourceTabIndex]; - deviceUI->m_deviceSourceAPI->saveSourceSettings(m_settings.getWorkingPreset()); // save old API settings - deviceUI->m_deviceSourceAPI->stopAcquisition(); + deviceUI->m_deviceAPI->saveSamplingDeviceSettings(m_settings.getWorkingPreset()); // save old API settings + deviceUI->m_deviceAPI->stopDeviceEngine(); // deletes old UI and input object - deviceUI->m_deviceSourceAPI->getSampleSource()->setMessageQueueToGUI(0); // have source stop sending messages to the GUI - deviceUI->m_deviceSourceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( - deviceUI->m_deviceSourceAPI->getSampleSourcePluginInstanceGUI()); - deviceUI->m_deviceSourceAPI->resetSampleSourceId(); - deviceUI->m_deviceSourceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceInput( - deviceUI->m_deviceSourceAPI->getSampleSource()); - deviceUI->m_deviceSourceAPI->clearBuddiesLists(); // clear old API buddies lists + deviceUI->m_deviceAPI->getSampleSource()->setMessageQueueToGUI(0); // have source stop sending messages to the GUI + deviceUI->m_deviceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( + deviceUI->m_deviceAPI->getSamplingDevicePluginInstanceGUI()); + deviceUI->m_deviceAPI->resetSamplingDeviceId(); + deviceUI->m_deviceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceInput( + deviceUI->m_deviceAPI->getSampleSource()); + deviceUI->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists - PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceUI->m_samplingDeviceControl->getSelectedDeviceIndex()); - deviceUI->m_deviceSourceAPI->setSampleSourceSequence(samplingDevice.sequence); - deviceUI->m_deviceSourceAPI->setNbItems(samplingDevice.deviceNbItems); - deviceUI->m_deviceSourceAPI->setItemIndex(samplingDevice.deviceItemIndex); - deviceUI->m_deviceSourceAPI->setHardwareId(samplingDevice.hardwareId); - deviceUI->m_deviceSourceAPI->setSampleSourceId(samplingDevice.id); - deviceUI->m_deviceSourceAPI->setSampleSourceSerial(samplingDevice.serial); - deviceUI->m_deviceSourceAPI->setSampleSourceDisplayName(samplingDevice.displayedName); - deviceUI->m_deviceSourceAPI->setSampleSourcePluginInterface(DeviceEnumerator::instance()->getRxPluginInterface(deviceUI->m_samplingDeviceControl->getSelectedDeviceIndex())); + PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice( + deviceUI->m_samplingDeviceControl->getSelectedDeviceIndex()); + deviceUI->m_deviceAPI->setSamplingDeviceSequence(samplingDevice.sequence); + deviceUI->m_deviceAPI->setNbItems(samplingDevice.deviceNbItems); + deviceUI->m_deviceAPI->setItemIndex(samplingDevice.deviceItemIndex); + deviceUI->m_deviceAPI->setHardwareId(samplingDevice.hardwareId); + deviceUI->m_deviceAPI->setSamplingDeviceId(samplingDevice.id); + deviceUI->m_deviceAPI->setSamplingDeviceSerial(samplingDevice.serial); + deviceUI->m_deviceAPI->setSamplingDeviceDisplayName(samplingDevice.displayedName); + deviceUI->m_deviceAPI->setSamplingDevicePluginInterface(DeviceEnumerator::instance()->getRxPluginInterface(deviceUI->m_samplingDeviceControl->getSelectedDeviceIndex())); // add to buddies list std::vector::iterator it = m_deviceUIs.begin(); @@ -1526,20 +1527,20 @@ void MainWindow::sampleSourceChanged() { if ((*it)->m_deviceSourceEngine) // it is a source device { - if ((deviceUI->m_deviceSourceAPI->getHardwareId() == (*it)->m_deviceSourceAPI->getHardwareId()) && - (deviceUI->m_deviceSourceAPI->getSampleSourceSerial() == (*it)->m_deviceSourceAPI->getSampleSourceSerial())) + if ((deviceUI->m_deviceAPI->getHardwareId() == (*it)->m_deviceAPI->getHardwareId()) && + (deviceUI->m_deviceAPI->getSamplingDeviceSerial() == (*it)->m_deviceAPI->getSamplingDeviceSerial())) { - (*it)->m_deviceSourceAPI->addSourceBuddy(deviceUI->m_deviceSourceAPI); + (*it)->m_deviceAPI->addSourceBuddy(deviceUI->m_deviceAPI); nbOfBuddies++; } } if ((*it)->m_deviceSinkEngine) // it is a sink device { - if ((deviceUI->m_deviceSourceAPI->getHardwareId() == (*it)->m_deviceSinkAPI->getHardwareId()) && - (deviceUI->m_deviceSourceAPI->getSampleSourceSerial() == (*it)->m_deviceSinkAPI->getSampleSinkSerial())) + if ((deviceUI->m_deviceAPI->getHardwareId() == (*it)->m_deviceAPI->getHardwareId()) && + (deviceUI->m_deviceAPI->getSamplingDeviceSerial() == (*it)->m_deviceAPI->getSamplingDeviceSerial())) { - (*it)->m_deviceSinkAPI->addSourceBuddy(deviceUI->m_deviceSourceAPI); + (*it)->m_deviceAPI->addSourceBuddy(deviceUI->m_deviceAPI); nbOfBuddies++; } } @@ -1547,24 +1548,24 @@ void MainWindow::sampleSourceChanged() } if (nbOfBuddies == 0) { - deviceUI->m_deviceSourceAPI->setBuddyLeader(true); + deviceUI->m_deviceAPI->setBuddyLeader(true); } // constructs new GUI and input object - DeviceSampleSource *source = deviceUI->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceInput( - deviceUI->m_deviceSourceAPI->getSampleSourceId(), deviceUI->m_deviceSourceAPI); - deviceUI->m_deviceSourceAPI->setSampleSource(source); + DeviceSampleSource *source = deviceUI->m_deviceAPI->getPluginInterface()->createSampleSourcePluginInstanceInput( + deviceUI->m_deviceAPI->getSamplingDeviceId(), deviceUI->m_deviceAPI); + deviceUI->m_deviceAPI->setSampleSource(source); QWidget *gui; - PluginInstanceGUI *pluginUI = deviceUI->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceGUI( - deviceUI->m_deviceSourceAPI->getSampleSourceId(), + PluginInstanceGUI *pluginUI = deviceUI->m_deviceAPI->getPluginInterface()->createSampleSourcePluginInstanceGUI( + deviceUI->m_deviceAPI->getSamplingDeviceId(), &gui, deviceUI); - deviceUI->m_deviceSourceAPI->getSampleSource()->setMessageQueueToGUI(pluginUI->getInputMessageQueue()); - deviceUI->m_deviceSourceAPI->setSampleSourcePluginInstanceGUI(pluginUI); - setDeviceGUI(currentSourceTabIndex, gui, deviceUI->m_deviceSourceAPI->getSampleSourceDisplayName()); - deviceUI->m_deviceSourceAPI->getSampleSource()->init(); + deviceUI->m_deviceAPI->getSampleSource()->setMessageQueueToGUI(pluginUI->getInputMessageQueue()); + deviceUI->m_deviceAPI->setSamplingDevicePluginInstanceGUI(pluginUI); + setDeviceGUI(currentSourceTabIndex, gui, deviceUI->m_deviceAPI->getSamplingDeviceDisplayName()); + deviceUI->m_deviceAPI->getSampleSource()->init(); - deviceUI->m_deviceSourceAPI->loadSourceSettings(m_settings.getWorkingPreset()); // load new API settings + deviceUI->m_deviceAPI->loadSamplingDeviceSettings(m_settings.getWorkingPreset()); // load new API settings if (currentSourceTabIndex == 0) // save as default starting device { @@ -1583,27 +1584,27 @@ void MainWindow::sampleSinkChanged() { qDebug("MainWindow::sampleSinkChanged: tab at %d", currentSinkTabIndex); DeviceUISet *deviceUI = m_deviceUIs[currentSinkTabIndex]; - deviceUI->m_deviceSinkAPI->saveSinkSettings(m_settings.getWorkingPreset()); // save old API settings - deviceUI->m_deviceSinkAPI->stopGeneration(); + deviceUI->m_deviceAPI->saveSamplingDeviceSettings(m_settings.getWorkingPreset()); // save old API settings + deviceUI->m_deviceAPI->stopDeviceEngine(); // deletes old UI and output object - deviceUI->m_deviceSinkAPI->getSampleSink()->setMessageQueueToGUI(0); // have sink stop sending messages to the GUI - deviceUI->m_deviceSinkAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( - deviceUI->m_deviceSinkAPI->getSampleSinkPluginInstanceGUI()); - deviceUI->m_deviceSinkAPI->resetSampleSinkId(); - deviceUI->m_deviceSinkAPI->getPluginInterface()->deleteSampleSinkPluginInstanceOutput( - deviceUI->m_deviceSinkAPI->getSampleSink()); - deviceUI->m_deviceSinkAPI->clearBuddiesLists(); // clear old API buddies lists + deviceUI->m_deviceAPI->getSampleSink()->setMessageQueueToGUI(0); // have sink stop sending messages to the GUI + deviceUI->m_deviceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( + deviceUI->m_deviceAPI->getSamplingDevicePluginInstanceGUI()); + deviceUI->m_deviceAPI->resetSamplingDeviceId(); + deviceUI->m_deviceAPI->getPluginInterface()->deleteSampleSinkPluginInstanceOutput( + deviceUI->m_deviceAPI->getSampleSink()); + deviceUI->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(deviceUI->m_samplingDeviceControl->getSelectedDeviceIndex()); - deviceUI->m_deviceSinkAPI->setSampleSinkSequence(samplingDevice.sequence); - deviceUI->m_deviceSinkAPI->setNbItems(samplingDevice.deviceNbItems); - deviceUI->m_deviceSinkAPI->setItemIndex(samplingDevice.deviceItemIndex); - deviceUI->m_deviceSinkAPI->setHardwareId(samplingDevice.hardwareId); - deviceUI->m_deviceSinkAPI->setSampleSinkId(samplingDevice.id); - deviceUI->m_deviceSinkAPI->setSampleSinkSerial(samplingDevice.serial); - deviceUI->m_deviceSinkAPI->setSampleSinkDisplayName(samplingDevice.displayedName); - deviceUI->m_deviceSinkAPI->setSampleSinkPluginInterface(DeviceEnumerator::instance()->getTxPluginInterface(deviceUI->m_samplingDeviceControl->getSelectedDeviceIndex())); + deviceUI->m_deviceAPI->setSamplingDeviceSequence(samplingDevice.sequence); + deviceUI->m_deviceAPI->setNbItems(samplingDevice.deviceNbItems); + deviceUI->m_deviceAPI->setItemIndex(samplingDevice.deviceItemIndex); + deviceUI->m_deviceAPI->setHardwareId(samplingDevice.hardwareId); + deviceUI->m_deviceAPI->setSamplingDeviceId(samplingDevice.id); + deviceUI->m_deviceAPI->setSamplingDeviceSerial(samplingDevice.serial); + deviceUI->m_deviceAPI->setSamplingDeviceDisplayName(samplingDevice.displayedName); + deviceUI->m_deviceAPI->setSamplingDevicePluginInterface(DeviceEnumerator::instance()->getTxPluginInterface(deviceUI->m_samplingDeviceControl->getSelectedDeviceIndex())); // add to buddies list std::vector::iterator it = m_deviceUIs.begin(); @@ -1615,20 +1616,20 @@ void MainWindow::sampleSinkChanged() { if ((*it)->m_deviceSourceEngine) // it is a source device { - if ((deviceUI->m_deviceSinkAPI->getHardwareId() == (*it)->m_deviceSourceAPI->getHardwareId()) && - (deviceUI->m_deviceSinkAPI->getSampleSinkSerial() == (*it)->m_deviceSourceAPI->getSampleSourceSerial())) + if ((deviceUI->m_deviceAPI->getHardwareId() == (*it)->m_deviceAPI->getHardwareId()) && + (deviceUI->m_deviceAPI->getSamplingDeviceSerial() == (*it)->m_deviceAPI->getSamplingDeviceSerial())) { - (*it)->m_deviceSourceAPI->addSinkBuddy(deviceUI->m_deviceSinkAPI); + (*it)->m_deviceAPI->addSinkBuddy(deviceUI->m_deviceAPI); nbOfBuddies++; } } if ((*it)->m_deviceSinkEngine) // it is a sink device { - if ((deviceUI->m_deviceSinkAPI->getHardwareId() == (*it)->m_deviceSinkAPI->getHardwareId()) && - (deviceUI->m_deviceSinkAPI->getSampleSinkSerial() == (*it)->m_deviceSinkAPI->getSampleSinkSerial())) + if ((deviceUI->m_deviceAPI->getHardwareId() == (*it)->m_deviceAPI->getHardwareId()) && + (deviceUI->m_deviceAPI->getSamplingDeviceSerial() == (*it)->m_deviceAPI->getSamplingDeviceSerial())) { - (*it)->m_deviceSinkAPI->addSinkBuddy(deviceUI->m_deviceSinkAPI); + (*it)->m_deviceAPI->addSinkBuddy(deviceUI->m_deviceAPI); nbOfBuddies++; } } @@ -1636,24 +1637,24 @@ void MainWindow::sampleSinkChanged() } if (nbOfBuddies == 0) { - deviceUI->m_deviceSinkAPI->setBuddyLeader(true); + deviceUI->m_deviceAPI->setBuddyLeader(true); } // constructs new GUI and output object - DeviceSampleSink *sink = deviceUI->m_deviceSinkAPI->getPluginInterface()->createSampleSinkPluginInstanceOutput( - deviceUI->m_deviceSinkAPI->getSampleSinkId(), deviceUI->m_deviceSinkAPI); - deviceUI->m_deviceSinkAPI->setSampleSink(sink); + DeviceSampleSink *sink = deviceUI->m_deviceAPI->getPluginInterface()->createSampleSinkPluginInstanceOutput( + deviceUI->m_deviceAPI->getSamplingDeviceId(), deviceUI->m_deviceAPI); + deviceUI->m_deviceAPI->setSampleSink(sink); QWidget *gui; - PluginInstanceGUI *pluginUI = deviceUI->m_deviceSinkAPI->getPluginInterface()->createSampleSinkPluginInstanceGUI( - deviceUI->m_deviceSinkAPI->getSampleSinkId(), + PluginInstanceGUI *pluginUI = deviceUI->m_deviceAPI->getPluginInterface()->createSampleSinkPluginInstanceGUI( + deviceUI->m_deviceAPI->getSamplingDeviceId(), &gui, deviceUI); - deviceUI->m_deviceSinkAPI->getSampleSink()->setMessageQueueToGUI(pluginUI->getInputMessageQueue()); - deviceUI->m_deviceSinkAPI->setSampleSinkPluginInstanceUI(pluginUI); - setDeviceGUI(currentSinkTabIndex, gui, deviceUI->m_deviceSinkAPI->getSampleSinkDisplayName(), false); - m_deviceUIs.back()->m_deviceSinkAPI->getSampleSink()->init(); + deviceUI->m_deviceAPI->getSampleSink()->setMessageQueueToGUI(pluginUI->getInputMessageQueue()); + deviceUI->m_deviceAPI->setSamplingDevicePluginInstanceGUI(pluginUI); + setDeviceGUI(currentSinkTabIndex, gui, deviceUI->m_deviceAPI->getSamplingDeviceDisplayName(), false); + m_deviceUIs.back()->m_deviceAPI->getSampleSink()->init(); - deviceUI->m_deviceSinkAPI->loadSinkSettings(m_settings.getWorkingPreset()); // load new API settings + deviceUI->m_deviceAPI->loadSamplingDeviceSettings(m_settings.getWorkingPreset()); // load new API settings } } @@ -1669,11 +1670,13 @@ void MainWindow::channelAddClicked(bool checked) if (deviceUI->m_deviceSourceEngine) // source device => Rx channels { - m_pluginManager->createRxChannelInstance(deviceUI->m_samplingDeviceControl->getChannelSelector()->currentIndex(), deviceUI, deviceUI->m_deviceSourceAPI); + m_pluginManager->createRxChannelInstance( + deviceUI->m_samplingDeviceControl->getChannelSelector()->currentIndex(), deviceUI, deviceUI->m_deviceAPI); } else if (deviceUI->m_deviceSinkEngine) // sink device => Tx channels { - m_pluginManager->createTxChannelInstance(deviceUI->m_samplingDeviceControl->getChannelSelector()->currentIndex(), deviceUI, deviceUI->m_deviceSinkAPI); + m_pluginManager->createTxChannelInstance( + deviceUI->m_samplingDeviceControl->getChannelSelector()->currentIndex(), deviceUI, deviceUI->m_deviceAPI); } } } diff --git a/sdrgui/mainwindow.h b/sdrgui/mainwindow.h index 105bcb7ae..8cdbe3db9 100644 --- a/sdrgui/mainwindow.h +++ b/sdrgui/mainwindow.h @@ -46,8 +46,7 @@ class PluginAPI; class PluginInstanceGUI; class ChannelMarker; class PluginManager; -class DeviceSourceAPI; -class DeviceSinkAPI; +class DeviceAPI; class DeviceUISet; class PluginInterface; class QWidget; diff --git a/sdrgui/webapi/webapiadaptergui.cpp b/sdrgui/webapi/webapiadaptergui.cpp index d17a61fda..0e62688fc 100644 --- a/sdrgui/webapi/webapiadaptergui.cpp +++ b/sdrgui/webapi/webapiadaptergui.cpp @@ -24,12 +24,13 @@ #include "mainwindow.h" #include "ui_mainwindow.h" #include "loggerwithfile.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "device/deviceuiset.h" #include "device/deviceenumerator.h" #include "dsp/devicesamplesource.h" #include "dsp/devicesamplesink.h" +#include "dsp/dspdevicesourceengine.h" +#include "dsp/dspdevicesinkengine.h" #include "dsp/dspengine.h" #include "plugin/pluginapi.h" #include "plugin/pluginmanager.h" @@ -1044,16 +1045,16 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsGet( if (deviceSet->m_deviceSourceEngine) // Single Rx { - response.setDeviceHwType(new QString(deviceSet->m_deviceSourceAPI->getHardwareId())); + response.setDeviceHwType(new QString(deviceSet->m_deviceAPI->getHardwareId())); response.setDirection(0); - DeviceSampleSource *source = deviceSet->m_deviceSourceAPI->getSampleSource(); + DeviceSampleSource *source = deviceSet->m_deviceAPI->getSampleSource(); return source->webapiSettingsGet(response, *error.getMessage()); } else if (deviceSet->m_deviceSinkEngine) // Single Tx { - response.setDeviceHwType(new QString(deviceSet->m_deviceSinkAPI->getHardwareId())); + response.setDeviceHwType(new QString(deviceSet->m_deviceAPI->getHardwareId())); response.setDirection(1); - DeviceSampleSink *sink = deviceSet->m_deviceSinkAPI->getSampleSink(); + DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink(); return sink->webapiSettingsGet(response, *error.getMessage()); } else @@ -1089,14 +1090,14 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsPutPatch( *error.getMessage() = QString("Single Rx device found but other type of device requested"); return 400; } - if (deviceSet->m_deviceSourceAPI->getHardwareId() != *response.getDeviceHwType()) + if (deviceSet->m_deviceAPI->getHardwareId() != *response.getDeviceHwType()) { - *error.getMessage() = QString("Device mismatch. Found %1 input").arg(deviceSet->m_deviceSourceAPI->getHardwareId()); + *error.getMessage() = QString("Device mismatch. Found %1 input").arg(deviceSet->m_deviceAPI->getHardwareId()); return 400; } else { - DeviceSampleSource *source = deviceSet->m_deviceSourceAPI->getSampleSource(); + DeviceSampleSource *source = deviceSet->m_deviceAPI->getSampleSource(); return source->webapiSettingsPutPatch(force, deviceSettingsKeys, response, *error.getMessage()); } } @@ -1107,14 +1108,14 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsPutPatch( *error.getMessage() = QString("Single Tx device found but other type of device requested"); return 400; } - else if (deviceSet->m_deviceSinkAPI->getHardwareId() != *response.getDeviceHwType()) + else if (deviceSet->m_deviceAPI->getHardwareId() != *response.getDeviceHwType()) { - *error.getMessage() = QString("Device mismatch. Found %1 output").arg(deviceSet->m_deviceSinkAPI->getHardwareId()); + *error.getMessage() = QString("Device mismatch. Found %1 output").arg(deviceSet->m_deviceAPI->getHardwareId()); return 400; } else { - DeviceSampleSink *sink = deviceSet->m_deviceSinkAPI->getSampleSink(); + DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink(); return sink->webapiSettingsPutPatch(force, deviceSettingsKeys, response, *error.getMessage()); } } @@ -1144,13 +1145,13 @@ int WebAPIAdapterGUI::devicesetDeviceRunGet( if (deviceSet->m_deviceSourceEngine) // Rx { - DeviceSampleSource *source = deviceSet->m_deviceSourceAPI->getSampleSource(); + DeviceSampleSource *source = deviceSet->m_deviceAPI->getSampleSource(); response.init(); return source->webapiRunGet(response, *error.getMessage()); } else if (deviceSet->m_deviceSinkEngine) // Tx { - DeviceSampleSink *sink = deviceSet->m_deviceSinkAPI->getSampleSink(); + DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink(); response.init(); return sink->webapiRunGet(response, *error.getMessage()); } @@ -1180,13 +1181,13 @@ int WebAPIAdapterGUI::devicesetDeviceRunPost( if (deviceSet->m_deviceSourceEngine) // Rx { - DeviceSampleSource *source = deviceSet->m_deviceSourceAPI->getSampleSource(); + DeviceSampleSource *source = deviceSet->m_deviceAPI->getSampleSource(); response.init(); return source->webapiRun(true, response, *error.getMessage()); } else if (deviceSet->m_deviceSinkEngine) // Tx { - DeviceSampleSink *sink = deviceSet->m_deviceSinkAPI->getSampleSink(); + DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink(); response.init(); return sink->webapiRun(true, response, *error.getMessage()); } @@ -1216,13 +1217,13 @@ int WebAPIAdapterGUI::devicesetDeviceRunDelete( if (deviceSet->m_deviceSourceEngine) // Rx { - DeviceSampleSource *source = deviceSet->m_deviceSourceAPI->getSampleSource(); + DeviceSampleSource *source = deviceSet->m_deviceAPI->getSampleSource(); response.init(); return source->webapiRun(false, response, *error.getMessage()); } else if (deviceSet->m_deviceSinkEngine) // Tx { - DeviceSampleSink *sink = deviceSet->m_deviceSinkAPI->getSampleSink(); + DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink(); response.init(); return sink->webapiRun(false, response, *error.getMessage()); } @@ -1253,16 +1254,16 @@ int WebAPIAdapterGUI::devicesetDeviceReportGet( if (deviceSet->m_deviceSourceEngine) // Single Rx { - response.setDeviceHwType(new QString(deviceSet->m_deviceSourceAPI->getHardwareId())); + response.setDeviceHwType(new QString(deviceSet->m_deviceAPI->getHardwareId())); response.setDirection(0); - DeviceSampleSource *source = deviceSet->m_deviceSourceAPI->getSampleSource(); + DeviceSampleSource *source = deviceSet->m_deviceAPI->getSampleSource(); return source->webapiReportGet(response, *error.getMessage()); } else if (deviceSet->m_deviceSinkEngine) // Single Tx { - response.setDeviceHwType(new QString(deviceSet->m_deviceSinkAPI->getHardwareId())); + response.setDeviceHwType(new QString(deviceSet->m_deviceAPI->getHardwareId())); response.setDirection(1); - DeviceSampleSink *sink = deviceSet->m_deviceSinkAPI->getSampleSink(); + DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink(); return sink->webapiReportGet(response, *error.getMessage()); } else @@ -1477,7 +1478,7 @@ int WebAPIAdapterGUI::devicesetChannelSettingsGet( if (deviceSet->m_deviceSourceEngine) // Single Rx { - ChannelSinkAPI *channelAPI = deviceSet->m_deviceSourceAPI->getChanelAPIAt(channelIndex); + ChannelSinkAPI *channelAPI = deviceSet->m_deviceAPI->getChanelSinkAPIAt(channelIndex); if (channelAPI == 0) { @@ -1494,7 +1495,7 @@ int WebAPIAdapterGUI::devicesetChannelSettingsGet( } else if (deviceSet->m_deviceSinkEngine) // Single Tx { - ChannelSourceAPI *channelAPI = deviceSet->m_deviceSinkAPI->getChanelAPIAt(channelIndex); + ChannelSourceAPI *channelAPI = deviceSet->m_deviceAPI->getChanelSourceAPIAt(channelIndex); if (channelAPI == 0) { @@ -1537,7 +1538,7 @@ int WebAPIAdapterGUI::devicesetChannelReportGet( if (deviceSet->m_deviceSourceEngine) // Single Rx { - ChannelSinkAPI *channelAPI = deviceSet->m_deviceSourceAPI->getChanelAPIAt(channelIndex); + ChannelSinkAPI *channelAPI = deviceSet->m_deviceAPI->getChanelSinkAPIAt(channelIndex); if (channelAPI == 0) { @@ -1554,7 +1555,7 @@ int WebAPIAdapterGUI::devicesetChannelReportGet( } else if (deviceSet->m_deviceSinkEngine) // Single Tx { - ChannelSourceAPI *channelAPI = deviceSet->m_deviceSinkAPI->getChanelAPIAt(channelIndex); + ChannelSourceAPI *channelAPI = deviceSet->m_deviceAPI->getChanelSourceAPIAt(channelIndex); if (channelAPI == 0) { @@ -1598,7 +1599,7 @@ int WebAPIAdapterGUI::devicesetChannelSettingsPutPatch( if (deviceSet->m_deviceSourceEngine) // Single Rx { - ChannelSinkAPI *channelAPI = deviceSet->m_deviceSourceAPI->getChanelAPIAt(channelIndex); + ChannelSinkAPI *channelAPI = deviceSet->m_deviceAPI->getChanelSinkAPIAt(channelIndex); if (channelAPI == 0) { @@ -1626,7 +1627,7 @@ int WebAPIAdapterGUI::devicesetChannelSettingsPutPatch( } else if (deviceSet->m_deviceSinkEngine) // Single Tx { - ChannelSourceAPI *channelAPI = deviceSet->m_deviceSinkAPI->getChanelAPIAt(channelIndex); + ChannelSourceAPI *channelAPI = deviceSet->m_deviceAPI->getChanelSourceAPIAt(channelIndex); if (channelAPI == 0) { @@ -1696,12 +1697,12 @@ void WebAPIAdapterGUI::getDeviceSet(SWGSDRangel::SWGDeviceSet *deviceSet, const if (deviceUISet->m_deviceSinkEngine) // Single Tx data { samplingDevice->setDirection(1); - *samplingDevice->getHwType() = deviceUISet->m_deviceSinkAPI->getHardwareId(); - *samplingDevice->getSerial() = deviceUISet->m_deviceSinkAPI->getSampleSinkSerial(); - samplingDevice->setSequence(deviceUISet->m_deviceSinkAPI->getSampleSinkSequence()); - samplingDevice->setDeviceNbStreams(deviceUISet->m_deviceSinkAPI->getNbItems()); - samplingDevice->setDeviceStreamIndex(deviceUISet->m_deviceSinkAPI->getItemIndex()); - deviceUISet->m_deviceSinkAPI->getDeviceEngineStateStr(*samplingDevice->getState()); + *samplingDevice->getHwType() = deviceUISet->m_deviceAPI->getHardwareId(); + *samplingDevice->getSerial() = deviceUISet->m_deviceAPI->getSamplingDeviceSerial(); + samplingDevice->setSequence(deviceUISet->m_deviceAPI->getSamplingDeviceSequence()); + samplingDevice->setDeviceNbStreams(deviceUISet->m_deviceAPI->getNbItems()); + samplingDevice->setDeviceStreamIndex(deviceUISet->m_deviceAPI->getItemIndex()); + deviceUISet->m_deviceAPI->getDeviceEngineStateStr(*samplingDevice->getState()); DeviceSampleSink *sampleSink = deviceUISet->m_deviceSinkEngine->getSink(); if (sampleSink) { @@ -1709,14 +1710,14 @@ void WebAPIAdapterGUI::getDeviceSet(SWGSDRangel::SWGDeviceSet *deviceSet, const samplingDevice->setBandwidth(sampleSink->getSampleRate()); } - deviceSet->setChannelcount(deviceUISet->m_deviceSinkAPI->getNbChannels()); + deviceSet->setChannelcount(deviceUISet->m_deviceAPI->getNbSourceChannels()); QList *channels = deviceSet->getChannels(); for (int i = 0; i < deviceSet->getChannelcount(); i++) { channels->append(new SWGSDRangel::SWGChannel); channels->back()->init(); - ChannelSourceAPI *channel = deviceUISet->m_deviceSinkAPI->getChanelAPIAt(i); + ChannelSourceAPI *channel = deviceUISet->m_deviceAPI->getChanelSourceAPIAt(i); channels->back()->setDeltaFrequency(channel->getCenterFrequency()); channels->back()->setIndex(channel->getIndexInDeviceSet()); channels->back()->setUid(channel->getUID()); @@ -1728,12 +1729,12 @@ void WebAPIAdapterGUI::getDeviceSet(SWGSDRangel::SWGDeviceSet *deviceSet, const if (deviceUISet->m_deviceSourceEngine) // Rx data { samplingDevice->setDirection(0); - *samplingDevice->getHwType() = deviceUISet->m_deviceSourceAPI->getHardwareId(); - *samplingDevice->getSerial() = deviceUISet->m_deviceSourceAPI->getSampleSourceSerial(); - samplingDevice->setSequence(deviceUISet->m_deviceSourceAPI->getSampleSourceSequence()); - samplingDevice->setDeviceNbStreams(deviceUISet->m_deviceSourceAPI->getNbItems()); - samplingDevice->setDeviceStreamIndex(deviceUISet->m_deviceSourceAPI->getItemIndex()); - deviceUISet->m_deviceSourceAPI->getDeviceEngineStateStr(*samplingDevice->getState()); + *samplingDevice->getHwType() = deviceUISet->m_deviceAPI->getHardwareId(); + *samplingDevice->getSerial() = deviceUISet->m_deviceAPI->getSamplingDeviceSerial(); + samplingDevice->setSequence(deviceUISet->m_deviceAPI->getSamplingDeviceSequence()); + samplingDevice->setDeviceNbStreams(deviceUISet->m_deviceAPI->getNbItems()); + samplingDevice->setDeviceStreamIndex(deviceUISet->m_deviceAPI->getItemIndex()); + deviceUISet->m_deviceAPI->getDeviceEngineStateStr(*samplingDevice->getState()); DeviceSampleSource *sampleSource = deviceUISet->m_deviceSourceEngine->getSource(); if (sampleSource) { @@ -1741,14 +1742,14 @@ void WebAPIAdapterGUI::getDeviceSet(SWGSDRangel::SWGDeviceSet *deviceSet, const samplingDevice->setBandwidth(sampleSource->getSampleRate()); } - deviceSet->setChannelcount(deviceUISet->m_deviceSourceAPI->getNbChannels()); + deviceSet->setChannelcount(deviceUISet->m_deviceAPI->getNbSinkChannels()); QList *channels = deviceSet->getChannels(); for (int i = 0; i < deviceSet->getChannelcount(); i++) { channels->append(new SWGSDRangel::SWGChannel); channels->back()->init(); - ChannelSinkAPI *channel = deviceUISet->m_deviceSourceAPI->getChanelAPIAt(i); + ChannelSinkAPI *channel = deviceUISet->m_deviceAPI->getChanelSinkAPIAt(i); channels->back()->setDeltaFrequency(channel->getCenterFrequency()); channels->back()->setIndex(channel->getIndexInDeviceSet()); channels->back()->setUid(channel->getUID()); @@ -1766,14 +1767,14 @@ void WebAPIAdapterGUI::getChannelsDetail(SWGSDRangel::SWGChannelsDetail *channel if (deviceUISet->m_deviceSinkEngine) // Tx data { - channelsDetail->setChannelcount(deviceUISet->m_deviceSinkAPI->getNbChannels()); + channelsDetail->setChannelcount(deviceUISet->m_deviceAPI->getNbSourceChannels()); QList *channels = channelsDetail->getChannels(); for (int i = 0; i < channelsDetail->getChannelcount(); i++) { channels->append(new SWGSDRangel::SWGChannel); channels->back()->init(); - ChannelSourceAPI *channel = deviceUISet->m_deviceSinkAPI->getChanelAPIAt(i); + ChannelSourceAPI *channel = deviceUISet->m_deviceAPI->getChanelSourceAPIAt(i); channels->back()->setDeltaFrequency(channel->getCenterFrequency()); channels->back()->setIndex(channel->getIndexInDeviceSet()); channels->back()->setUid(channel->getUID()); @@ -1792,14 +1793,14 @@ void WebAPIAdapterGUI::getChannelsDetail(SWGSDRangel::SWGChannelsDetail *channel if (deviceUISet->m_deviceSourceEngine) // Rx data { - channelsDetail->setChannelcount(deviceUISet->m_deviceSourceAPI->getNbChannels()); + channelsDetail->setChannelcount(deviceUISet->m_deviceAPI->getNbSinkChannels()); QList *channels = channelsDetail->getChannels(); for (int i = 0; i < channelsDetail->getChannelcount(); i++) { channels->append(new SWGSDRangel::SWGChannel); channels->back()->init(); - ChannelSinkAPI *channel = deviceUISet->m_deviceSourceAPI->getChanelAPIAt(i); + ChannelSinkAPI *channel = deviceUISet->m_deviceAPI->getChanelSinkAPIAt(i); channels->back()->setDeltaFrequency(channel->getCenterFrequency()); channels->back()->setIndex(channel->getIndexInDeviceSet()); channels->back()->setUid(channel->getUID()); diff --git a/sdrsrv/device/deviceset.cpp b/sdrsrv/device/deviceset.cpp index 4916f7ca6..8f123cda1 100644 --- a/sdrsrv/device/deviceset.cpp +++ b/sdrsrv/device/deviceset.cpp @@ -32,9 +32,8 @@ DeviceSet::DeviceSet(int tabIndex) { m_deviceSourceEngine = 0; - m_deviceSourceAPI = 0; + m_deviceAPI = 0; m_deviceSinkEngine = 0; - m_deviceSinkAPI = 0; m_deviceTabIndex = tabIndex; } @@ -123,7 +122,7 @@ void DeviceSet::deleteTxChannel(int channelIndex) void DeviceSet::addRxChannel(int selectedChannelIndex, PluginAPI *pluginAPI) { PluginAPI::ChannelRegistrations *channelRegistrations = pluginAPI->getRxChannelRegistrations(); // Available channel plugins - ChannelSinkAPI *rxChannel =(*channelRegistrations)[selectedChannelIndex].m_plugin->createRxChannelCS(m_deviceSourceAPI); + ChannelSinkAPI *rxChannel =(*channelRegistrations)[selectedChannelIndex].m_plugin->createRxChannelCS(m_deviceAPI); ChannelInstanceRegistration reg = ChannelInstanceRegistration(rxChannel->getName(), rxChannel); m_rxChannelInstanceRegistrations.append(reg); qDebug("DeviceSet::addRxChannel: %s", qPrintable(rxChannel->getName())); @@ -132,7 +131,7 @@ void DeviceSet::addRxChannel(int selectedChannelIndex, PluginAPI *pluginAPI) void DeviceSet::addTxChannel(int selectedChannelIndex, PluginAPI *pluginAPI) { PluginAPI::ChannelRegistrations *channelRegistrations = pluginAPI->getTxChannelRegistrations(); // Available channel plugins - ChannelSourceAPI *txChannel = (*channelRegistrations)[selectedChannelIndex].m_plugin->createTxChannelCS(m_deviceSinkAPI); + ChannelSourceAPI *txChannel = (*channelRegistrations)[selectedChannelIndex].m_plugin->createTxChannelCS(m_deviceAPI); ChannelInstanceRegistration reg = ChannelInstanceRegistration(txChannel->getName(), txChannel); m_txChannelInstanceRegistrations.append(reg); qDebug("DeviceSet::addTxChannel: %s", qPrintable(txChannel->getName())); @@ -186,7 +185,7 @@ void DeviceSet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginAPI qDebug("DeviceSet::loadChannelSettings: creating new channel [%s] from config [%s]", qPrintable((*channelRegistrations)[i].m_channelIdURI), qPrintable(channelConfig.m_channelIdURI)); - ChannelSinkAPI *rxChannel = (*channelRegistrations)[i].m_plugin->createRxChannelCS(m_deviceSourceAPI); + ChannelSinkAPI *rxChannel = (*channelRegistrations)[i].m_plugin->createRxChannelCS(m_deviceAPI); reg = ChannelInstanceRegistration(channelConfig.m_channelIdURI, rxChannel); m_rxChannelInstanceRegistrations.append(reg); break; @@ -282,7 +281,7 @@ void DeviceSet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginAPI if((*channelRegistrations)[i].m_channelIdURI == channelConfig.m_channelIdURI) { qDebug("DeviceSet::loadChannelSettings: creating new channel [%s]", qPrintable(channelConfig.m_channelIdURI)); - ChannelSourceAPI *txChannel = (*channelRegistrations)[i].m_plugin->createTxChannelCS(m_deviceSinkAPI); + ChannelSourceAPI *txChannel = (*channelRegistrations)[i].m_plugin->createTxChannelCS(m_deviceAPI); reg = ChannelInstanceRegistration(channelConfig.m_channelIdURI, txChannel); m_txChannelInstanceRegistrations.append(reg); break; diff --git a/sdrsrv/device/deviceset.h b/sdrsrv/device/deviceset.h index 3446e9318..829a84148 100644 --- a/sdrsrv/device/deviceset.h +++ b/sdrsrv/device/deviceset.h @@ -21,9 +21,8 @@ #include class DSPDeviceSourceEngine; -class DeviceSourceAPI; +class DeviceAPI; class DSPDeviceSinkEngine; -class DeviceSinkAPI; class PluginAPI; class ChannelSinkAPI; class ChannelSourceAPI; @@ -33,9 +32,8 @@ class DeviceSet { public: DSPDeviceSourceEngine *m_deviceSourceEngine; - DeviceSourceAPI *m_deviceSourceAPI; + DeviceAPI *m_deviceAPI; DSPDeviceSinkEngine *m_deviceSinkEngine; - DeviceSinkAPI *m_deviceSinkAPI; DeviceSet(int tabIndex); ~DeviceSet(); diff --git a/sdrsrv/maincore.cpp b/sdrsrv/maincore.cpp index 9cf4b274e..57adb1bc6 100644 --- a/sdrsrv/maincore.cpp +++ b/sdrsrv/maincore.cpp @@ -26,8 +26,7 @@ #include "dsp/dspengine.h" #include "dsp/dspdevicesourceengine.h" #include "dsp/dspdevicesinkengine.h" -#include "device/devicesourceapi.h" -#include "device/devicesinkapi.h" +#include "device/deviceapi.h" #include "device/deviceset.h" #include "device/deviceenumerator.h" #include "plugin/pluginmanager.h" @@ -277,30 +276,29 @@ void MainCore::addSinkDevice() char tabNameCStr[16]; sprintf(tabNameCStr, "T%d", deviceTabIndex); - DeviceSinkAPI *deviceSinkAPI = new DeviceSinkAPI(deviceTabIndex, dspDeviceSinkEngine); + DeviceAPI *deviceAPI = new DeviceAPI(DeviceAPI::StreamSingleTx, deviceTabIndex, nullptr, dspDeviceSinkEngine); - m_deviceSets.back()->m_deviceSourceAPI = 0; - m_deviceSets.back()->m_deviceSinkAPI = deviceSinkAPI; + m_deviceSets.back()->m_deviceAPI = deviceAPI; QList channelNames; // create a file sink by default int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileSinkDeviceIndex(); PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex); - m_deviceSets.back()->m_deviceSinkAPI->setSampleSinkSequence(samplingDevice.sequence); - m_deviceSets.back()->m_deviceSinkAPI->setNbItems(samplingDevice.deviceNbItems); - m_deviceSets.back()->m_deviceSinkAPI->setItemIndex(samplingDevice.deviceItemIndex); - m_deviceSets.back()->m_deviceSinkAPI->setHardwareId(samplingDevice.hardwareId); - m_deviceSets.back()->m_deviceSinkAPI->setSampleSinkId(samplingDevice.id); - m_deviceSets.back()->m_deviceSinkAPI->setSampleSinkSerial(samplingDevice.serial); - m_deviceSets.back()->m_deviceSinkAPI->setSampleSinkDisplayName(samplingDevice.displayedName); - m_deviceSets.back()->m_deviceSinkAPI->setSampleSinkPluginInterface(DeviceEnumerator::instance()->getTxPluginInterface(fileSinkDeviceIndex)); + m_deviceSets.back()->m_deviceAPI->setSamplingDeviceSequence(samplingDevice.sequence); + m_deviceSets.back()->m_deviceAPI->setNbItems(samplingDevice.deviceNbItems); + m_deviceSets.back()->m_deviceAPI->setItemIndex(samplingDevice.deviceItemIndex); + m_deviceSets.back()->m_deviceAPI->setHardwareId(samplingDevice.hardwareId); + m_deviceSets.back()->m_deviceAPI->setSamplingDeviceId(samplingDevice.id); + m_deviceSets.back()->m_deviceAPI->setSamplingDeviceSerial(samplingDevice.serial); + m_deviceSets.back()->m_deviceAPI->setSamplingDeviceDisplayName(samplingDevice.displayedName); + m_deviceSets.back()->m_deviceAPI->setSamplingDevicePluginInterface(DeviceEnumerator::instance()->getTxPluginInterface(fileSinkDeviceIndex)); // delete previous plugin instance //m_deviceSets.back()->m_deviceSinkAPI->getPluginInterface()->deleteSampleSinkPluginInstanceOutput() - DeviceSampleSink *sink = m_deviceSets.back()->m_deviceSinkAPI->getPluginInterface()->createSampleSinkPluginInstanceOutput( - m_deviceSets.back()->m_deviceSinkAPI->getSampleSinkId(), m_deviceSets.back()->m_deviceSinkAPI); - m_deviceSets.back()->m_deviceSinkAPI->setSampleSink(sink); + DeviceSampleSink *sink = m_deviceSets.back()->m_deviceAPI->getPluginInterface()->createSampleSinkPluginInstanceOutput( + m_deviceSets.back()->m_deviceAPI->getSamplingDeviceId(), m_deviceSets.back()->m_deviceAPI); + m_deviceSets.back()->m_deviceAPI->setSampleSink(sink); } void MainCore::addSourceDevice() @@ -319,25 +317,25 @@ void MainCore::addSourceDevice() char tabNameCStr[16]; sprintf(tabNameCStr, "R%d", deviceTabIndex); - DeviceSourceAPI *deviceSourceAPI = new DeviceSourceAPI(deviceTabIndex, dspDeviceSourceEngine); + DeviceAPI *deviceAPI = new DeviceAPI(DeviceAPI::StreamSingleRx, deviceTabIndex, dspDeviceSourceEngine, nullptr); - m_deviceSets.back()->m_deviceSourceAPI = deviceSourceAPI; + m_deviceSets.back()->m_deviceAPI = deviceAPI; // Create a file source instance by default int fileSourceDeviceIndex = DeviceEnumerator::instance()->getFileSourceDeviceIndex(); PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(fileSourceDeviceIndex); - m_deviceSets.back()->m_deviceSourceAPI->setSampleSourceSequence(samplingDevice.sequence); - m_deviceSets.back()->m_deviceSourceAPI->setNbItems(samplingDevice.deviceNbItems); - m_deviceSets.back()->m_deviceSourceAPI->setItemIndex(samplingDevice.deviceItemIndex); - m_deviceSets.back()->m_deviceSourceAPI->setHardwareId(samplingDevice.hardwareId); - m_deviceSets.back()->m_deviceSourceAPI->setSampleSourceId(samplingDevice.id); - m_deviceSets.back()->m_deviceSourceAPI->setSampleSourceSerial(samplingDevice.serial); - m_deviceSets.back()->m_deviceSourceAPI->setSampleSourceDisplayName(samplingDevice.displayedName); - m_deviceSets.back()->m_deviceSourceAPI->setSampleSourcePluginInterface(DeviceEnumerator::instance()->getRxPluginInterface(fileSourceDeviceIndex)); + m_deviceSets.back()->m_deviceAPI->setSamplingDeviceSequence(samplingDevice.sequence); + m_deviceSets.back()->m_deviceAPI->setNbItems(samplingDevice.deviceNbItems); + m_deviceSets.back()->m_deviceAPI->setItemIndex(samplingDevice.deviceItemIndex); + m_deviceSets.back()->m_deviceAPI->setHardwareId(samplingDevice.hardwareId); + m_deviceSets.back()->m_deviceAPI->setSamplingDeviceId(samplingDevice.id); + m_deviceSets.back()->m_deviceAPI->setSamplingDeviceSerial(samplingDevice.serial); + m_deviceSets.back()->m_deviceAPI->setSamplingDeviceDisplayName(samplingDevice.displayedName); + m_deviceSets.back()->m_deviceAPI->setSamplingDevicePluginInterface(DeviceEnumerator::instance()->getRxPluginInterface(fileSourceDeviceIndex)); - DeviceSampleSource *source = m_deviceSets.back()->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceInput( - m_deviceSets.back()->m_deviceSourceAPI->getSampleSourceId(), m_deviceSets.back()->m_deviceSourceAPI); - m_deviceSets.back()->m_deviceSourceAPI->setSampleSource(source); + DeviceSampleSource *source = m_deviceSets.back()->m_deviceAPI->getPluginInterface()->createSampleSourcePluginInstanceInput( + m_deviceSets.back()->m_deviceAPI->getSamplingDeviceId(), m_deviceSets.back()->m_deviceAPI); + m_deviceSets.back()->m_deviceAPI->setSampleSource(source); } void MainCore::removeLastDevice() @@ -349,12 +347,12 @@ void MainCore::removeLastDevice() // deletes old UI and input object m_deviceSets.back()->freeRxChannels(); // destroys the channel instances - m_deviceSets.back()->m_deviceSourceAPI->resetSampleSourceId(); - m_deviceSets.back()->m_deviceSourceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceInput( - m_deviceSets.back()->m_deviceSourceAPI->getSampleSource()); - m_deviceSets.back()->m_deviceSourceAPI->clearBuddiesLists(); // clear old API buddies lists + m_deviceSets.back()->m_deviceAPI->resetSamplingDeviceId(); + m_deviceSets.back()->m_deviceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceInput( + m_deviceSets.back()->m_deviceAPI->getSampleSource()); + m_deviceSets.back()->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists - DeviceSourceAPI *sourceAPI = m_deviceSets.back()->m_deviceSourceAPI; + DeviceAPI *sourceAPI = m_deviceSets.back()->m_deviceAPI; delete m_deviceSets.back(); lastDeviceEngine->stop(); @@ -369,12 +367,12 @@ void MainCore::removeLastDevice() // deletes old UI and output object m_deviceSets.back()->freeTxChannels(); - m_deviceSets.back()->m_deviceSinkAPI->resetSampleSinkId(); - m_deviceSets.back()->m_deviceSinkAPI->getPluginInterface()->deleteSampleSinkPluginInstanceOutput( - m_deviceSets.back()->m_deviceSinkAPI->getSampleSink()); - m_deviceSets.back()->m_deviceSinkAPI->clearBuddiesLists(); // clear old API buddies lists + m_deviceSets.back()->m_deviceAPI->resetSamplingDeviceId(); + m_deviceSets.back()->m_deviceAPI->getPluginInterface()->deleteSampleSinkPluginInstanceOutput( + m_deviceSets.back()->m_deviceAPI->getSampleSink()); + m_deviceSets.back()->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists - DeviceSinkAPI *sinkAPI = m_deviceSets.back()->m_deviceSinkAPI; + DeviceAPI *sinkAPI = m_deviceSets.back()->m_deviceAPI; delete m_deviceSets.back(); lastDeviceEngine->stop(); @@ -392,24 +390,24 @@ void MainCore::changeSampleSource(int deviceSetIndex, int selectedDeviceIndex) { qDebug("MainCore::changeSampleSource: deviceSet at %d", deviceSetIndex); DeviceSet *deviceSet = m_deviceSets[deviceSetIndex]; - deviceSet->m_deviceSourceAPI->saveSourceSettings(m_settings.getWorkingPreset()); // save old API settings - deviceSet->m_deviceSourceAPI->stopAcquisition(); + deviceSet->m_deviceAPI->saveSamplingDeviceSettings(m_settings.getWorkingPreset()); // save old API settings + deviceSet->m_deviceAPI->stopDeviceEngine(); // deletes old UI and input object - deviceSet->m_deviceSourceAPI->resetSampleSourceId(); - deviceSet->m_deviceSourceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceInput( - deviceSet->m_deviceSourceAPI->getSampleSource()); - deviceSet->m_deviceSourceAPI->clearBuddiesLists(); // clear old API buddies lists + deviceSet->m_deviceAPI->resetSamplingDeviceId(); + deviceSet->m_deviceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceInput( + deviceSet->m_deviceAPI->getSampleSource()); + deviceSet->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(selectedDeviceIndex); - deviceSet->m_deviceSourceAPI->setSampleSourceSequence(samplingDevice.sequence); - deviceSet->m_deviceSourceAPI->setNbItems(samplingDevice.deviceNbItems); - deviceSet->m_deviceSourceAPI->setItemIndex(samplingDevice.deviceItemIndex); - deviceSet->m_deviceSourceAPI->setHardwareId(samplingDevice.hardwareId); - deviceSet->m_deviceSourceAPI->setSampleSourceId(samplingDevice.id); - deviceSet->m_deviceSourceAPI->setSampleSourceSerial(samplingDevice.serial); - deviceSet->m_deviceSourceAPI->setSampleSourceDisplayName(samplingDevice.displayedName); - deviceSet->m_deviceSourceAPI->setSampleSourcePluginInterface(DeviceEnumerator::instance()->getRxPluginInterface(selectedDeviceIndex)); + deviceSet->m_deviceAPI->setSamplingDeviceSequence(samplingDevice.sequence); + deviceSet->m_deviceAPI->setNbItems(samplingDevice.deviceNbItems); + deviceSet->m_deviceAPI->setItemIndex(samplingDevice.deviceItemIndex); + deviceSet->m_deviceAPI->setHardwareId(samplingDevice.hardwareId); + deviceSet->m_deviceAPI->setSamplingDeviceId(samplingDevice.id); + deviceSet->m_deviceAPI->setSamplingDeviceSerial(samplingDevice.serial); + deviceSet->m_deviceAPI->setSamplingDeviceDisplayName(samplingDevice.displayedName); + deviceSet->m_deviceAPI->setSamplingDevicePluginInterface(DeviceEnumerator::instance()->getRxPluginInterface(selectedDeviceIndex)); // add to buddies list std::vector::iterator it = m_deviceSets.begin(); @@ -421,20 +419,20 @@ void MainCore::changeSampleSource(int deviceSetIndex, int selectedDeviceIndex) { if ((*it)->m_deviceSourceEngine) // it is a source device { - if ((deviceSet->m_deviceSourceAPI->getHardwareId() == (*it)->m_deviceSourceAPI->getHardwareId()) && - (deviceSet->m_deviceSourceAPI->getSampleSourceSerial() == (*it)->m_deviceSourceAPI->getSampleSourceSerial())) + if ((deviceSet->m_deviceAPI->getHardwareId() == (*it)->m_deviceAPI->getHardwareId()) && + (deviceSet->m_deviceAPI->getSamplingDeviceSerial() == (*it)->m_deviceAPI->getSamplingDeviceSerial())) { - (*it)->m_deviceSourceAPI->addSourceBuddy(deviceSet->m_deviceSourceAPI); + (*it)->m_deviceAPI->addSourceBuddy(deviceSet->m_deviceAPI); nbOfBuddies++; } } if ((*it)->m_deviceSinkEngine) // it is a sink device { - if ((deviceSet->m_deviceSourceAPI->getHardwareId() == (*it)->m_deviceSinkAPI->getHardwareId()) && - (deviceSet->m_deviceSourceAPI->getSampleSourceSerial() == (*it)->m_deviceSinkAPI->getSampleSinkSerial())) + if ((deviceSet->m_deviceAPI->getHardwareId() == (*it)->m_deviceAPI->getHardwareId()) && + (deviceSet->m_deviceAPI->getSamplingDeviceSerial() == (*it)->m_deviceAPI->getSamplingDeviceSerial())) { - (*it)->m_deviceSinkAPI->addSourceBuddy(deviceSet->m_deviceSourceAPI); + (*it)->m_deviceAPI->addSourceBuddy(deviceSet->m_deviceAPI); nbOfBuddies++; } } @@ -442,15 +440,15 @@ void MainCore::changeSampleSource(int deviceSetIndex, int selectedDeviceIndex) } if (nbOfBuddies == 0) { - deviceSet->m_deviceSourceAPI->setBuddyLeader(true); + deviceSet->m_deviceAPI->setBuddyLeader(true); } // constructs new GUI and input object - DeviceSampleSource *source = deviceSet->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceInput( - deviceSet->m_deviceSourceAPI->getSampleSourceId(), deviceSet->m_deviceSourceAPI); - deviceSet->m_deviceSourceAPI->setSampleSource(source); + DeviceSampleSource *source = deviceSet->m_deviceAPI->getPluginInterface()->createSampleSourcePluginInstanceInput( + deviceSet->m_deviceAPI->getSamplingDeviceId(), deviceSet->m_deviceAPI); + deviceSet->m_deviceAPI->setSampleSource(source); - deviceSet->m_deviceSourceAPI->loadSourceSettings(m_settings.getWorkingPreset()); // load new API settings + deviceSet->m_deviceAPI->loadSamplingDeviceSettings(m_settings.getWorkingPreset()); // load new API settings } } @@ -460,24 +458,24 @@ void MainCore::changeSampleSink(int deviceSetIndex, int selectedDeviceIndex) { qDebug("MainCore::changeSampleSink: device set at %d", deviceSetIndex); DeviceSet *deviceSet = m_deviceSets[deviceSetIndex]; - deviceSet->m_deviceSinkAPI->saveSinkSettings(m_settings.getWorkingPreset()); // save old API settings - deviceSet->m_deviceSinkAPI->stopGeneration(); + deviceSet->m_deviceAPI->saveSamplingDeviceSettings(m_settings.getWorkingPreset()); // save old API settings + deviceSet->m_deviceAPI->stopDeviceEngine(); // deletes old UI and output object - deviceSet->m_deviceSinkAPI->resetSampleSinkId(); - deviceSet->m_deviceSinkAPI->getPluginInterface()->deleteSampleSinkPluginInstanceOutput( - deviceSet->m_deviceSinkAPI->getSampleSink()); - deviceSet->m_deviceSinkAPI->clearBuddiesLists(); // clear old API buddies lists + deviceSet->m_deviceAPI->resetSamplingDeviceId(); + deviceSet->m_deviceAPI->getPluginInterface()->deleteSampleSinkPluginInstanceOutput( + deviceSet->m_deviceAPI->getSampleSink()); + deviceSet->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(selectedDeviceIndex); - deviceSet->m_deviceSinkAPI->setSampleSinkSequence(samplingDevice.sequence); - deviceSet->m_deviceSinkAPI->setNbItems(samplingDevice.deviceNbItems); - deviceSet->m_deviceSinkAPI->setItemIndex(samplingDevice.deviceItemIndex); - deviceSet->m_deviceSinkAPI->setHardwareId(samplingDevice.hardwareId); - deviceSet->m_deviceSinkAPI->setSampleSinkId(samplingDevice.id); - deviceSet->m_deviceSinkAPI->setSampleSinkSerial(samplingDevice.serial); - deviceSet->m_deviceSinkAPI->setSampleSinkDisplayName(samplingDevice.displayedName); - deviceSet->m_deviceSinkAPI->setSampleSinkPluginInterface(DeviceEnumerator::instance()->getTxPluginInterface(selectedDeviceIndex)); + deviceSet->m_deviceAPI->setSamplingDeviceSequence(samplingDevice.sequence); + deviceSet->m_deviceAPI->setNbItems(samplingDevice.deviceNbItems); + deviceSet->m_deviceAPI->setItemIndex(samplingDevice.deviceItemIndex); + deviceSet->m_deviceAPI->setHardwareId(samplingDevice.hardwareId); + deviceSet->m_deviceAPI->setSamplingDeviceId(samplingDevice.id); + deviceSet->m_deviceAPI->setSamplingDeviceSerial(samplingDevice.serial); + deviceSet->m_deviceAPI->setSamplingDeviceDisplayName(samplingDevice.displayedName); + deviceSet->m_deviceAPI->setSamplingDevicePluginInterface(DeviceEnumerator::instance()->getTxPluginInterface(selectedDeviceIndex)); // add to buddies list std::vector::iterator it = m_deviceSets.begin(); @@ -489,20 +487,20 @@ void MainCore::changeSampleSink(int deviceSetIndex, int selectedDeviceIndex) { if ((*it)->m_deviceSourceEngine) // it is a source device { - if ((deviceSet->m_deviceSinkAPI->getHardwareId() == (*it)->m_deviceSourceAPI->getHardwareId()) && - (deviceSet->m_deviceSinkAPI->getSampleSinkSerial() == (*it)->m_deviceSourceAPI->getSampleSourceSerial())) + if ((deviceSet->m_deviceAPI->getHardwareId() == (*it)->m_deviceAPI->getHardwareId()) && + (deviceSet->m_deviceAPI->getSamplingDeviceSerial() == (*it)->m_deviceAPI->getSamplingDeviceSerial())) { - (*it)->m_deviceSourceAPI->addSinkBuddy(deviceSet->m_deviceSinkAPI); + (*it)->m_deviceAPI->addSinkBuddy(deviceSet->m_deviceAPI); nbOfBuddies++; } } if ((*it)->m_deviceSinkEngine) // it is a sink device { - if ((deviceSet->m_deviceSinkAPI->getHardwareId() == (*it)->m_deviceSinkAPI->getHardwareId()) && - (deviceSet->m_deviceSinkAPI->getSampleSinkSerial() == (*it)->m_deviceSinkAPI->getSampleSinkSerial())) + if ((deviceSet->m_deviceAPI->getHardwareId() == (*it)->m_deviceAPI->getHardwareId()) && + (deviceSet->m_deviceAPI->getSamplingDeviceSerial() == (*it)->m_deviceAPI->getSamplingDeviceSerial())) { - (*it)->m_deviceSinkAPI->addSinkBuddy(deviceSet->m_deviceSinkAPI); + (*it)->m_deviceAPI->addSinkBuddy(deviceSet->m_deviceAPI); nbOfBuddies++; } } @@ -510,15 +508,15 @@ void MainCore::changeSampleSink(int deviceSetIndex, int selectedDeviceIndex) } if (nbOfBuddies == 0) { - deviceSet->m_deviceSinkAPI->setBuddyLeader(true); + deviceSet->m_deviceAPI->setBuddyLeader(true); } // constructs new GUI and output object - DeviceSampleSink *sink = deviceSet->m_deviceSinkAPI->getPluginInterface()->createSampleSinkPluginInstanceOutput( - deviceSet->m_deviceSinkAPI->getSampleSinkId(), deviceSet->m_deviceSinkAPI); - deviceSet->m_deviceSinkAPI->setSampleSink(sink); + DeviceSampleSink *sink = deviceSet->m_deviceAPI->getPluginInterface()->createSampleSinkPluginInstanceOutput( + deviceSet->m_deviceAPI->getSamplingDeviceId(), deviceSet->m_deviceAPI); + deviceSet->m_deviceAPI->setSampleSink(sink); - deviceSet->m_deviceSinkAPI->loadSinkSettings(m_settings.getWorkingPreset()); // load new API settings + deviceSet->m_deviceAPI->loadSamplingDeviceSettings(m_settings.getWorkingPreset()); // load new API settings } } @@ -568,12 +566,12 @@ void MainCore::loadPresetSettings(const Preset* preset, int tabIndex) if (deviceSet->m_deviceSourceEngine) // source device { - deviceSet->m_deviceSourceAPI->loadSourceSettings(preset); + deviceSet->m_deviceAPI->loadSamplingDeviceSettings(preset); deviceSet->loadRxChannelSettings(preset, m_pluginManager->getPluginAPI()); } else if (deviceSet->m_deviceSinkEngine) // sink device { - deviceSet->m_deviceSinkAPI->loadSinkSettings(preset); + deviceSet->m_deviceAPI->loadSamplingDeviceSettings(preset); deviceSet->loadTxChannelSettings(preset, m_pluginManager->getPluginAPI()); } } @@ -593,14 +591,14 @@ void MainCore::savePresetSettings(Preset* preset, int tabIndex) { preset->clearChannels(); deviceSet->saveRxChannelSettings(preset); - deviceSet->m_deviceSourceAPI->saveSourceSettings(preset); + deviceSet->m_deviceAPI->saveSamplingDeviceSettings(preset); } else if (deviceSet->m_deviceSinkEngine) // sink device { preset->clearChannels(); preset->setSourcePreset(false); deviceSet->saveTxChannelSettings(preset); - deviceSet->m_deviceSinkAPI->saveSinkSettings(preset); + deviceSet->m_deviceAPI->saveSamplingDeviceSettings(preset); } } diff --git a/sdrsrv/maincore.h b/sdrsrv/maincore.h index ad8b77994..ac6b2a7ed 100644 --- a/sdrsrv/maincore.h +++ b/sdrsrv/maincore.h @@ -32,8 +32,6 @@ class DSPEngine; class DSPDeviceSourceEngine; class DSPDeviceSinkEngine; -class DeviceSourceAPI; -class DeviceSinkAPI; class PluginAPI; class PluginInterface; class PluginManager; diff --git a/sdrsrv/webapi/webapiadaptersrv.cpp b/sdrsrv/webapi/webapiadaptersrv.cpp index 970b23179..7baf3c353 100644 --- a/sdrsrv/webapi/webapiadaptersrv.cpp +++ b/sdrsrv/webapi/webapiadaptersrv.cpp @@ -47,11 +47,12 @@ #include "maincore.h" #include "loggerwithfile.h" #include "device/deviceset.h" -#include "device/devicesinkapi.h" -#include "device/devicesourceapi.h" +#include "device/deviceapi.h" #include "device/deviceenumerator.h" #include "dsp/devicesamplesink.h" #include "dsp/devicesamplesource.h" +#include "dsp/dspdevicesourceengine.h" +#include "dsp/dspdevicesinkengine.h" #include "dsp/dspengine.h" #include "channel/channelsourceapi.h" #include "channel/channelsinkapi.h" @@ -1129,16 +1130,16 @@ int WebAPIAdapterSrv::devicesetDeviceSettingsGet( if (deviceSet->m_deviceSourceEngine) // Single Rx { - response.setDeviceHwType(new QString(deviceSet->m_deviceSourceAPI->getHardwareId())); + response.setDeviceHwType(new QString(deviceSet->m_deviceAPI->getHardwareId())); response.setDirection(0); - DeviceSampleSource *source = deviceSet->m_deviceSourceAPI->getSampleSource(); + DeviceSampleSource *source = deviceSet->m_deviceAPI->getSampleSource(); return source->webapiSettingsGet(response, *error.getMessage()); } else if (deviceSet->m_deviceSinkEngine) // Single Tx { - response.setDeviceHwType(new QString(deviceSet->m_deviceSinkAPI->getHardwareId())); + response.setDeviceHwType(new QString(deviceSet->m_deviceAPI->getHardwareId())); response.setDirection(1); - DeviceSampleSink *sink = deviceSet->m_deviceSinkAPI->getSampleSink(); + DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink(); return sink->webapiSettingsGet(response, *error.getMessage()); } else @@ -1174,14 +1175,14 @@ int WebAPIAdapterSrv::devicesetDeviceSettingsPutPatch( *error.getMessage() = QString("Single Rx device found but other type of device requested"); return 400; } - if (deviceSet->m_deviceSourceAPI->getHardwareId() != *response.getDeviceHwType()) + if (deviceSet->m_deviceAPI->getHardwareId() != *response.getDeviceHwType()) { - *error.getMessage() = QString("Device mismatch. Found %1 input").arg(deviceSet->m_deviceSourceAPI->getHardwareId()); + *error.getMessage() = QString("Device mismatch. Found %1 input").arg(deviceSet->m_deviceAPI->getHardwareId()); return 400; } else { - DeviceSampleSource *source = deviceSet->m_deviceSourceAPI->getSampleSource(); + DeviceSampleSource *source = deviceSet->m_deviceAPI->getSampleSource(); return source->webapiSettingsPutPatch(force, deviceSettingsKeys, response, *error.getMessage()); } } @@ -1192,14 +1193,14 @@ int WebAPIAdapterSrv::devicesetDeviceSettingsPutPatch( *error.getMessage() = QString("Single Tx device found but other type of device requested"); return 400; } - else if (deviceSet->m_deviceSinkAPI->getHardwareId() != *response.getDeviceHwType()) + else if (deviceSet->m_deviceAPI->getHardwareId() != *response.getDeviceHwType()) { - *error.getMessage() = QString("Device mismatch. Found %1 output").arg(deviceSet->m_deviceSinkAPI->getHardwareId()); + *error.getMessage() = QString("Device mismatch. Found %1 output").arg(deviceSet->m_deviceAPI->getHardwareId()); return 400; } else { - DeviceSampleSink *sink = deviceSet->m_deviceSinkAPI->getSampleSink(); + DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink(); return sink->webapiSettingsPutPatch(force, deviceSettingsKeys, response, *error.getMessage()); } } @@ -1229,13 +1230,13 @@ int WebAPIAdapterSrv::devicesetDeviceRunGet( if (deviceSet->m_deviceSourceEngine) // Rx { - DeviceSampleSource *source = deviceSet->m_deviceSourceAPI->getSampleSource(); + DeviceSampleSource *source = deviceSet->m_deviceAPI->getSampleSource(); response.init(); return source->webapiRunGet(response, *error.getMessage()); } else if (deviceSet->m_deviceSinkEngine) // Tx { - DeviceSampleSink *sink = deviceSet->m_deviceSinkAPI->getSampleSink(); + DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink(); response.init(); return sink->webapiRunGet(response, *error.getMessage()); } @@ -1265,13 +1266,13 @@ int WebAPIAdapterSrv::devicesetDeviceRunPost( if (deviceSet->m_deviceSourceEngine) // Rx { - DeviceSampleSource *source = deviceSet->m_deviceSourceAPI->getSampleSource(); + DeviceSampleSource *source = deviceSet->m_deviceAPI->getSampleSource(); response.init(); return source->webapiRun(true, response, *error.getMessage()); } else if (deviceSet->m_deviceSinkEngine) // Tx { - DeviceSampleSink *sink = deviceSet->m_deviceSinkAPI->getSampleSink(); + DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink(); response.init(); return sink->webapiRun(true, response, *error.getMessage()); } @@ -1301,13 +1302,13 @@ int WebAPIAdapterSrv::devicesetDeviceRunDelete( if (deviceSet->m_deviceSourceEngine) // Rx { - DeviceSampleSource *source = deviceSet->m_deviceSourceAPI->getSampleSource(); + DeviceSampleSource *source = deviceSet->m_deviceAPI->getSampleSource(); response.init(); return source->webapiRun(false, response, *error.getMessage()); } else if (deviceSet->m_deviceSinkEngine) // Tx { - DeviceSampleSink *sink = deviceSet->m_deviceSinkAPI->getSampleSink(); + DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink(); response.init(); return sink->webapiRun(false, response, *error.getMessage()); } @@ -1337,16 +1338,16 @@ int WebAPIAdapterSrv::devicesetDeviceReportGet( if (deviceSet->m_deviceSourceEngine) // Single Rx { - response.setDeviceHwType(new QString(deviceSet->m_deviceSourceAPI->getHardwareId())); + response.setDeviceHwType(new QString(deviceSet->m_deviceAPI->getHardwareId())); response.setDirection(0); - DeviceSampleSource *source = deviceSet->m_deviceSourceAPI->getSampleSource(); + DeviceSampleSource *source = deviceSet->m_deviceAPI->getSampleSource(); return source->webapiReportGet(response, *error.getMessage()); } else if (deviceSet->m_deviceSinkEngine) // Single Tx { - response.setDeviceHwType(new QString(deviceSet->m_deviceSinkAPI->getHardwareId())); + response.setDeviceHwType(new QString(deviceSet->m_deviceAPI->getHardwareId())); response.setDirection(1); - DeviceSampleSink *sink = deviceSet->m_deviceSinkAPI->getSampleSink(); + DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink(); return sink->webapiReportGet(response, *error.getMessage()); } else @@ -1561,7 +1562,7 @@ int WebAPIAdapterSrv::devicesetChannelSettingsGet( if (deviceSet->m_deviceSourceEngine) // Single Rx { - ChannelSinkAPI *channelAPI = deviceSet->m_deviceSourceAPI->getChanelAPIAt(channelIndex); + ChannelSinkAPI *channelAPI = deviceSet->m_deviceAPI->getChanelSinkAPIAt(channelIndex); if (channelAPI == 0) { @@ -1578,7 +1579,7 @@ int WebAPIAdapterSrv::devicesetChannelSettingsGet( } else if (deviceSet->m_deviceSinkEngine) // Single Tx { - ChannelSourceAPI *channelAPI = deviceSet->m_deviceSinkAPI->getChanelAPIAt(channelIndex); + ChannelSourceAPI *channelAPI = deviceSet->m_deviceAPI->getChanelSourceAPIAt(channelIndex); if (channelAPI == 0) { @@ -1620,7 +1621,7 @@ int WebAPIAdapterSrv::devicesetChannelReportGet( if (deviceSet->m_deviceSourceEngine) // Single Rx { - ChannelSinkAPI *channelAPI = deviceSet->m_deviceSourceAPI->getChanelAPIAt(channelIndex); + ChannelSinkAPI *channelAPI = deviceSet->m_deviceAPI->getChanelSinkAPIAt(channelIndex); if (channelAPI == 0) { @@ -1637,7 +1638,7 @@ int WebAPIAdapterSrv::devicesetChannelReportGet( } else if (deviceSet->m_deviceSinkEngine) // Single Tx { - ChannelSourceAPI *channelAPI = deviceSet->m_deviceSinkAPI->getChanelAPIAt(channelIndex); + ChannelSourceAPI *channelAPI = deviceSet->m_deviceAPI->getChanelSourceAPIAt(channelIndex); if (channelAPI == 0) { @@ -1681,7 +1682,7 @@ int WebAPIAdapterSrv::devicesetChannelSettingsPutPatch( if (deviceSet->m_deviceSourceEngine) // Rx { - ChannelSinkAPI *channelAPI = deviceSet->m_deviceSourceAPI->getChanelAPIAt(channelIndex); + ChannelSinkAPI *channelAPI = deviceSet->m_deviceAPI->getChanelSinkAPIAt(channelIndex); if (channelAPI == 0) { @@ -1709,7 +1710,7 @@ int WebAPIAdapterSrv::devicesetChannelSettingsPutPatch( } else if (deviceSet->m_deviceSinkEngine) // Tx { - ChannelSourceAPI *channelAPI = deviceSet->m_deviceSinkAPI->getChanelAPIAt(channelIndex); + ChannelSourceAPI *channelAPI = deviceSet->m_deviceAPI->getChanelSourceAPIAt(channelIndex); if (channelAPI == 0) { @@ -1774,12 +1775,12 @@ void WebAPIAdapterSrv::getDeviceSet(SWGSDRangel::SWGDeviceSet *swgDeviceSet, con if (deviceSet->m_deviceSinkEngine) // Single Tx data { samplingDevice->setDirection(1); - *samplingDevice->getHwType() = deviceSet->m_deviceSinkAPI->getHardwareId(); - *samplingDevice->getSerial() = deviceSet->m_deviceSinkAPI->getSampleSinkSerial(); - samplingDevice->setSequence(deviceSet->m_deviceSinkAPI->getSampleSinkSequence()); - samplingDevice->setDeviceNbStreams(deviceSet->m_deviceSinkAPI->getNbItems()); - samplingDevice->setDeviceStreamIndex(deviceSet->m_deviceSinkAPI->getItemIndex()); - deviceSet->m_deviceSinkAPI->getDeviceEngineStateStr(*samplingDevice->getState()); + *samplingDevice->getHwType() = deviceSet->m_deviceAPI->getHardwareId(); + *samplingDevice->getSerial() = deviceSet->m_deviceAPI->getSamplingDeviceSerial(); + samplingDevice->setSequence(deviceSet->m_deviceAPI->getSamplingDeviceSequence()); + samplingDevice->setDeviceNbStreams(deviceSet->m_deviceAPI->getNbItems()); + samplingDevice->setDeviceStreamIndex(deviceSet->m_deviceAPI->getItemIndex()); + deviceSet->m_deviceAPI->getDeviceEngineStateStr(*samplingDevice->getState()); DeviceSampleSink *sampleSink = deviceSet->m_deviceSinkEngine->getSink(); if (sampleSink) { @@ -1787,14 +1788,14 @@ void WebAPIAdapterSrv::getDeviceSet(SWGSDRangel::SWGDeviceSet *swgDeviceSet, con samplingDevice->setBandwidth(sampleSink->getSampleRate()); } - swgDeviceSet->setChannelcount(deviceSet->m_deviceSinkAPI->getNbChannels()); + swgDeviceSet->setChannelcount(deviceSet->m_deviceAPI->getNbSourceChannels()); QList *channels = swgDeviceSet->getChannels(); for (int i = 0; i < swgDeviceSet->getChannelcount(); i++) { channels->append(new SWGSDRangel::SWGChannel); channels->back()->init(); - ChannelSourceAPI *channel = deviceSet->m_deviceSinkAPI->getChanelAPIAt(i); + ChannelSourceAPI *channel = deviceSet->m_deviceAPI->getChanelSourceAPIAt(i); channels->back()->setDeltaFrequency(channel->getCenterFrequency()); channels->back()->setIndex(channel->getIndexInDeviceSet()); channels->back()->setUid(channel->getUID()); @@ -1806,12 +1807,12 @@ void WebAPIAdapterSrv::getDeviceSet(SWGSDRangel::SWGDeviceSet *swgDeviceSet, con if (deviceSet->m_deviceSourceEngine) // Single Rx data { samplingDevice->setDirection(1); - *samplingDevice->getHwType() = deviceSet->m_deviceSourceAPI->getHardwareId(); - *samplingDevice->getSerial() = deviceSet->m_deviceSourceAPI->getSampleSourceSerial(); - samplingDevice->setSequence(deviceSet->m_deviceSourceAPI->getSampleSourceSequence()); - samplingDevice->setDeviceNbStreams(deviceSet->m_deviceSourceAPI->getNbItems()); - samplingDevice->setDeviceStreamIndex(deviceSet->m_deviceSourceAPI->getItemIndex()); - deviceSet->m_deviceSourceAPI->getDeviceEngineStateStr(*samplingDevice->getState()); + *samplingDevice->getHwType() = deviceSet->m_deviceAPI->getHardwareId(); + *samplingDevice->getSerial() = deviceSet->m_deviceAPI->getSamplingDeviceSerial(); + samplingDevice->setSequence(deviceSet->m_deviceAPI->getSamplingDeviceSequence()); + samplingDevice->setDeviceNbStreams(deviceSet->m_deviceAPI->getNbItems()); + samplingDevice->setDeviceStreamIndex(deviceSet->m_deviceAPI->getItemIndex()); + deviceSet->m_deviceAPI->getDeviceEngineStateStr(*samplingDevice->getState()); DeviceSampleSource *sampleSource = deviceSet->m_deviceSourceEngine->getSource(); if (sampleSource) { @@ -1819,14 +1820,14 @@ void WebAPIAdapterSrv::getDeviceSet(SWGSDRangel::SWGDeviceSet *swgDeviceSet, con samplingDevice->setBandwidth(sampleSource->getSampleRate()); } - swgDeviceSet->setChannelcount(deviceSet->m_deviceSourceAPI->getNbChannels()); + swgDeviceSet->setChannelcount(deviceSet->m_deviceAPI->getNbSinkChannels()); QList *channels = swgDeviceSet->getChannels(); for (int i = 0; i < swgDeviceSet->getChannelcount(); i++) { channels->append(new SWGSDRangel::SWGChannel); channels->back()->init(); - ChannelSinkAPI *channel = deviceSet->m_deviceSourceAPI->getChanelAPIAt(i); + ChannelSinkAPI *channel = deviceSet->m_deviceAPI->getChanelSinkAPIAt(i); channels->back()->setDeltaFrequency(channel->getCenterFrequency()); channels->back()->setIndex(channel->getIndexInDeviceSet()); channels->back()->setUid(channel->getUID()); @@ -1844,14 +1845,14 @@ void WebAPIAdapterSrv::getChannelsDetail(SWGSDRangel::SWGChannelsDetail *channel if (deviceSet->m_deviceSinkEngine) // Tx data { - channelsDetail->setChannelcount(deviceSet->m_deviceSinkAPI->getNbChannels()); + channelsDetail->setChannelcount(deviceSet->m_deviceAPI->getNbSourceChannels()); QList *channels = channelsDetail->getChannels(); for (int i = 0; i < channelsDetail->getChannelcount(); i++) { channels->append(new SWGSDRangel::SWGChannel); channels->back()->init(); - ChannelSourceAPI *channel = deviceSet->m_deviceSinkAPI->getChanelAPIAt(i); + ChannelSourceAPI *channel = deviceSet->m_deviceAPI->getChanelSourceAPIAt(i); channels->back()->setDeltaFrequency(channel->getCenterFrequency()); channels->back()->setIndex(channel->getIndexInDeviceSet()); channels->back()->setUid(channel->getUID()); @@ -1870,14 +1871,14 @@ void WebAPIAdapterSrv::getChannelsDetail(SWGSDRangel::SWGChannelsDetail *channel if (deviceSet->m_deviceSourceEngine) // Rx data { - channelsDetail->setChannelcount(deviceSet->m_deviceSourceAPI->getNbChannels()); + channelsDetail->setChannelcount(deviceSet->m_deviceAPI->getNbSinkChannels()); QList *channels = channelsDetail->getChannels(); for (int i = 0; i < channelsDetail->getChannelcount(); i++) { channels->append(new SWGSDRangel::SWGChannel); channels->back()->init(); - ChannelSinkAPI *channel = deviceSet->m_deviceSourceAPI->getChanelAPIAt(i); + ChannelSinkAPI *channel = deviceSet->m_deviceAPI->getChanelSinkAPIAt(i); channels->back()->setDeltaFrequency(channel->getCenterFrequency()); channels->back()->setIndex(channel->getIndexInDeviceSet()); channels->back()->setUid(channel->getUID());