From b36f3057ae01e37d09f071acbcc419fc041a3b02 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Mon, 24 Aug 2015 00:58:54 +0200
Subject: [PATCH] Deep redesign: removed unused sample sink from AM demod

---
 plugins/channel/am/amdemod.cpp    | 17 ++---------------
 plugins/channel/am/amdemod.h      |  3 +--
 plugins/channel/am/amdemodgui.cpp |  2 +-
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/plugins/channel/am/amdemod.cpp b/plugins/channel/am/amdemod.cpp
index 1ec37fd26..2b72283cf 100644
--- a/plugins/channel/am/amdemod.cpp
+++ b/plugins/channel/am/amdemod.cpp
@@ -27,8 +27,7 @@
 
 MESSAGE_CLASS_DEFINITION(AMDemod::MsgConfigureAMDemod, Message)
 
-AMDemod::AMDemod(SampleSink* sampleSink) :
-	m_sampleSink(sampleSink),
+AMDemod::AMDemod() :
 	m_audioFifo(4, 48000)
 {
 	setObjectName("AMDemod");
@@ -151,11 +150,6 @@ void AMDemod::feed(SampleVector::const_iterator begin, SampleVector::const_itera
 		m_audioBufferFill = 0;
 	}
 
-	if(m_sampleSink != 0)
-	{
-		m_sampleSink->feed(m_sampleBuffer.begin(), m_sampleBuffer.end(), false);
-	}
-
 	m_sampleBuffer.clear();
 }
 
@@ -212,14 +206,7 @@ bool AMDemod::handleMessage(const Message& cmd)
 	}
 	else
 	{
-		if(m_sampleSink != 0) // FIXME: for dependent sample sink - unused for this demod
-		{
-		   return m_sampleSink->handleMessage(cmd);
-		}
-		else
-		{
-			return false;
-		}
+		return false;
 	}
 }
 
diff --git a/plugins/channel/am/amdemod.h b/plugins/channel/am/amdemod.h
index 8dd64b749..c34e84b6a 100644
--- a/plugins/channel/am/amdemod.h
+++ b/plugins/channel/am/amdemod.h
@@ -32,7 +32,7 @@ class AudioFifo;
 class AMDemod : public SampleSink {
 	Q_OBJECT
 public:
-	AMDemod(SampleSink* sampleSink);
+	AMDemod();
 	~AMDemod();
 
 	void configure(MessageQueue* messageQueue, Real rfBandwidth, Real afBandwidth, Real volume, Real squelch);
@@ -121,7 +121,6 @@ private:
 	AudioVector m_audioBuffer;
 	uint m_audioBufferFill;
 
-	SampleSink* m_sampleSink;
 	AudioFifo m_audioFifo;
 	SampleVector m_sampleBuffer;
 
diff --git a/plugins/channel/am/amdemodgui.cpp b/plugins/channel/am/amdemodgui.cpp
index f675661b4..ccf871de3 100644
--- a/plugins/channel/am/amdemodgui.cpp
+++ b/plugins/channel/am/amdemodgui.cpp
@@ -201,7 +201,7 @@ AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, QWidget* parent) :
 	connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
 	connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked()));
 
-	m_amDemod = new AMDemod(0);
+	m_amDemod = new AMDemod();
 	m_channelizer = new Channelizer(m_amDemod);
 	m_threadedChannelizer = new ThreadedSampleSink(m_channelizer, this);
 	DSPEngine::instance()->addThreadedSink(m_threadedChannelizer);