RxTx semantic move: renamed channel plugins directory to channelrx

plugins/CMakeLists.txt

@@ -1,4 +1,4 @@
 project(plugins)
 
-add_subdirectory(channel)
+add_subdirectory(channelrx)
 add_subdirectory(samplesource)

plugins/channelrx/chanalyzer/CMakeLists.txt

@@ -42,4 +42,4 @@ target_link_libraries(chanalyzer
 
 qt5_use_modules(chanalyzer Core Widgets OpenGL Multimedia)
 
-install(TARGETS chanalyzer DESTINATION lib/plugins/channel)
+install(TARGETS chanalyzer DESTINATION lib/plugins/channelrx)

plugins/channelrx/chanalyzer/chanalyzer.cpp

@@ -14,13 +14,14 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/chanalyzer/chanalyzer.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
 #include "audio/audiooutput.h"
 #include "dsp/channelizer.h"
 
-#include "chanalyzer.h"
 
 MESSAGE_CLASS_DEFINITION(ChannelAnalyzer::MsgConfigureChannelAnalyzer, Message)
 

plugins/channelrx/chanalyzer/chanalyzergui.cpp

@@ -14,6 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/chanalyzer/chanalyzergui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
 #include "ui_chanalyzergui.h"
@@ -32,8 +34,7 @@
 #include "dsp/dspengine.h"
 #include "mainwindow.h"
 
-#include "chanalyzer.h"
-#include "chanalyzergui.h"
+#include "../../channelrx/chanalyzer/chanalyzer.h"
 
 const QString ChannelAnalyzerGUI::m_channelID = "org.f4exb.sdrangelove.channel.chanalyzer";
 

plugins/channelrx/chanalyzer/chanalyzerplugin.cpp

@@ -1,7 +1,9 @@
+#include "../../channelrx/chanalyzer/chanalyzerplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
-#include "chanalyzergui.h"
-#include "chanalyzerplugin.h"
+
+#include "../../channelrx/chanalyzer/chanalyzergui.h"
 
 const PluginDescriptor ChannelAnalyzerPlugin::m_pluginDescriptor = {
 	QString("Channel Analyzer"),

plugins/channelrx/demodam/CMakeLists.txt

@@ -42,4 +42,4 @@ target_link_libraries(demodam
 
 qt5_use_modules(demodam Core Widgets OpenGL Multimedia)
 
-install(TARGETS demodam DESTINATION lib/plugins/channel)
+install(TARGETS demodam DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodam/amdemod.cpp

@@ -14,7 +14,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "amdemod.h"
+#include "../../channelrx/demodam/amdemod.h"
 
 #include <QTime>
 #include <QDebug>

plugins/channelrx/demodam/amdemodgui.cpp

@@ -1,4 +1,4 @@
-#include "amdemodgui.h"
+#include "../../channelrx/demodam/amdemodgui.h"
 
 #include <QDockWidget>
 #include <QMainWindow>
@@ -13,7 +13,7 @@
 #include "dsp/dspengine.h"
 #include "mainwindow.h"
 
-#include "amdemod.h"
+#include "../../channelrx/demodam/amdemod.h"
 
 const QString AMDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.am";
 

plugins/channelrx/demodam/amplugin.cpp

@@ -1,9 +1,10 @@
-#include "amplugin.h"
+#include "../../channelrx/demodam/amplugin.h"
 
 #include <QtPlugin>
 #include <QAction>
 #include "plugin/pluginapi.h"
-#include "amdemodgui.h"
+
+#include "../../channelrx/demodam/amdemodgui.h"
 
 const PluginDescriptor AMPlugin::m_pluginDescriptor = {
 	QString("AM Demodulator"),

plugins/channelrx/demodbfm/CMakeLists.txt

@@ -49,4 +49,4 @@ target_link_libraries(demodbfm
 
 qt5_use_modules(demodbfm Core Widgets OpenGL Multimedia)
 
-install(TARGETS demodbfm DESTINATION lib/plugins/channel)
+install(TARGETS demodbfm DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodbfm/bfmdemod.cpp

@@ -15,6 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodbfm/bfmdemod.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
@@ -23,10 +25,10 @@
 #include "dsp/dspengine.h"
 #include "dsp/channelizer.h"
 #include "dsp/pidcontroller.h"
-#include "rdsparser.h"
-
 #include "bfmdemod.h"
 
+#include "../../channelrx/demodbfm/rdsparser.h"
+
 MESSAGE_CLASS_DEFINITION(BFMDemod::MsgConfigureBFMDemod, Message)
 
 const Real BFMDemod::default_deemphasis = 50.0; // 50 us

plugins/channelrx/demodbfm/bfmdemod.h

@@ -31,8 +31,9 @@
 #include "dsp/phasediscri.h"
 #include "audio/audiofifo.h"
 #include "util/message.h"
-#include "rdsdemod.h"
-#include "rdsdecoder.h"
+
+#include "../../channelrx/demodbfm/rdsdecoder.h"
+#include "../../channelrx/demodbfm/rdsdemod.h"
 
 class RDSParser;
 

plugins/channelrx/demodbfm/bfmdemodgui.cpp

@@ -15,6 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodbfm/bfmdemodgui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
 #include <QDebug>
@@ -35,10 +37,9 @@
 #include "gui/basicchannelsettingswidget.h"
 #include "mainwindow.h"
 
-#include "bfmdemodgui.h"
+#include "../../channelrx/demodbfm/bfmdemod.h"
+#include "../../channelrx/demodbfm/rdstmc.h"
 #include "ui_bfmdemodgui.h"
-#include "bfmdemod.h"
-#include "rdstmc.h"
 
 const QString BFMDemodGUI::m_channelID = "sdrangel.channel.bfm";
 

plugins/channelrx/demodbfm/bfmdemodgui.h

@@ -22,7 +22,8 @@
 #include "plugin/plugingui.h"
 #include "dsp/channelmarker.h"
 #include "dsp/movingaverage.h"
-#include "rdsparser.h"
+
+#include "../../channelrx/demodbfm/rdsparser.h"
 
 class PluginAPI;
 class DeviceAPI;

plugins/channelrx/demodbfm/bfmplugin.cpp

@@ -15,12 +15,12 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodbfm/bfmplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 
-#include "bfmplugin.h"
-
-#include "bfmdemodgui.h"
+#include "../../channelrx/demodbfm/bfmdemodgui.h"
 
 const PluginDescriptor BFMPlugin::m_pluginDescriptor = {
 	QString("Broadcast FM Demodulator"),

plugins/channelrx/demodbfm/rdsdecoder.cpp

@@ -15,8 +15,9 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodbfm/rdsdecoder.h"
+
 #include <QDebug>
-#include "rdsdecoder.h"
 
 const unsigned int RDSDecoder::offset_pos[5] = {0,1,2,3,2};
 const unsigned int RDSDecoder::offset_word[5] = {252,408,360,436,848};

plugins/channelrx/demodbfm/rdsdemod.cpp

@@ -15,12 +15,13 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodbfm/rdsdemod.h"
+
 #include <QDebug>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "rdsdemod.h"
 
 const Real RDSDemod::m_pllBeta = 50;
 const Real RDSDemod::m_fsc = 1187.5;

plugins/channelrx/demodbfm/rdsparser.cpp

@@ -15,6 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodbfm/rdsparser.h"
+
 #include <QDebug>
 #include <string.h>
 #include <sstream>
@@ -22,8 +24,8 @@
 #include <cmath>
 #include <cstring>
 #include "boost/format.hpp"
-#include "rdsparser.h"
-#include "rdstmc.h"
+
+#include "../../channelrx/demodbfm/rdstmc.h"
 
 const unsigned int RDSParser::offset_pos[5] = {0,1,2,3,2};
 const unsigned int RDSParser::offset_word[5] = {252,408,360,436,848};

plugins/channelrx/demodbfm/rdstmc.cpp

@@ -15,7 +15,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "rdstmc.h"
+#include "../../channelrx/demodbfm/rdstmc.h"
 
 #define TMC_EVENTS 2047+1
 #define TMC_EVENT_LIST_LINES 2047+1

plugins/channelrx/demoddsd/CMakeLists.txt

@@ -47,4 +47,4 @@ target_link_libraries(demoddsd
 
 qt5_use_modules(demoddsd Core Widgets OpenGL Multimedia)
 
-install(TARGETS demoddsd DESTINATION lib/plugins/channel)
+install(TARGETS demoddsd DESTINATION lib/plugins/channelrx)

plugins/channelrx/demoddsd/dsddecoder.cpp

@@ -15,8 +15,9 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demoddsd/dsddecoder.h"
+
 #include <QtGlobal>
-#include "dsddecoder.h"
 #include "audio/audiofifo.h"
 
 

plugins/channelrx/demoddsd/dsddecoder.h

@@ -15,8 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#ifndef PLUGINS_CHANNEL_DEMODDSD_DSDDECODER_H_
-#define PLUGINS_CHANNEL_DEMODDSD_DSDDECODER_H_
+#ifndef PLUGINS_CHANNELRX_DEMODDSD_DSDDECODER_H_
+#define PLUGINS_CHANNELRX_DEMODDSD_DSDDECODER_H_
 
 #include "dsd_decoder.h"
 
@@ -75,4 +75,4 @@ private:
     DSDcc::DSDDecoder m_decoder;
 };
 
-#endif /* PLUGINS_CHANNEL_DEMODDSD_DSDDECODER_H_ */
+#endif /* PLUGINS_CHANNELRX_DEMODDSD_DSDDECODER_H_ */

plugins/channelrx/demoddsd/dsddemod.cpp

@@ -15,16 +15,17 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demoddsd/dsddemod.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
 #include <complex.h>
-#include "dsddemod.h"
-#include "dsddemodgui.h"
 #include "audio/audiooutput.h"
 #include "dsp/channelizer.h"
 #include "dsp/pidcontroller.h"
 #include "dsp/dspengine.h"
+#include "../../channelrx/demoddsd/dsddemodgui.h"
 
 static const Real afSqTones[2] = {1200.0, 6400.0}; // {1200.0, 8000.0};
 

plugins/channelrx/demoddsd/dsddemod.h

@@ -31,7 +31,8 @@
 #include "dsp/afsquelch.h"
 #include "audio/audiofifo.h"
 #include "util/message.h"
-#include "dsddecoder.h"
+
+#include "../../channelrx/demoddsd/dsddecoder.h"
 
 class DSDDemodGUI;
 

plugins/channelrx/demoddsd/dsddemodgui.cpp

@@ -15,6 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demoddsd/dsddemodgui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
 #include <QDebug>
@@ -31,8 +33,7 @@
 #include "dsp/dspengine.h"
 #include "mainwindow.h"
 
-#include "dsddemod.h"
-#include "dsddemodgui.h"
+#include "../../channelrx/demoddsd/dsddemod.h"
 
 const QString DSDDemodGUI::m_channelID = "sdrangel.channel.dsddemod";
 

plugins/channelrx/demoddsd/dsddemodplugin.cpp

@@ -15,11 +15,13 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demoddsd/dsddemodplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 #include "device/deviceapi.h"
-#include "dsddemodplugin.h"
-#include "dsddemodgui.h"
+
+#include "../../channelrx/demoddsd/dsddemodgui.h"
 
 const PluginDescriptor DSDDemodPlugin::m_pluginDescriptor = {
 	QString("DSD Demodulator"),

plugins/channelrx/demodlora/CMakeLists.txt

@@ -42,4 +42,4 @@ target_link_libraries(demodlora
 
 qt5_use_modules(demodlora Core Widgets OpenGL Multimedia)
 
-install(TARGETS demodlora DESTINATION lib/plugins/channel)
+install(TARGETS demodlora DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodlora/lorademod.cpp

@@ -16,13 +16,14 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodlora/lorademod.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
-#include "lorademod.h"
 #include "dsp/channelizer.h"
 
-#include "lorabits.h"
+#include "../../channelrx/demodlora/lorabits.h"
 
 MESSAGE_CLASS_DEFINITION(LoRaDemod::MsgConfigureLoRaDemod, Message)
 

plugins/channelrx/demodlora/lorademodgui.cpp

@@ -1,12 +1,12 @@
+#include "../../channelrx/demodlora/lorademodgui.h"
+#include "../../channelrx/demodlora/lorademodgui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
-#include "lorademodgui.h"
 #include "ui_lorademodgui.h"
-#include "lorademodgui.h"
 #include "ui_lorademodgui.h"
 #include "dsp/threadedsamplesink.h"
 #include "dsp/channelizer.h"
-#include "lorademod.h"
 #include "dsp/spectrumvis.h"
 #include "gui/glspectrum.h"
 #include "plugin/pluginapi.h"
@@ -14,6 +14,7 @@
 #include "util/simpleserializer.h"
 #include "gui/basicchannelsettingswidget.h"
 #include "dsp/dspengine.h"
+#include "../../channelrx/demodlora/lorademod.h"
 
 const QString LoRaDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.lora";
 

plugins/channelrx/demodlora/loraplugin.cpp

@@ -1,7 +1,9 @@
+#include "../../channelrx/demodlora/loraplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
-#include "loraplugin.h"
-#include "lorademodgui.h"
+
+#include "../../channelrx/demodlora/lorademodgui.h"
 
 const PluginDescriptor LoRaPlugin::m_pluginDescriptor = {
 	QString("LoRa Demodulator"),

plugins/channelrx/demodnfm/CMakeLists.txt

@@ -42,4 +42,4 @@ target_link_libraries(demodnfm
 
 qt5_use_modules(demodnfm Core Widgets OpenGL Multimedia)
 
-install(TARGETS demodnfm DESTINATION lib/plugins/channel)
+install(TARGETS demodnfm DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodnfm/nfmdemod.cpp

@@ -15,16 +15,17 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodnfm/nfmdemod.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
 #include <complex.h>
-#include "nfmdemod.h"
-#include "nfmdemodgui.h"
 #include "audio/audiooutput.h"
 #include "dsp/channelizer.h"
 #include "dsp/pidcontroller.h"
 #include "dsp/dspengine.h"
+#include "../../channelrx/demodnfm/nfmdemodgui.h"
 
 static const Real afSqTones[2] = {1200.0, 6400.0}; // {1200.0, 8000.0};
 

plugins/channelrx/demodnfm/nfmdemodgui.cpp

@@ -1,11 +1,11 @@
+#include "../../channelrx/demodnfm/nfmdemodgui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
 #include <QDebug>
-#include "nfmdemodgui.h"
 #include "ui_nfmdemodgui.h"
 #include "dsp/threadedsamplesink.h"
 #include "dsp/channelizer.h"
-#include "nfmdemod.h"
 #include "dsp/nullsink.h"
 #include "plugin/pluginapi.h"
 #include "device/deviceapi.h"
@@ -14,6 +14,7 @@
 #include "gui/basicchannelsettingswidget.h"
 #include "dsp/dspengine.h"
 #include "mainwindow.h"
+#include "../../channelrx/demodnfm/nfmdemod.h"
 
 const QString NFMDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.nfm";
 

plugins/channelrx/demodnfm/nfmplugin.cpp

@@ -1,7 +1,9 @@
+#include "../../channelrx/demodnfm/nfmplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
-#include "nfmplugin.h"
-#include "nfmdemodgui.h"
+
+#include "../../channelrx/demodnfm/nfmdemodgui.h"
 
 const PluginDescriptor NFMPlugin::m_pluginDescriptor = {
 	QString("NFM Demodulator"),

plugins/channelrx/demodssb/CMakeLists.txt

@@ -42,4 +42,4 @@ target_link_libraries(demodssb
 
 qt5_use_modules(demodssb Core Widgets OpenGL Multimedia)
 
-install(TARGETS demodssb DESTINATION lib/plugins/channel)
+install(TARGETS demodssb DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodssb/ssbdemod.cpp

@@ -16,10 +16,11 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodssb/ssbdemod.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
-#include "ssbdemod.h"
 #include "audio/audiooutput.h"
 #include "dsp/dspengine.h"
 #include "dsp/channelizer.h"

plugins/channelrx/demodssb/ssbdemodgui.cpp

@@ -1,12 +1,12 @@
+#include "../../channelrx/demodssb/ssbdemodgui.h"
+#include "../../channelrx/demodssb/ssbdemodgui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
-#include "ssbdemodgui.h"
 #include "ui_ssbdemodgui.h"
-#include "ssbdemodgui.h"
 #include "ui_ssbdemodgui.h"
 #include "dsp/threadedsamplesink.h"
 #include "dsp/channelizer.h"
-#include "ssbdemod.h"
 #include "dsp/spectrumvis.h"
 #include "gui/glspectrum.h"
 #include "plugin/pluginapi.h"
@@ -16,6 +16,7 @@
 #include "gui/basicchannelsettingswidget.h"
 #include "dsp/dspengine.h"
 #include "mainwindow.h"
+#include "../../channelrx/demodssb/ssbdemod.h"
 
 const QString SSBDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.ssb";
 

plugins/channelrx/demodssb/ssbplugin.cpp

@@ -1,8 +1,10 @@
+#include "../../channelrx/demodssb/ssbplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 #include "device/deviceapi.h"
-#include "ssbplugin.h"
-#include "ssbdemodgui.h"
+
+#include "../../channelrx/demodssb/ssbdemodgui.h"
 
 const PluginDescriptor SSBPlugin::m_pluginDescriptor = {
 	QString("SSB Demodulator"),

plugins/channelrx/demodwfm/CMakeLists.txt

@@ -42,4 +42,4 @@ target_link_libraries(demodwfm
 
 qt5_use_modules(demodwfm Core Widgets OpenGL Multimedia)
 
-install(TARGETS demodwfm DESTINATION lib/plugins/channel)
+install(TARGETS demodwfm DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodwfm/wfmdemod.cpp

@@ -15,6 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodwfm/wfmdemod.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
@@ -23,7 +25,6 @@
 #include "dsp/dspengine.h"
 #include "dsp/channelizer.h"
 #include "dsp/pidcontroller.h"
-#include "wfmdemod.h"
 
 MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureWFMDemod, Message)
 

plugins/channelrx/demodwfm/wfmdemodgui.cpp

@@ -1,3 +1,5 @@
+#include "../../channelrx/demodwfm/wfmdemodgui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
 #include <QDebug>
@@ -12,8 +14,7 @@
 #include "gui/basicchannelsettingswidget.h"
 #include "mainwindow.h"
 
-#include "wfmdemod.h"
-#include "wfmdemodgui.h"
+#include "../../channelrx/demodwfm/wfmdemod.h"
 
 const QString WFMDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.wfm";
 

plugins/channelrx/demodwfm/wfmplugin.cpp

@@ -1,8 +1,9 @@
+#include "../../channelrx/demodwfm/wfmplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 
-#include "wfmdemodgui.h"
-#include "wfmplugin.h"
+#include "../../channelrx/demodwfm/wfmdemodgui.h"
 
 const PluginDescriptor WFMPlugin::m_pluginDescriptor = {
 	QString("WFM Demodulator"),

plugins/channelrx/tcpsrc/CMakeLists.txt

@@ -42,4 +42,4 @@ target_link_libraries(demodtcpsrc
 
 qt5_use_modules(demodtcpsrc Core Widgets OpenGL Network)
 
-install(TARGETS demodtcpsrc DESTINATION lib/plugins/channel)
+install(TARGETS demodtcpsrc DESTINATION lib/plugins/channelrx)

plugins/channelrx/tcpsrc/tcpsrc.cpp

@@ -14,12 +14,13 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/tcpsrc/tcpsrc.h"
+
 #include <QTcpServer>
 #include <QTcpSocket>
 #include <QThread>
-#include "tcpsrc.h"
-#include "tcpsrcgui.h"
 #include "dsp/channelizer.h"
+#include "../../channelrx/tcpsrc/tcpsrcgui.h"
 
 MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcConfigure, Message)
 MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcConnection, Message)

plugins/channelrx/tcpsrc/tcpsrcgui.cpp

@@ -1,7 +1,7 @@
-#include "tcpsrcgui.h"
+#include "../../channelrx/tcpsrc/tcpsrcgui.h"
+
 #include "plugin/pluginapi.h"
 #include "device/deviceapi.h"
-#include "tcpsrc.h"
 #include "dsp/threadedsamplesink.h"
 #include "dsp/channelizer.h"
 #include "dsp/spectrumvis.h"
@@ -11,6 +11,7 @@
 #include "gui/basicchannelsettingswidget.h"
 #include "ui_tcpsrcgui.h"
 #include "mainwindow.h"
+#include "../../channelrx/tcpsrc/tcpsrc.h"
 
 const QString TCPSrcGUI::m_channelID = "sdrangel.channel.tcpsrc";
 

plugins/channelrx/tcpsrc/tcpsrcgui.h

@@ -6,7 +6,8 @@
 #include "plugin/plugingui.h"
 #include "dsp/channelmarker.h"
 #include "dsp/movingaverage.h"
-#include "tcpsrc.h"
+
+#include "../../channelrx/tcpsrc/tcpsrc.h"
 
 class PluginAPI;
 class DeviceAPI;

plugins/channelrx/tcpsrc/tcpsrcplugin.cpp

@@ -1,7 +1,9 @@
+#include "../../channelrx/tcpsrc/tcpsrcplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
-#include "tcpsrcplugin.h"
-#include "tcpsrcgui.h"
+
+#include "../../channelrx/tcpsrc/tcpsrcgui.h"
 
 const PluginDescriptor TCPSrcPlugin::m_pluginDescriptor = {
 	QString("TCP Channel Source"),

plugins/channelrx/udpsrc/CMakeLists.txt

@@ -41,4 +41,4 @@ target_link_libraries(demodudpsrc
 
 qt5_use_modules(demodudpsrc Core Widgets OpenGL Network Multimedia)
 
-install(TARGETS demodudpsrc DESTINATION lib/plugins/channel)
+install(TARGETS demodudpsrc DESTINATION lib/plugins/channelrx)

plugins/channelrx/udpsrc/udpsrc.cpp

@@ -15,14 +15,15 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "udpsrc.h"
+#include "../../channelrx/udpsrc/udpsrc.h"
 
 #include <QUdpSocket>
 #include <QThread>
 #include <QHostAddress>
 #include "dsp/channelizer.h"
 #include "dsp/dspengine.h"
-#include "udpsrcgui.h"
+
+#include "../../channelrx/udpsrc/udpsrcgui.h"
 
 MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcConfigure, Message)
 MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcConfigureImmediate, Message)