diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp
index d7f3dfc4e..e3eecc3e9 100644
--- a/plugins/channelrx/demoddsd/dsddemod.cpp
+++ b/plugins/channelrx/demoddsd/dsddemod.cpp
@@ -53,7 +53,6 @@ DSDDemod::DSDDemod(DeviceSourceAPI *deviceAPI) :
m_squelchOpen(false),
m_audioFifo1(48000),
m_audioFifo2(48000),
- m_scope(0),
m_scopeXY(0),
m_scopeEnabled(true),
m_dsdDecoder(),
@@ -310,12 +309,6 @@ void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
// }
}
-
- if ((m_scope != 0) && (m_scopeEnabled))
- {
- m_scope->feed(m_scopeSampleBuffer.begin(), m_scopeSampleBuffer.end(), true); // true = real samples for what it's worth
- }
-
if ((m_scopeXY != 0) && (m_scopeEnabled))
{
m_scopeXY->feed(m_scopeSampleBuffer.begin(), m_scopeSampleBuffer.end(), true); // true = real samples for what it's worth
diff --git a/plugins/channelrx/demoddsd/dsddemod.h b/plugins/channelrx/demoddsd/dsddemod.h
index 6a581ce2c..acf1f25ce 100644
--- a/plugins/channelrx/demoddsd/dsddemod.h
+++ b/plugins/channelrx/demoddsd/dsddemod.h
@@ -93,7 +93,6 @@ public:
DSDDemod(DeviceSourceAPI *deviceAPI);
~DSDDemod();
virtual void destroy() { delete this; }
- void setScopeSink(BasebandSampleSink* sampleSink) { m_scope = sampleSink; }
void setScopeXYSink(BasebandSampleSink* sampleSink) { m_scopeXY = sampleSink; }
void configureMyPosition(MessageQueue* messageQueue, float myLatitude, float myLongitude);
@@ -193,7 +192,6 @@ private:
AudioFifo m_audioFifo1;
AudioFifo m_audioFifo2;
- BasebandSampleSink* m_scope;
BasebandSampleSink* m_scopeXY;
bool m_scopeEnabled;
diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp
index 4a9e52dd0..a509e3201 100644
--- a/plugins/channelrx/demoddsd/dsddemodgui.cpp
+++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp
@@ -282,7 +282,6 @@ DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &)));
- m_scopeVis = new ScopeVis(SDR_RX_SCALEF, ui->glScope);
m_scopeVisXY = new ScopeVisXY(ui->screenTV);
m_scopeVisXY->setScale(2.0);
m_scopeVisXY->setPixelsPerFrame(4001);
@@ -298,15 +297,9 @@ DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
}
m_dsdDemod = (DSDDemod*) rxChannel; //new DSDDemod(m_deviceUISet->m_deviceSourceAPI);
- m_dsdDemod->setScopeSink(m_scopeVis);
m_dsdDemod->setScopeXYSink(m_scopeVisXY);
m_dsdDemod->setMessageQueueToGUI(getInputMessageQueue());
- ui->glScope->setSampleRate(48000);
- m_scopeVis->setSampleRate(48000);
-
- ui->glScope->connectTimer(MainWindow::getInstance()->getMasterTimer());
-
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
ui->audioMute->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
@@ -337,10 +330,7 @@ DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
- ui->scopeGUI->setBuddies(m_scopeVis->getInputMessageQueue(), m_scopeVis, ui->glScope);
-
m_settings.setChannelMarker(&m_channelMarker);
- m_settings.setScopeGUI(ui->scopeGUI);
updateMyPosition();
displaySettings();
@@ -352,7 +342,6 @@ DSDDemodGUI::~DSDDemodGUI()
m_deviceUISet->removeRxChannelInstance(this);
delete m_dsdDemod; // TODO: check this: when the GUI closes it has to delete the demodulator
delete m_scopeVisXY;
- delete m_scopeVis;
delete ui;
}
diff --git a/plugins/channelrx/demoddsd/dsddemodgui.h b/plugins/channelrx/demoddsd/dsddemodgui.h
index a7269dfff..ea2669e6f 100644
--- a/plugins/channelrx/demoddsd/dsddemodgui.h
+++ b/plugins/channelrx/demoddsd/dsddemodgui.h
@@ -81,7 +81,6 @@ private:
char m_formatStatusText[82+1]; //!< Fixed signal format dependent status text
SignalFormat m_signalFormat;
- ScopeVis* m_scopeVis;
ScopeVisXY* m_scopeVisXY;
DSDDemod* m_dsdDemod;
diff --git a/plugins/channelrx/demoddsd/dsddemodgui.ui b/plugins/channelrx/demoddsd/dsddemodgui.ui
index 244b5228d..06ed22c57 100644
--- a/plugins/channelrx/demoddsd/dsddemodgui.ui
+++ b/plugins/channelrx/demoddsd/dsddemodgui.ui
@@ -7,7 +7,7 @@
0
0
686
- 841
+ 397
@@ -931,14 +931,14 @@
10
180
- 636
- 651
+ 200
+ 200
- 636
- 0
+ 200
+ 200
@@ -949,49 +949,20 @@
2
-
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 432
- 200
-
-
-
-
- Monospace
- 8
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 200
- 200
-
-
-
-
-
-
- -
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 200
+ 200
+
+
+
@@ -1014,18 +985,6 @@
1
-
- GLScope
- QWidget
-
- 1
-
-
- GLScopeGUI
- QWidget
-
- 1
-
ValueDialZ
QWidget
diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.cpp b/plugins/channelrx/demoddsd/dsddemodplugin.cpp
index a4c96b3fe..e88f2401f 100644
--- a/plugins/channelrx/demoddsd/dsddemodplugin.cpp
+++ b/plugins/channelrx/demoddsd/dsddemodplugin.cpp
@@ -25,7 +25,7 @@
const PluginDescriptor DSDDemodPlugin::m_pluginDescriptor = {
QString("DSD Demodulator"),
- QString("3.12.0"),
+ QString("3.13.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,