Massive UI revamping (v7): Implemented channel move to another device and more

plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp

@@ -80,6 +80,18 @@ BeamSteeringCWMod::~BeamSteeringCWMod()
     delete m_thread;
 }
 
+void BeamSteeringCWMod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeMIMOChannel(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addMIMOChannel(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 void BeamSteeringCWMod::startSources()
 {
     qDebug("BeamSteeringCWMod::startSources");

plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h

@@ -88,8 +88,10 @@ public:
     BeamSteeringCWMod(DeviceAPI *deviceAPI);
 	virtual ~BeamSteeringCWMod();
 	virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
-	virtual void startSinks() {}
+    virtual void startSinks() {}
 	virtual void stopSinks() {}
     virtual void startSources(); //!< thread start()
     virtual void stopSources(); //!< thread exit() and wait()

plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h

@@ -56,6 +56,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 private:
     Ui::BeamSteeringCWModGUI* ui;

plugins/channelmimo/interferometer/interferometer.cpp

@@ -82,6 +82,18 @@ Interferometer::~Interferometer()
     delete m_thread;
 }
 
+void Interferometer::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeMIMOChannel(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addMIMOChannel(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 void Interferometer::startSinks()
 {
     if (m_deviceSampleRate != 0) {

plugins/channelmimo/interferometer/interferometer.h

@@ -88,6 +88,8 @@ public:
     Interferometer(DeviceAPI *deviceAPI);
 	virtual ~Interferometer();
 	virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
 	virtual void startSinks(); //!< thread start()
 	virtual void stopSinks();  //!< thread exit() and wait()

plugins/channelmimo/interferometer/interferometergui.h

@@ -55,6 +55,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 private:
 	Ui::InterferometerGUI* ui;

plugins/channelrx/chanalyzer/chanalyzer.cpp

@@ -92,6 +92,18 @@ ChannelAnalyzer::~ChannelAnalyzer()
     qDebug("ChannelAnalyzer::~ChannelAnalyzer: done");
 }
 
+void ChannelAnalyzer::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 int ChannelAnalyzer::getChannelSampleRate()
 {
     DeviceSampleSource *source = m_deviceAPI->getSampleSource();

plugins/channelrx/chanalyzer/chanalyzer.h

@@ -64,6 +64,8 @@ public:
     ChannelAnalyzer(DeviceAPI *deviceAPI);
 	virtual ~ChannelAnalyzer();
 	virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
     SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
     ScopeVis *getScopeVis() { return &m_scopeVis; }
     void setScopeVis(ScopeVis *scopeVis) { m_basebandSink->setScopeVis(scopeVis); }

plugins/channelrx/chanalyzer/chanalyzergui.h

@@ -57,6 +57,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
 	void channelMarkerChangedByCursor();

plugins/channelrx/demodadsb/adsbdemod.cpp

@@ -109,6 +109,18 @@ ADSBDemod::~ADSBDemod()
     delete m_thread;
 }
 
+void ADSBDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t ADSBDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodadsb/adsbdemod.h

@@ -65,6 +65,8 @@ public:
     ADSBDemod(DeviceAPI *deviceAPI);
     virtual ~ADSBDemod();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demodadsb/adsbdemodgui.h

@@ -760,6 +760,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
     void highlightAircraft(Aircraft *aircraft);
     void targetAircraft(Aircraft *aircraft);

plugins/channelrx/demodais/aisdemod.cpp

@@ -97,6 +97,18 @@ AISDemod::~AISDemod()
     delete m_basebandSink;
 }
 
+void AISDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t AISDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodais/aisdemod.h

@@ -93,6 +93,8 @@ public:
     AISDemod(DeviceAPI *deviceAPI);
     virtual ~AISDemod();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demodais/aisdemodgui.h

@@ -65,6 +65,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
     void channelMarkerChangedByCursor();

plugins/channelrx/demodam/amdemod.cpp

@@ -113,6 +113,18 @@ AMDemod::~AMDemod()
     delete m_basebandSink;
 }
 
+void AMDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t AMDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodam/amdemod.h

@@ -64,6 +64,8 @@ public:
     AMDemod(DeviceAPI *deviceAPI);
 	virtual ~AMDemod();
 	virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demodam/amdemodgui.h

@@ -39,6 +39,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
 	void channelMarkerChangedByCursor();

plugins/channelrx/demodapt/aptdemod.cpp

@@ -115,6 +115,18 @@ APTDemod::~APTDemod()
     delete m_basebandSink;
 }
 
+void APTDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t APTDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodapt/aptdemod.h

@@ -188,6 +188,8 @@ public:
     APTDemod(DeviceAPI *deviceAPI);
     virtual ~APTDemod();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demodapt/aptdemodgui.h

@@ -83,6 +83,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
     void channelMarkerChangedByCursor();

plugins/channelrx/demodatv/atvdemod.cpp

@@ -75,6 +75,18 @@ ATVDemod::~ATVDemod()
     delete m_basebandSink;
 }
 
+void ATVDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 void ATVDemod::start()
 {
 	qDebug("ATVDemod::start");

plugins/channelrx/demodatv/atvdemod.h

@@ -63,6 +63,8 @@ public:
     ATVDemod(DeviceAPI *deviceAPI);
 	virtual ~ATVDemod();
 	virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demodatv/atvdemodgui.h

@@ -58,6 +58,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
 	void channelMarkerChangedByCursor();

plugins/channelrx/demodbfm/bfmdemod.cpp

@@ -96,6 +96,18 @@ BFMDemod::~BFMDemod()
     delete m_thread;
 }
 
+void BFMDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t BFMDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodbfm/bfmdemod.h

@@ -70,6 +70,8 @@ public:
 	BFMDemod(DeviceAPI *deviceAPI);
 	virtual ~BFMDemod();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
     SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
     void setBasebandMessageQueueToGUI(MessageQueue *messageQueue) { m_basebandSink->setMessageQueueToGUI(messageQueue); }
 

plugins/channelrx/demodbfm/bfmdemodgui.h

@@ -56,6 +56,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
     void channelMarkerChangedByCursor();

plugins/channelrx/demodchirpchat/chirpchatdemod.cpp

@@ -97,6 +97,18 @@ ChirpChatDemod::~ChirpChatDemod()
     delete m_thread;
 }
 
+void ChirpChatDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t ChirpChatDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodchirpchat/chirpchatdemod.h

@@ -202,6 +202,8 @@ public:
 	ChirpChatDemod(DeviceAPI* deviceAPI);
 	virtual ~ChirpChatDemod();
 	virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
     SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
 
     using BasebandSampleSink::feed;

plugins/channelrx/demodchirpchat/chirpchatdemodgui.h

@@ -54,6 +54,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 private slots:
 	void channelMarkerChangedByCursor();

plugins/channelrx/demoddab/dabdemod.cpp

@@ -108,6 +108,18 @@ DABDemod::~DABDemod()
     delete m_basebandSink;
 }
 
+void DABDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t DABDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demoddab/dabdemod.h

@@ -313,6 +313,8 @@ public:
     DABDemod(DeviceAPI *deviceAPI);
     virtual ~DABDemod();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demoddab/dabdemodgui.h

@@ -61,6 +61,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
     void channelMarkerChangedByCursor();

plugins/channelrx/demoddatv/datvdemod.cpp

@@ -88,6 +88,18 @@ DATVDemod::~DATVDemod()
     m_basebandSink->deleteLater();
 }
 
+void DATVDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 void DATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst)
 {
     (void) firstOfBurst;

plugins/channelrx/demoddatv/datvdemod.h

@@ -43,8 +43,10 @@ public:
 
     DATVDemod(DeviceAPI *);
     virtual ~DATVDemod();
-
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
+
     virtual void getIdentifier(QString& id) { id = objectName(); }
     virtual QString getIdentifier() const { return objectName(); }
     virtual void getTitle(QString& title) { title = objectName(); }

plugins/channelrx/demoddatv/datvdemodgui.cpp

@@ -97,7 +97,7 @@ bool DATVDemodGUI::handleMessage(const Message& message)
     {
         DATVDemod::MsgConfigureDATVDemod& cfg = (DATVDemod::MsgConfigureDATVDemod&) message;
         m_settings = cfg.getSettings();
-        m_objChannelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
+        m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
         return true;
     }
@@ -132,14 +132,14 @@ void DATVDemodGUI::handleInputMessages()
 
 void DATVDemodGUI::channelMarkerChangedByCursor()
 {
-    ui->deltaFrequency->setValue(m_objChannelMarker.getCenterFrequency());
+    ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency());
-    m_settings.m_centerFrequency = m_objChannelMarker.getCenterFrequency();
+    m_settings.m_centerFrequency = m_channelMarker.getCenterFrequency();
     applySettings();
 }
 
 void DATVDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_objChannelMarker.getHighlighted());
+    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
 }
 
 
@@ -156,7 +156,7 @@ void DATVDemodGUI::onMenuDialogCalled(const QPoint &p)
 {
     if (m_contextMenuType == ContextMenuChannelSettings)
     {
-        BasicChannelSettingsDialog dialog(&m_objChannelMarker, this);
+        BasicChannelSettingsDialog dialog(&m_channelMarker, this);
         dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
         dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
         dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
@@ -165,8 +165,8 @@ void DATVDemodGUI::onMenuDialogCalled(const QPoint &p)
         dialog.move(p);
         dialog.exec();
 
-        m_settings.m_rgbColor = m_objChannelMarker.getColor().rgb();
+        m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
-        m_settings.m_title = m_objChannelMarker.getTitle();
+        m_settings.m_title = m_channelMarker.getTitle();
         m_settings.m_useReverseAPI = dialog.useReverseAPI();
         m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
         m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
@@ -174,7 +174,7 @@ void DATVDemodGUI::onMenuDialogCalled(const QPoint &p)
         m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
 
         setWindowTitle(m_settings.m_title);
-        setTitle(m_objChannelMarker.getTitle());
+        setTitle(m_channelMarker.getTitle());
         setTitleColor(m_settings.m_rgbColor);
 
         applySettings();
@@ -188,8 +188,8 @@ void DATVDemodGUI::onMenuDialogCalled(const QPoint &p)
         dialog.exec();
 
         m_settings.m_streamIndex = dialog.getSelectedStreamIndex();
-        m_objChannelMarker.clearStreamIndexes();
+        m_channelMarker.clearStreamIndexes();
-        m_objChannelMarker.addStreamIndex(m_settings.m_streamIndex);
+        m_channelMarker.addStreamIndex(m_settings.m_streamIndex);
         displayStreamIndex();
         applySettings();
     }
@@ -202,7 +202,7 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba
     ui(new Ui::DATVDemodGUI),
     m_objPluginAPI(objPluginAPI),
     m_deviceUISet(deviceUISet),
-    m_objChannelMarker(this),
+    m_channelMarker(this),
     m_deviceCenterFrequency(0),
     m_basebandSampleRate(1),
     m_blnBasicSettingsShown(false),
@@ -241,7 +241,7 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba
         connect(m_datvDemod->getUDPStream(), &DATVUDPStream::fifoData, this, &DATVDemodGUI::on_StreamDataAvailable);
     }
 
-    m_settings.setChannelMarker(&m_objChannelMarker);
+    m_settings.setChannelMarker(&m_channelMarker);
     m_settings.setRollupState(&m_rollupState);
 
     connect(ui->screenTV_2, &DATVideoRender::onMetaDataChanged, this, &DATVDemodGUI::on_StreamMetaDataChanged);
@@ -264,18 +264,18 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba
     ui->rfBandwidth->setColorMapper(ColorMapper(ColorMapper::GrayYellow));
     ui->rfBandwidth->setValueRange(true, 8, 0, 50000000);
 
-    m_objChannelMarker.blockSignals(true);
+    m_channelMarker.blockSignals(true);
-    m_objChannelMarker.setColor(Qt::magenta);
+    m_channelMarker.setColor(Qt::magenta);
-    m_objChannelMarker.setBandwidth(6000000);
+    m_channelMarker.setBandwidth(6000000);
-    m_objChannelMarker.setCenterFrequency(0);
+    m_channelMarker.setCenterFrequency(0);
-    m_objChannelMarker.setTitle("DATV Demodulator");
+    m_channelMarker.setTitle("DATV Demodulator");
-    m_objChannelMarker.blockSignals(false);
+    m_channelMarker.blockSignals(false);
-    m_objChannelMarker.setVisible(true);
+    m_channelMarker.setVisible(true);
 
-    connect(&m_objChannelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
+    connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
-    connect(&m_objChannelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
+    connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
 
-    m_deviceUISet->addChannelMarker(&m_objChannelMarker);
+    m_deviceUISet->addChannelMarker(&m_channelMarker);
 
     // QPixmap pixmapTarget = QPixmap(":/film.png");
     // pixmapTarget = pixmapTarget.scaled(16, 16, Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -312,18 +312,18 @@ void DATVDemodGUI::blockApplySettings(bool blnBlock)
 
 void DATVDemodGUI::displaySettings()
 {
-    m_objChannelMarker.blockSignals(true);
+    m_channelMarker.blockSignals(true);
-    m_objChannelMarker.setCenterFrequency(m_settings.m_centerFrequency);
+    m_channelMarker.setCenterFrequency(m_settings.m_centerFrequency);
-    m_objChannelMarker.setColor(m_settings.m_rgbColor);
+    m_channelMarker.setColor(m_settings.m_rgbColor);
-    m_objChannelMarker.setTitle(m_settings.m_title);
+    m_channelMarker.setTitle(m_settings.m_title);
-    m_objChannelMarker.blockSignals(false);
+    m_channelMarker.blockSignals(false);
-    m_objChannelMarker.setBandwidth(m_settings.m_rfBandwidth);
+    m_channelMarker.setBandwidth(m_settings.m_rfBandwidth);
 
     blockApplySettings(true);
 
     setTitleColor(m_settings.m_rgbColor);
-    setWindowTitle(m_objChannelMarker.getTitle());
+    setWindowTitle(m_channelMarker.getTitle());
-    setTitle(m_objChannelMarker.getTitle());
+    setTitle(m_channelMarker.getTitle());
 
     ui->deltaFrequency->setValue(m_settings.m_centerFrequency);
     ui->chkAllowDrift->setChecked(m_settings.m_allowDrift);
@@ -475,7 +475,7 @@ void DATVDemodGUI::applySettings(bool force)
     {
         qDebug("DATVDemodGUI::applySettings");
 
-        setTitleColor(m_objChannelMarker.getColor());
+        setTitleColor(m_channelMarker.getColor());
 
         QString msg = tr("DATVDemodGUI::applySettings: force: %1").arg(force ? "true" : "false");
         m_settings.debug(msg);
@@ -488,14 +488,14 @@ void DATVDemodGUI::applySettings(bool force)
 void DATVDemodGUI::leaveEvent(QEvent*)
 {
     blockApplySettings(true);
-    m_objChannelMarker.setHighlighted(false);
+    m_channelMarker.setHighlighted(false);
     blockApplySettings(false);
 }
 
 void DATVDemodGUI::enterEvent(QEvent*)
 {
     blockApplySettings(true);
-    m_objChannelMarker.setHighlighted(true);
+    m_channelMarker.setHighlighted(true);
     blockApplySettings(false);
 }
 
@@ -790,16 +790,16 @@ void DATVDemodGUI::on_StreamDataAvailable(int intBytes, int intPercent, qint64 i
 
 void DATVDemodGUI::on_deltaFrequency_changed(qint64 value)
 {
-    m_objChannelMarker.setCenterFrequency(value);
+    m_channelMarker.setCenterFrequency(value);
-    m_settings.m_centerFrequency = m_objChannelMarker.getCenterFrequency();
+    m_settings.m_centerFrequency = m_channelMarker.getCenterFrequency();
     updateAbsoluteCenterFrequency();
     applySettings();
 }
 
 void DATVDemodGUI::on_rfBandwidth_changed(qint64 value)
 {
-    m_objChannelMarker.setBandwidth(value);
+    m_channelMarker.setBandwidth(value);
-    m_settings.m_rfBandwidth = m_objChannelMarker.getBandwidth();
+    m_settings.m_rfBandwidth = m_channelMarker.getBandwidth();
     applySettings();
 }
 

plugins/channelrx/demoddatv/datvdemodgui.h

@@ -58,6 +58,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
     virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
 
@@ -109,7 +110,7 @@ private:
     PluginAPI* m_objPluginAPI;
     DeviceUISet* m_deviceUISet;
 
-    ChannelMarker m_objChannelMarker;
+    ChannelMarker m_channelMarker;
     RollupState m_rollupState;
     DATVDemod* m_datvDemod;
     MessageQueue m_inputMessageQueue;

plugins/channelrx/demoddsd/dsddemod.cpp

@@ -98,6 +98,18 @@ DSDDemod::~DSDDemod()
     delete m_thread;
 }
 
+void DSDDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t DSDDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demoddsd/dsddemod.h

@@ -65,6 +65,8 @@ public:
     DSDDemod(DeviceAPI *deviceAPI);
 	virtual ~DSDDemod();
 	virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demoddsd/dsddemodgui.h

@@ -60,6 +60,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
 	void channelMarkerChangedByCursor();

plugins/channelrx/demodfreedv/freedvdemod.cpp

@@ -89,6 +89,18 @@ FreeDVDemod::~FreeDVDemod()
     delete m_thread;
 }
 
+void FreeDVDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t FreeDVDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodfreedv/freedvdemod.h

@@ -77,6 +77,8 @@ public:
     FreeDVDemod(DeviceAPI *deviceAPI);
 	virtual ~FreeDVDemod();
 	virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
     SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
 
     using BasebandSampleSink::feed;

plugins/channelrx/demodfreedv/freedvdemodgui.h

@@ -58,6 +58,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
 	void channelMarkerChangedByCursor();

plugins/channelrx/demodfreedv/freedvdemodgui.ui

@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>442</width>
+    <width>412</width>
-    <height>523</height>
+    <height>478</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -36,7 +36,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>441</width>
+     <width>410</width>
      <height>171</height>
     </rect>
    </property>
@@ -661,12 +661,24 @@
   <widget class="QWidget" name="spectrumContainer" native="true">
    <property name="geometry">
     <rect>
-     <x>10</x>
+     <x>0</x>
      <y>170</y>
-     <width>218</width>
+     <width>410</width>
      <height>284</height>
     </rect>
    </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>410</width>
+     <height>0</height>
+    </size>
+   </property>
    <property name="windowTitle">
     <string>Channel Spectrum</string>
    </property>
@@ -688,6 +700,12 @@
     </property>
     <item>
      <widget class="GLSpectrum" name="glSpectrum" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <property name="minimumSize">
        <size>
         <width>200</width>
@@ -715,12 +733,23 @@
    <header>gui/rollupcontents.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
+  </customwidget>
   <customwidget>
    <class>LevelMeterSignalDB</class>
    <extends>QWidget</extends>
    <header>gui/levelmeter.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ValueDialZ</class>
+   <extends>QWidget</extends>
+   <header>gui/valuedialz.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>GLSpectrum</class>
    <extends>QWidget</extends>
@@ -733,17 +762,6 @@
    <header>gui/glspectrumgui.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ValueDialZ</class>
-   <extends>QWidget</extends>
-   <header>gui/valuedialz.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ButtonSwitch</class>
-   <extends>QToolButton</extends>
-   <header>gui/buttonswitch.h</header>
-  </customwidget>
   <customwidget>
    <class>LevelMeterVU</class>
    <extends>QWidget</extends>

plugins/channelrx/demodnfm/nfmdemod.cpp

@@ -102,6 +102,18 @@ NFMDemod::~NFMDemod()
     delete m_thread;
 }
 
+void NFMDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t NFMDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodnfm/nfmdemod.h

@@ -64,6 +64,8 @@ public:
     NFMDemod(DeviceAPI *deviceAPI);
 	virtual ~NFMDemod();
 	virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demodnfm/nfmdemodgui.h

@@ -38,6 +38,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
 	void channelMarkerChangedByCursor();

plugins/channelrx/demodpacket/packetdemod.cpp

@@ -99,6 +99,18 @@ PacketDemod::~PacketDemod()
     delete m_basebandSink;
 }
 
+void PacketDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t PacketDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodpacket/packetdemod.h

@@ -67,6 +67,8 @@ public:
     PacketDemod(DeviceAPI *deviceAPI);
     virtual ~PacketDemod();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demodpacket/packetdemodgui.h

@@ -66,6 +66,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
     void channelMarkerChangedByCursor();

plugins/channelrx/demodpager/pagerdemod.cpp

@@ -92,6 +92,18 @@ PagerDemod::~PagerDemod()
     delete m_basebandSink;
 }
 
+void PagerDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t PagerDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodpager/pagerdemod.h

@@ -122,6 +122,8 @@ public:
     PagerDemod(DeviceAPI *deviceAPI);
     virtual ~PagerDemod();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demodpager/pagerdemodgui.h

@@ -60,6 +60,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
     void channelMarkerChangedByCursor();

plugins/channelrx/demodradiosonde/radiosondedemod.cpp

@@ -96,6 +96,18 @@ RadiosondeDemod::~RadiosondeDemod()
     delete m_basebandSink;
 }
 
+void RadiosondeDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t RadiosondeDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodradiosonde/radiosondedemod.h

@@ -102,6 +102,8 @@ public:
     RadiosondeDemod(DeviceAPI *deviceAPI);
     virtual ~RadiosondeDemod();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demodradiosonde/radiosondedemodgui.h

@@ -61,6 +61,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
     void channelMarkerChangedByCursor();

plugins/channelrx/demodssb/ssbdemod.cpp

@@ -96,6 +96,18 @@ SSBDemod::~SSBDemod()
     delete m_thread;
 }
 
+void SSBDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t SSBDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodssb/ssbdemod.h

@@ -66,6 +66,8 @@ public:
 	SSBDemod(DeviceAPI *deviceAPI);
 	virtual ~SSBDemod();
 	virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
     SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
 
     using BasebandSampleSink::feed;

plugins/channelrx/demodssb/ssbdemodgui.h

@@ -41,6 +41,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
 	void channelMarkerChangedByCursor();

plugins/channelrx/demodssb/ssbdemodgui.ui

@@ -969,17 +969,25 @@
      </widget>
     </item>
     <item>
-     <widget class="GLSpectrumGUI" name="spectrumGUI" native="true"/>
+     <widget class="GLSpectrumGUI" name="spectrumGUI" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>30</height>
+       </size>
+      </property>
+     </widget>
     </item>
    </layout>
   </widget>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>ButtonSwitch</class>
-   <extends>QToolButton</extends>
-   <header>gui/buttonswitch.h</header>
-  </customwidget>
   <customwidget>
    <class>RollupContents</class>
    <extends>QWidget</extends>
@@ -987,10 +995,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ValueDialZ</class>
+   <class>ButtonSwitch</class>
-   <extends>QWidget</extends>
+   <extends>QToolButton</extends>
-   <header>gui/valuedialz.h</header>
+   <header>gui/buttonswitch.h</header>
-   <container>1</container>
   </customwidget>
   <customwidget>
    <class>LevelMeterSignalDB</class>
@@ -998,6 +1005,12 @@
    <header>gui/levelmeter.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ValueDialZ</class>
+   <extends>QWidget</extends>
+   <header>gui/valuedialz.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>GLSpectrum</class>
    <extends>QWidget</extends>

plugins/channelrx/demodvor/vordemod.cpp

@@ -96,6 +96,18 @@ VORDemod::~VORDemod()
     delete m_basebandSink;
 }
 
+void VORDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t VORDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodvor/vordemod.h

@@ -65,6 +65,8 @@ public:
     VORDemod(DeviceAPI *deviceAPI);
     virtual ~VORDemod();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demodvor/vordemodgui.h

@@ -219,6 +219,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
     void selectVOR(VORGUI *vorGUI, bool selected);
 

plugins/channelrx/demodvorsc/vordemodsc.cpp

@@ -98,6 +98,18 @@ VORDemodSC::~VORDemodSC()
     delete m_basebandSink;
 }
 
+void VORDemodSC::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t VORDemodSC::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodvorsc/vordemodsc.h

@@ -65,6 +65,8 @@ public:
     VORDemodSC(DeviceAPI *deviceAPI);
     virtual ~VORDemodSC();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demodvorsc/vordemodscgui.h

@@ -56,6 +56,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
     void channelMarkerChangedByCursor();

plugins/channelrx/demodwfm/wfmdemod.cpp

@@ -99,6 +99,18 @@ WFMDemod::~WFMDemod()
     delete m_thread;
 }
 
+void WFMDemod::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t WFMDemod::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/demodwfm/wfmdemod.h

@@ -63,6 +63,8 @@ public:
 	WFMDemod(DeviceAPI *deviceAPI);
 	virtual ~WFMDemod();
 	virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
 	virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/demodwfm/wfmdemodgui.h

@@ -36,6 +36,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
 	void channelMarkerChangedByCursor();

plugins/channelrx/filesink/filesink.cpp

@@ -101,6 +101,18 @@ FileSink::~FileSink()
     delete m_basebandSink;
 }
 
+void FileSink::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 void FileSink::setMessageQueueToGUI(MessageQueue* queue)
 {
     ChannelAPI::setMessageQueueToGUI(queue);

plugins/channelrx/filesink/filesink.h

@@ -84,6 +84,8 @@ public:
     FileSink(DeviceAPI *deviceAPI);
     virtual ~FileSink();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/filesink/filesinkgui.h

@@ -57,6 +57,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
 	void channelMarkerChangedByCursor();

plugins/channelrx/freqtracker/freqtracker.cpp

@@ -101,6 +101,18 @@ FreqTracker::~FreqTracker()
     delete m_thread;
 }
 
+void FreqTracker::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t FreqTracker::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/freqtracker/freqtracker.h

@@ -63,6 +63,8 @@ public:
     FreqTracker(DeviceAPI *deviceAPI);
 	virtual ~FreqTracker();
 	virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/freqtracker/freqtrackergui.h

@@ -57,6 +57,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
 	void channelMarkerChangedByCursor();

plugins/channelrx/localsink/localsink.cpp

@@ -93,6 +93,18 @@ LocalSink::~LocalSink()
     delete m_thread;
 }
 
+void LocalSink::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t LocalSink::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/localsink/localsink.h

@@ -64,6 +64,8 @@ public:
     LocalSink(DeviceAPI *deviceAPI);
     virtual ~LocalSink();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/localsink/localsinkgui.h

@@ -56,6 +56,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 private:
     Ui::LocalSinkGUI* ui;

plugins/channelrx/noisefigure/noisefigure.cpp

@@ -110,6 +110,18 @@ NoiseFigure::~NoiseFigure()
     delete m_basebandSink;
 }
 
+void NoiseFigure::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t NoiseFigure::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/noisefigure/noisefigure.h

@@ -172,6 +172,8 @@ public:
     NoiseFigure(DeviceAPI *deviceAPI);
     virtual ~NoiseFigure();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/noisefigure/noisefiguregui.h

@@ -63,6 +63,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
     void channelMarkerChangedByCursor();

plugins/channelrx/radioastronomy/radioastronomy.cpp

@@ -154,6 +154,18 @@ RadioAstronomy::~RadioAstronomy()
     delete m_worker;
 }
 
+void RadioAstronomy::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t RadioAstronomy::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/radioastronomy/radioastronomy.h

@@ -346,6 +346,8 @@ public:
     RadioAstronomy(DeviceAPI *deviceAPI);
     virtual ~RadioAstronomy();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/radioastronomy/radioastronomygui.h

@@ -206,6 +206,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
     void channelMarkerChangedByCursor();

plugins/channelrx/radioclock/radioclock.cpp

@@ -99,6 +99,18 @@ RadioClock::~RadioClock()
     delete m_basebandSink;
 }
 
+void RadioClock::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t RadioClock::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/radioclock/radioclock.h

@@ -112,6 +112,8 @@ public:
     RadioClock(DeviceAPI *deviceAPI);
     virtual ~RadioClock();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/radioclock/radioclockgui.h

@@ -58,6 +58,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
     void channelMarkerChangedByCursor();

plugins/channelrx/remotesink/remotesink.cpp

@@ -99,6 +99,18 @@ RemoteSink::~RemoteSink()
     delete m_basebandSink;
 }
 
+void RemoteSink::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t RemoteSink::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/remotesink/remotesink.h

@@ -65,6 +65,8 @@ public:
     RemoteSink(DeviceAPI *deviceAPI);
     virtual ~RemoteSink();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/remotesink/remotesinkgui.h

@@ -56,6 +56,7 @@ public:
     virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 private:
     Ui::RemoteSinkGUI* ui;

plugins/channelrx/sigmffilesink/sigmffilesink.cpp

@@ -101,6 +101,18 @@ SigMFFileSink::~SigMFFileSink()
     delete m_basebandSink;
 }
 
+void SigMFFileSink::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 void SigMFFileSink::setMessageQueueToGUI(MessageQueue* queue)
 {
     ChannelAPI::setMessageQueueToGUI(queue);

plugins/channelrx/sigmffilesink/sigmffilesink.h

@@ -84,6 +84,8 @@ public:
     SigMFFileSink(DeviceAPI *deviceAPI);
     virtual ~SigMFFileSink();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);

plugins/channelrx/sigmffilesink/sigmffilesinkgui.h

@@ -57,6 +57,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
 	void channelMarkerChangedByCursor();

plugins/channelrx/udpsink/udpsink.cpp

@@ -92,6 +92,18 @@ UDPSink::~UDPSink()
     delete m_thread;
 }
 
+void UDPSink::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSinkAPI(this);
+        m_deviceAPI->removeChannelSink(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSink(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 uint32_t UDPSink::getNumberOfDeviceStreams() const
 {
     return m_deviceAPI->getNbSourceStreams();

plugins/channelrx/udpsink/udpsink.h

@@ -63,6 +63,8 @@ public:
 	UDPSink(DeviceAPI *deviceAPI);
 	virtual ~UDPSink();
 	virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
     void enableSpectrum(bool enable);

plugins/channelrx/udpsink/udpsinkgui.h

@@ -57,6 +57,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
 	void channelMarkerChangedByCursor();

plugins/channeltx/filesource/filesource.cpp

@@ -92,6 +92,18 @@ FileSource::~FileSource()
     delete m_thread;
 }
 
+void FileSource::setDeviceAPI(DeviceAPI *deviceAPI)
+{
+    if (deviceAPI != m_deviceAPI)
+    {
+        m_deviceAPI->removeChannelSourceAPI(this);
+        m_deviceAPI->removeChannelSource(this);
+        m_deviceAPI = deviceAPI;
+        m_deviceAPI->addChannelSource(this);
+        m_deviceAPI->addChannelSinkAPI(this);
+    }
+}
+
 void FileSource::start()
 {
 	qDebug("FileSource::start");

plugins/channeltx/filesource/filesource.h

@@ -147,6 +147,8 @@ public:
     FileSource(DeviceAPI *deviceAPI);
     virtual ~FileSource();
     virtual void destroy() { delete this; }
+    virtual void setDeviceAPI(DeviceAPI *deviceAPI);
+    virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
 
     virtual void start();
     virtual void stop();

plugins/channeltx/filesource/filesourcegui.h

@@ -53,6 +53,7 @@ public:
     virtual QColor getTitleColor() const  { return m_settings.m_rgbColor; };
     virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
     virtual bool getHidden() const { return m_settings.m_hidden; }
+    virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
 
 public slots:
     void channelMarkerChangedByCursor();