Replace separate create channel methods (BS and CS): common plugins

plugins/channelrx/chanalyzer/chanalyzerplugin.cpp

@@ -52,22 +52,28 @@ void ChannelAnalyzerPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerRxChannel(ChannelAnalyzer::m_channelIdURI, ChannelAnalyzer::m_channelId, this);
 }
 
+void ChannelAnalyzerPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		ChannelAnalyzer *instance = new ChannelAnalyzer(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 PluginInstanceGUI* ChannelAnalyzerPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const
 {
     return ChannelAnalyzerGUI::create(m_pluginAPI, deviceUISet, rxChannel);
 }
 
-BasebandSampleSink* ChannelAnalyzerPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new ChannelAnalyzer(deviceAPI);
-}
-
-ChannelAPI* ChannelAnalyzerPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new ChannelAnalyzer(deviceAPI);
-}
-
 ChannelWebAPIAdapter* ChannelAnalyzerPlugin::createChannelWebAPIAdapter() const
 {
 	return new ChannelAnalyzerWebAPIAdapter();
-}
+}

plugins/channelrx/chanalyzer/chanalyzerplugin.h

@@ -36,9 +36,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+    virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-	virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
 	virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/demodam/amdemodplugin.cpp

@@ -37,6 +37,22 @@ void AMDemodPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerRxChannel(AMDemod::m_channelIdURI, AMDemod::m_channelId, this);
 }
 
+void AMDemodPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		AMDemod *instance = new AMDemod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* AMDemodPlugin::createRxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -51,17 +67,7 @@ PluginInstanceGUI* AMDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, B
 }
 #endif
 
-BasebandSampleSink* AMDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new AMDemod(deviceAPI);
-}
-
-ChannelAPI* AMDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new AMDemod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* AMDemodPlugin::createChannelWebAPIAdapter() const
 {
 	return new AMDemodWebAPIAdapter();
-}
+}

plugins/channelrx/demodam/amdemodplugin.h

@@ -35,9 +35,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-	virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
 	virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/demodatv/atvdemodplugin.cpp

@@ -57,21 +57,27 @@ void ATVDemodPlugin::initPlugin(PluginAPI* ptrPluginAPI)
     m_ptrPluginAPI->registerRxChannel(ATVDemod::m_channelIdURI, ATVDemod::m_channelId, this);
 }
 
+void ATVDemodPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		ATVDemod *instance = new ATVDemod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 PluginInstanceGUI* ATVDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const
 {
     return ATVDemodGUI::create(m_ptrPluginAPI, deviceUISet, rxChannel);
 }
 
-BasebandSampleSink* ATVDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new ATVDemod(deviceAPI);
-}
-
-ChannelAPI* ATVDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new ATVDemod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* ATVDemodPlugin::createChannelWebAPIAdapter() const
 {
 	return new ATVDemodWebAPIAdapter();

plugins/channelrx/demodatv/atvdemodplugin.h

@@ -37,9 +37,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
     void initPlugin(PluginAPI* ptrPluginAPI);
 
+    virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
     virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-    virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-    virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/demodbfm/bfmplugin.cpp

@@ -57,6 +57,22 @@ void BFMPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerRxChannel(BFMDemod::m_channelIdURI, BFMDemod::m_channelId, this);
 }
 
+void BFMPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		BFMDemod *instance = new BFMDemod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* BFMPlugin::createRxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -71,16 +87,6 @@ PluginInstanceGUI* BFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, Baseb
 }
 #endif
 
-BasebandSampleSink* BFMPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new BFMDemod(deviceAPI);
-}
-
-ChannelAPI* BFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new BFMDemod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* BFMPlugin::createChannelWebAPIAdapter() const
 {
 	return new BFMDemodWebAPIAdapter();

plugins/channelrx/demodbfm/bfmplugin.h

@@ -35,9 +35,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-	virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/demoddatv/datvdemodplugin.cpp

@@ -58,21 +58,27 @@ void DATVDemodPlugin::initPlugin(PluginAPI* ptrPluginAPI)
     m_ptrPluginAPI->registerRxChannel(DATVDemod::m_channelIdURI, DATVDemod::m_channelId, this);
 }
 
+void DATVDemodPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		DATVDemod *instance = new DATVDemod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 PluginInstanceGUI* DATVDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const
 {
     return DATVDemodGUI::create(m_ptrPluginAPI, deviceUISet, rxChannel);
 }
 
-BasebandSampleSink* DATVDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new DATVDemod(deviceAPI);
-}
-
-ChannelAPI* DATVDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new DATVDemod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* DATVDemodPlugin::createChannelWebAPIAdapter() const
 {
 	return new DATVDemodWebAPIAdapter();

plugins/channelrx/demoddatv/datvdemodplugin.h

@@ -38,9 +38,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
     void initPlugin(PluginAPI* ptrPluginAPI);
 
+    virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
     virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-    virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-    virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/demoddsd/dsddemodplugin.cpp

@@ -56,6 +56,22 @@ void DSDDemodPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerRxChannel(DSDDemod::m_channelIdURI, DSDDemod::m_channelId, this);
 }
 
+void DSDDemodPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		DSDDemod *instance = new DSDDemod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* DSDDemodPlugin::createRxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -70,16 +86,6 @@ PluginInstanceGUI* DSDDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet,
 }
 #endif
 
-BasebandSampleSink* DSDDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new DSDDemod(deviceAPI);
-}
-
-ChannelAPI* DSDDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new DSDDemod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* DSDDemodPlugin::createChannelWebAPIAdapter() const
 {
 	return new DSDDemodWebAPIAdapter();

plugins/channelrx/demoddsd/dsddemodplugin.h

@@ -36,9 +36,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-	virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/demodfreedv/freedvplugin.cpp

@@ -54,6 +54,22 @@ void FreeDVPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerRxChannel(FreeDVDemod::m_channelIdURI, FreeDVDemod::m_channelId, this);
 }
 
+void FreeDVPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		FreeDVDemod *instance = new FreeDVDemod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* FreeDVPlugin::createRxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -68,16 +84,6 @@ PluginInstanceGUI* FreeDVPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, Ba
 }
 #endif
 
-BasebandSampleSink* FreeDVPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new FreeDVDemod(deviceAPI);
-}
-
-ChannelAPI* FreeDVPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new FreeDVDemod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* FreeDVPlugin::createChannelWebAPIAdapter() const
 {
 	return new FreeDVDemodWebAPIAdapter();

plugins/channelrx/demodfreedv/freedvplugin.h

@@ -35,9 +35,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-	virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/demodnfm/nfmplugin.cpp

@@ -38,6 +38,22 @@ void NFMPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerRxChannel(NFMDemod::m_channelIdURI, NFMDemod::m_channelId, this);
 }
 
+void NFMPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		NFMDemod *instance = new NFMDemod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* NFMPlugin::createRxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -52,16 +68,6 @@ PluginInstanceGUI* NFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, Baseb
 }
 #endif
 
-BasebandSampleSink* NFMPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new NFMDemod(deviceAPI);
-}
-
-ChannelAPI* NFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new NFMDemod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* NFMPlugin::createChannelWebAPIAdapter() const
 {
 	return new NFMDemodWebAPIAdapter();

plugins/channelrx/demodnfm/nfmplugin.h

@@ -18,9 +18,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-    virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-    virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/demodssb/ssbplugin.cpp

@@ -38,6 +38,22 @@ void SSBPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerRxChannel(SSBDemod::m_channelIdURI, SSBDemod::m_channelId, this);
 }
 
+void SSBPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		SSBDemod *instance = new SSBDemod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* SSBPlugin::createRxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -52,16 +68,6 @@ PluginInstanceGUI* SSBPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, Baseb
 }
 #endif
 
-BasebandSampleSink* SSBPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new SSBDemod(deviceAPI);
-}
-
-ChannelAPI* SSBPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new SSBDemod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* SSBPlugin::createChannelWebAPIAdapter() const
 {
 	return new SSBDemodWebAPIAdapter();

plugins/channelrx/demodssb/ssbplugin.h

@@ -18,9 +18,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-	virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/demodwfm/wfmplugin.cpp

@@ -39,6 +39,22 @@ void WFMPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerRxChannel(WFMDemod::m_channelIdURI, WFMDemod::m_channelId, this);
 }
 
+void WFMPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		WFMDemod *instance = new WFMDemod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* WFMPlugin::createRxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -53,16 +69,6 @@ PluginInstanceGUI* WFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, Baseb
 }
 #endif
 
-BasebandSampleSink* WFMPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new WFMDemod(deviceAPI);
-}
-
-ChannelAPI* WFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new WFMDemod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* WFMPlugin::createChannelWebAPIAdapter() const
 {
 	return new WFMDemodWebAPIAdapter();

plugins/channelrx/demodwfm/wfmplugin.h

@@ -18,9 +18,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-	virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/filesink/filesinkplugin.cpp

@@ -55,6 +55,22 @@ void FileSinkPlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerRxChannel(FileSink::m_channelIdURI, FileSink::m_channelId, this);
 }
 
+void FileSinkPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		FileSink *instance = new FileSink(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* FileSinkPlugin::createRxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -69,16 +85,6 @@ PluginInstanceGUI* FileSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet,
 }
 #endif
 
-BasebandSampleSink* FileSinkPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new FileSink(deviceAPI);
-}
-
-ChannelAPI* FileSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new FileSink(deviceAPI);
-}
-
 ChannelWebAPIAdapter* FileSinkPlugin::createChannelWebAPIAdapter() const
 {
 	return new FileSinkWebAPIAdapter();

plugins/channelrx/filesink/filesinkplugin.h

@@ -36,9 +36,8 @@ public:
     const PluginDescriptor& getPluginDescriptor() const;
     void initPlugin(PluginAPI* pluginAPI);
 
+    virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
     virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-    virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-    virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/freqtracker/freqtrackerplugin.cpp

@@ -54,6 +54,22 @@ void FreqTrackerPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerRxChannel(FreqTracker::m_channelIdURI, FreqTracker::m_channelId, this);
 }
 
+void FreqTrackerPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		FreqTracker *instance = new FreqTracker(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* FreqTrackerPlugin::createRxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -68,16 +84,6 @@ PluginInstanceGUI* FreqTrackerPlugin::createRxChannelGUI(DeviceUISet *deviceUISe
 }
 #endif
 
-BasebandSampleSink* FreqTrackerPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new FreqTracker(deviceAPI);
-}
-
-ChannelAPI* FreqTrackerPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new FreqTracker(deviceAPI);
-}
-
 ChannelWebAPIAdapter* FreqTrackerPlugin::createChannelWebAPIAdapter() const
 {
 	return new FreqTrackerWebAPIAdapter();

plugins/channelrx/freqtracker/freqtrackerplugin.h

@@ -35,9 +35,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-	virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/localsink/localsinkplugin.cpp

@@ -56,6 +56,22 @@ void LocalSinkPlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerRxChannel(LocalSink::m_channelIdURI, LocalSink::m_channelId, this);
 }
 
+void LocalSinkPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		LocalSink *instance = new LocalSink(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* LocalSinkPlugin::createRxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -70,16 +86,6 @@ PluginInstanceGUI* LocalSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet,
 }
 #endif
 
-BasebandSampleSink* LocalSinkPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new LocalSink(deviceAPI);
-}
-
-ChannelAPI* LocalSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new LocalSink(deviceAPI);
-}
-
 ChannelWebAPIAdapter* LocalSinkPlugin::createChannelWebAPIAdapter() const
 {
 	return new LocalSinkWebAPIAdapter();

plugins/channelrx/localsink/localsinkplugin.h

@@ -36,9 +36,8 @@ public:
     const PluginDescriptor& getPluginDescriptor() const;
     void initPlugin(PluginAPI* pluginAPI);
 
+    virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
     virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-    virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-    virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/remotesink/remotesinkplugin.cpp

@@ -56,6 +56,22 @@ void RemoteSinkPlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerRxChannel(RemoteSink::m_channelIdURI, RemoteSink::m_channelId, this);
 }
 
+void RemoteSinkPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		RemoteSink *instance = new RemoteSink(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* RemoteSinkPlugin::createRxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -70,16 +86,6 @@ PluginInstanceGUI* RemoteSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet
 }
 #endif
 
-BasebandSampleSink* RemoteSinkPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new RemoteSink(deviceAPI);
-}
-
-ChannelAPI* RemoteSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new RemoteSink(deviceAPI);
-}
-
 ChannelWebAPIAdapter* RemoteSinkPlugin::createChannelWebAPIAdapter() const
 {
 	return new RemoteSinkWebAPIAdapter();

plugins/channelrx/remotesink/remotesinkplugin.h

@@ -36,9 +36,8 @@ public:
     const PluginDescriptor& getPluginDescriptor() const;
     void initPlugin(PluginAPI* pluginAPI);
 
+    virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
     virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-    virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-    virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channelrx/udpsink/udpsinkplugin.cpp

@@ -55,6 +55,22 @@ void UDPSinkPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerRxChannel(UDPSink::m_channelIdURI, UDPSink::m_channelId, this);
 }
 
+void UDPSinkPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		UDPSink *instance = new UDPSink(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* UDPSinkPlugin::createRxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -69,16 +85,6 @@ PluginInstanceGUI* UDPSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, B
 }
 #endif
 
-BasebandSampleSink* UDPSinkPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new UDPSink(deviceAPI);
-}
-
-ChannelAPI* UDPSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new UDPSink(deviceAPI);
-}
-
 ChannelWebAPIAdapter* UDPSinkPlugin::createChannelWebAPIAdapter() const
 {
 	return new UDPSinkWebAPIAdapter();

plugins/channelrx/udpsink/udpsinkplugin.h

@@ -36,9 +36,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const;
-	virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channeltx/filesource/filesourceplugin.cpp

@@ -54,6 +54,22 @@ void FileSourcePlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(FileSource::m_channelIdURI, FileSource::m_channelId, this);
 }
 
+void FileSourcePlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		FileSource *instance = new FileSource(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* FileSourcePlugin::createTxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -68,16 +84,6 @@ PluginInstanceGUI* FileSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet
 }
 #endif
 
-BasebandSampleSource* FileSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new FileSource(deviceAPI);
-}
-
-ChannelAPI* FileSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new FileSource(deviceAPI);
-}
-
 ChannelWebAPIAdapter* FileSourcePlugin::createChannelWebAPIAdapter() const
 {
 	return new FileSourceWebAPIAdapter();

plugins/channeltx/filesource/filesourceplugin.h

@@ -35,9 +35,8 @@ public:
     const PluginDescriptor& getPluginDescriptor() const;
     void initPlugin(PluginAPI* pluginAPI);
 
+    virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const;
     virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const;
-    virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const;
-    virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channeltx/localsource/localsourceplugin.cpp

@@ -56,6 +56,22 @@ void LocalSourcePlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(LocalSource::m_channelIdURI, LocalSource::m_channelId, this);
 }
 
+void LocalSourcePlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		LocalSource *instance = new LocalSource(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* LocalSourcePlugin::createTxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -70,16 +86,6 @@ PluginInstanceGUI* LocalSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISe
 }
 #endif
 
-BasebandSampleSource* LocalSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new LocalSource(deviceAPI);
-}
-
-ChannelAPI* LocalSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new LocalSource(deviceAPI);
-}
-
 ChannelWebAPIAdapter* LocalSourcePlugin::createChannelWebAPIAdapter() const
 {
 	return new LocalSourceWebAPIAdapter();

plugins/channeltx/localsource/localsourceplugin.h

@@ -36,9 +36,8 @@ public:
     const PluginDescriptor& getPluginDescriptor() const;
     void initPlugin(PluginAPI* pluginAPI);
 
+    virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const;
     virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const;
-    virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const;
-    virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channeltx/modam/ammodplugin.cpp

@@ -54,6 +54,22 @@ void AMModPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerTxChannel(AMMod::m_channelIdURI, AMMod::m_channelId, this);
 }
 
+void AMModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		AMMod *instance = new AMMod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* AMModPlugin::createTxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -68,16 +84,6 @@ PluginInstanceGUI* AMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, Bas
 }
 #endif
 
-BasebandSampleSource* AMModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new AMMod(deviceAPI);
-}
-
-ChannelAPI* AMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new AMMod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* AMModPlugin::createChannelWebAPIAdapter() const
 {
 	return new AMModWebAPIAdapter();

plugins/channeltx/modam/ammodplugin.h

@@ -35,9 +35,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const;
-	virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const;
 	virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channeltx/modatv/atvmodplugin.cpp

@@ -54,6 +54,22 @@ void ATVModPlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(ATVMod::m_channelIdURI, ATVMod::m_channelId, this);
 }
 
+void ATVModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		ATVMod *instance = new ATVMod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* ATVModPlugin::createTxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -68,16 +84,6 @@ PluginInstanceGUI* ATVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, Ba
 }
 #endif
 
-BasebandSampleSource* ATVModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new ATVMod(deviceAPI);
-}
-
-ChannelAPI* ATVModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new ATVMod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* ATVModPlugin::createChannelWebAPIAdapter() const
 {
 	return new ATVModWebAPIAdapter();

plugins/channeltx/modatv/atvmodplugin.h

@@ -35,9 +35,8 @@ public:
     const PluginDescriptor& getPluginDescriptor() const;
     void initPlugin(PluginAPI* pluginAPI);
 
+    virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const;
     virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const;
-    virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const;
-    virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channeltx/modfreedv/freedvmodplugin.cpp

@@ -54,6 +54,22 @@ void FreeDVModPlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(FreeDVMod::m_channelIdURI, FreeDVMod::m_channelId, this);
 }
 
+void FreeDVModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		FreeDVMod *instance = new FreeDVMod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* FreeDVModPlugin::createTxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -68,16 +84,6 @@ PluginInstanceGUI* FreeDVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet,
 }
 #endif
 
-BasebandSampleSource* FreeDVModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new FreeDVMod(deviceAPI);
-}
-
-ChannelAPI* FreeDVModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new FreeDVMod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* FreeDVModPlugin::createChannelWebAPIAdapter() const
 {
 	return new FreeDVModWebAPIAdapter();

plugins/channeltx/modfreedv/freedvmodplugin.h

@@ -35,9 +35,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const;
-	virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const;
 	virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channeltx/modnfm/nfmmodplugin.cpp

@@ -54,6 +54,22 @@ void NFMModPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerTxChannel(NFMMod::m_channelIdURI, NFMMod::m_channelId, this);
 }
 
+void NFMModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		NFMMod *instance = new NFMMod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -68,16 +84,6 @@ PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, Ba
 }
 #endif
 
-BasebandSampleSource* NFMModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new NFMMod(deviceAPI);
-}
-
-ChannelAPI* NFMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new NFMMod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* NFMModPlugin::createChannelWebAPIAdapter() const
 {
 	return new NFMModWebAPIAdapter();

plugins/channeltx/modnfm/nfmmodplugin.h

@@ -35,9 +35,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *rxChannel) const;
-    virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const;
-    virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const;
 	virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channeltx/modpacket/packetmodplugin.cpp

@@ -54,6 +54,22 @@ void PacketModPlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(PacketMod::m_channelIdURI, PacketMod::m_channelId, this);
 }
 
+void PacketModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		PacketMod *instance = new PacketMod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* PacketModPlugin::createTxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -68,16 +84,6 @@ PluginInstanceGUI* PacketModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet,
 }
 #endif
 
-BasebandSampleSource* PacketModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new PacketMod(deviceAPI);
-}
-
-ChannelAPI* PacketModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new PacketMod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* PacketModPlugin::createChannelWebAPIAdapter() const
 {
     return new PacketModWebAPIAdapter();

plugins/channeltx/modpacket/packetmodplugin.h

@@ -36,9 +36,8 @@ public:
     const PluginDescriptor& getPluginDescriptor() const;
     void initPlugin(PluginAPI* pluginAPI);
 
+    virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const;
     virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *rxChannel) const;
-    virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const;
-    virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channeltx/modssb/ssbmodplugin.cpp

@@ -54,6 +54,22 @@ void SSBModPlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(SSBMod::m_channelIdURI, SSBMod::m_channelId, this);
 }
 
+void SSBModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		SSBMod *instance = new SSBMod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* SSBModPlugin::createTxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -68,16 +84,6 @@ PluginInstanceGUI* SSBModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, Ba
 }
 #endif
 
-BasebandSampleSource* SSBModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new SSBMod(deviceAPI);
-}
-
-ChannelAPI* SSBModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new SSBMod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* SSBModPlugin::createChannelWebAPIAdapter() const
 {
 	return new SSBModWebAPIAdapter();

plugins/channeltx/modssb/ssbmodplugin.h

@@ -35,9 +35,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const;
-	virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const;
 	virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channeltx/modwfm/wfmmodplugin.cpp

@@ -54,6 +54,22 @@ void WFMModPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerTxChannel(WFMMod::m_channelIdURI, WFMMod::m_channelId, this);
 }
 
+void WFMModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		WFMMod *instance = new WFMMod(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* WFMModPlugin::createTxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -68,16 +84,6 @@ PluginInstanceGUI* WFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, Ba
 }
 #endif
 
-BasebandSampleSource* WFMModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new WFMMod(deviceAPI);
-}
-
-ChannelAPI* WFMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new WFMMod(deviceAPI);
-}
-
 ChannelWebAPIAdapter* WFMModPlugin::createChannelWebAPIAdapter() const
 {
 	return new WFMModWebAPIAdapter();

plugins/channeltx/modwfm/wfmmodplugin.h

@@ -34,9 +34,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const;
-	virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const;
 	virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channeltx/remotesource/remotesourceplugin.cpp

@@ -54,6 +54,22 @@ void RemoteSourcePlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(RemoteSource::m_channelIdURI, RemoteSource::m_channelId, this);
 }
 
+void RemoteSourcePlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		RemoteSource *instance = new RemoteSource(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* RemoteSourcePlugin::createTxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -68,16 +84,6 @@ PluginInstanceGUI* RemoteSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUIS
 }
 #endif
 
-BasebandSampleSource* RemoteSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new RemoteSource(deviceAPI);
-}
-
-ChannelAPI* RemoteSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new RemoteSource(deviceAPI);
-}
-
 ChannelWebAPIAdapter* RemoteSourcePlugin::createChannelWebAPIAdapter() const
 {
 	return new RemoteSourceWebAPIAdapter();

plugins/channeltx/remotesource/remotesourceplugin.h

@@ -35,9 +35,8 @@ public:
     const PluginDescriptor& getPluginDescriptor() const;
     void initPlugin(PluginAPI* pluginAPI);
 
+    virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const;
     virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const;
-    virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const;
-    virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const;
     virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private:

plugins/channeltx/udpsource/udpsourceplugin.cpp

@@ -57,6 +57,22 @@ void UDPSourcePlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(UDPSource::m_channelIdURI, UDPSource::m_channelId, this);
 }
 
+void UDPSourcePlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const
+{
+	if (bs || cs)
+	{
+		UDPSource *instance = new UDPSource(deviceAPI);
+
+		if (bs) {
+			*bs = instance;
+		}
+
+		if (cs) {
+			*cs = instance;
+		}
+	}
+}
+
 #ifdef SERVER_MODE
 PluginInstanceGUI* UDPSourcePlugin::createTxChannelGUI(
         DeviceUISet *deviceUISet,
@@ -71,16 +87,6 @@ PluginInstanceGUI* UDPSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet,
 }
 #endif
 
-BasebandSampleSource* UDPSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) const
-{
-    return new UDPSource(deviceAPI);
-}
-
-ChannelAPI* UDPSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) const
-{
-    return new UDPSource(deviceAPI);
-}
-
 ChannelWebAPIAdapter* UDPSourcePlugin::createChannelWebAPIAdapter() const
 {
 	return new UDPSourceWebAPIAdapter();

plugins/channeltx/udpsource/udpsourceplugin.h

@@ -36,9 +36,8 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
+	virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const;
 	virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const;
-	virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const;
-	virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const;
 	virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
 
 private: