RxTx semantic move: renamed DeviceAPI to DeviceSourceAPI

plugins/samplesource/fcdproplus/fcdproplusgui.cpp

@@ -18,17 +18,17 @@
 #include <QMessageBox>
 
 #include "ui_fcdproplusgui.h"
-#include "device/deviceapi.h"
 #include "gui/colormapper.h"
 #include "gui/glspectrum.h"
 #include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "fcdproplusgui.h"
 
+#include <device/devicesourceapi.h>
 #include <dsp/filerecord.h>
 #include "fcdproplusconst.h"
 
-FCDProPlusGui::FCDProPlusGui(DeviceAPI *deviceAPI, QWidget* parent) :
+FCDProPlusGui::FCDProPlusGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
 	QWidget(parent),
 	ui(new Ui::FCDProPlusGui),
 	m_deviceAPI(deviceAPI),

plugins/samplesource/fcdproplus/fcdproplusgui.h

@@ -22,7 +22,7 @@
 #include "fcdproplusinput.h"
 #include "plugin/plugingui.h"
 
-class DeviceAPI;
+class DeviceSourceAPI;
 class FileRecord;
 
 namespace Ui {
@@ -33,7 +33,7 @@ class FCDProPlusGui : public QWidget, public PluginGUI {
 	Q_OBJECT
 
 public:
-	explicit FCDProPlusGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
+	explicit FCDProPlusGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
 	virtual ~FCDProPlusGui();
 	void destroy();
 
@@ -51,7 +51,7 @@ public:
 private:
 	Ui::FCDProPlusGui* ui;
 
-	DeviceAPI* m_deviceAPI;
+	DeviceSourceAPI* m_deviceAPI;
 	FCDProPlusSettings m_settings;
 	QTimer m_updateTimer;
 	QTimer m_statusTimer;

plugins/samplesource/fcdproplus/fcdproplusinput.cpp

@@ -20,11 +20,12 @@
 #include <string.h>
 #include <errno.h>
 
-#include "device/deviceapi.h"
 #include "dsp/dspcommands.h"
 #include "dsp/dspengine.h"
 #include "fcdproplusinput.h"
 
+#include <device/devicesourceapi.h>
+
 #include "fcdproplusgui.h"
 #include "fcdproplusthread.h"
 #include "fcdtraits.h"
@@ -32,7 +33,7 @@
 
 MESSAGE_CLASS_DEFINITION(FCDProPlusInput::MsgConfigureFCD, Message)
 
-FCDProPlusInput::FCDProPlusInput(DeviceAPI *deviceAPI) :
+FCDProPlusInput::FCDProPlusInput(DeviceSourceAPI *deviceAPI) :
     m_deviceAPI(deviceAPI),
 	m_dev(0),
 	m_settings(),

plugins/samplesource/fcdproplus/fcdproplusinput.h

@@ -29,7 +29,7 @@ struct fcd_buffer {
 	std::size_t length;
 };
 
-class DeviceAPI;
+class DeviceSourceAPI;
 class FCDProPlusThread;
 
 class FCDProPlusInput : public DeviceSampleSource {
@@ -54,7 +54,7 @@ public:
 		{ }
 	};
 
-	FCDProPlusInput(DeviceAPI *deviceAPI);
+	FCDProPlusInput(DeviceSourceAPI *deviceAPI);
 	virtual ~FCDProPlusInput();
 
 	virtual bool init(const Message& cmd);
@@ -79,7 +79,7 @@ public:
 private:
 	void applySettings(const FCDProPlusSettings& settings, bool force);
 
-	DeviceAPI *m_deviceAPI;
+	DeviceSourceAPI *m_deviceAPI;
 	hid_device *m_dev;
 	QMutex m_mutex;
 	FCDProPlusSettings m_settings;

plugins/samplesource/fcdproplus/fcdproplusplugin.cpp

@@ -17,9 +17,11 @@
 #include <QtPlugin>
 #include <QAction>
 #include "plugin/pluginapi.h"
-#include "device/deviceapi.h"
 #include "util/simpleserializer.h"
 #include "fcdproplusplugin.h"
+
+#include <device/devicesourceapi.h>
+
 #include "fcdproplusgui.h"
 #include "fcdtraits.h"
 
@@ -73,7 +75,7 @@ PluginInterface::SampleSourceDevices FCDProPlusPlugin::enumSampleSources()
 	return result;
 }
 
-PluginGUI* FCDProPlusPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI)
+PluginGUI* FCDProPlusPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
 {
 	if(sourceId == fcd_traits<ProPlus>::interfaceIID)
 	{

plugins/samplesource/fcdproplus/fcdproplusplugin.h

@@ -20,7 +20,7 @@ public:
 	void initPlugin(PluginAPI* pluginAPI);
 
 	virtual SampleSourceDevices enumSampleSources();
-	virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI);
+	virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
 
 	static const QString m_deviceTypeID;