Deep redesign: removed useless samplesource subdirectory

CMakeLists.txt

@@ -98,7 +98,7 @@ set(sdrbase_SOURCES
 	sdrbase/gui/scaleengine.cpp
 	sdrbase/gui/valuedial.cpp
 
-	sdrbase/dsp/samplesource/samplesource.cpp
+	sdrbase/dsp/samplesource.cpp
 
 	sdrbase/plugin/pluginapi.cpp
 	sdrbase/plugin/plugingui.cpp
@@ -172,7 +172,7 @@ set(sdrbase_HEADERS
 	include-gpl/gui/scaleengine.h
 	include-gpl/gui/valuedial.h
 
-	include/dsp/samplesource/samplesource.h
+	include/dsp/samplesource.h
 
 	include/plugin/pluginapi.h
 	include/plugin/plugingui.h

plugins/samplesource/bladerf/bladerfinput.h

@@ -17,7 +17,7 @@
 #ifndef INCLUDE_BLADERFINPUT_H
 #define INCLUDE_BLADERFINPUT_H
 
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 #include <libbladeRF.h>
 #include <QString>
 

plugins/samplesource/fcd/fcdinput.h

@@ -18,7 +18,7 @@
 #ifndef INCLUDE_FCDINPUT_H
 #define INCLUDE_FCDINPUT_H
 
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 #include <QString>
 
 struct fcd_buffer {

plugins/samplesource/filesource/filesourceinput.h

@@ -17,7 +17,7 @@
 #ifndef INCLUDE_FILESOURCEINPUT_H
 #define INCLUDE_FILESOURCEINPUT_H
 
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 #include <QString>
 #include <QTimer>
 #include <ctime>

plugins/samplesource/rtlsdr/rtlsdrinput.h

@@ -18,7 +18,7 @@
 #ifndef INCLUDE_RTLSDRINPUT_H
 #define INCLUDE_RTLSDRINPUT_H
 
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 #include <rtl-sdr.h>
 #include <QString>
 

sdrbase/dsp/dspengine.cpp

@@ -23,7 +23,7 @@
 #include "dsp/samplesink.h"
 #include "dsp/threadedsamplesink.h"
 #include "dsp/dspcommands.h"
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 
 DSPEngine::DSPEngine(QObject* parent) :
 	QThread(parent),

sdrbase/dsp/samplesource.cpp

@@ -15,7 +15,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 
 SampleSource::SampleSource()
 {

sdrbase/plugin/pluginmanager.cpp

@@ -6,7 +6,7 @@
 #include "settings/preset.h"
 #include "mainwindow.h"
 #include "dsp/dspengine.h"
-#include "dsp/samplesource/samplesource.h"
+#include "dsp/samplesource.h"
 
 #include <QDebug>
 #include "util/stacktrace.h"