RxTx semantic move: renamed DeviceAPI to DeviceSourceAPI

plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp

@@ -30,7 +30,6 @@
 #include <nanomsg/pair.h>
 
 #include "ui_sdrdaemonfecgui.h"
-#include "device/deviceapi.h"
 #include "gui/colormapper.h"
 #include "gui/glspectrum.h"
 #include "dsp/dspengine.h"
@@ -39,9 +38,11 @@
 #include "util/simpleserializer.h"
 
 #include "sdrdaemonfecgui.h"
+
+#include <device/devicesourceapi.h>
 #include <dsp/filerecord.h>
 
-SDRdaemonFECGui::SDRdaemonFECGui(DeviceAPI *deviceAPI, QWidget* parent) :
+SDRdaemonFECGui::SDRdaemonFECGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
 	QWidget(parent),
 	ui(new Ui::SDRdaemonFECGui),
 	m_deviceAPI(deviceAPI),

plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h

@@ -23,7 +23,7 @@
 
 #include "sdrdaemonfecinput.h"
 
-class DeviceAPI;
+class DeviceSourceAPI;
 class FileRecord;
 
 namespace Ui {
@@ -34,7 +34,7 @@ class SDRdaemonFECGui : public QWidget, public PluginGUI {
 	Q_OBJECT
 
 public:
-	explicit SDRdaemonFECGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
+	explicit SDRdaemonFECGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
 	virtual ~SDRdaemonFECGui();
 	void destroy();
 
@@ -51,7 +51,7 @@ public:
 private:
 	Ui::SDRdaemonFECGui* ui;
 
-	DeviceAPI* m_deviceAPI;
+	DeviceSourceAPI* m_deviceAPI;
 	QTimer m_updateTimer;
 	QTimer m_statusTimer;
 	DeviceSampleSource* m_sampleSource;

plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp

@@ -18,12 +18,12 @@
 #include <errno.h>
 #include <QDebug>
 
-#include "device/deviceapi.h"
 #include "util/simpleserializer.h"
 #include "dsp/dspcommands.h"
 #include "dsp/dspengine.h"
 #include "sdrdaemonfecinput.h"
 
+#include <device/devicesourceapi.h>
 #include <dsp/filerecord.h>
 
 #include "sdrdaemonfecgui.h"
@@ -37,7 +37,7 @@ MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgReportSDRdaemonAcquisition, Messa
 MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgReportSDRdaemonFECStreamData, Message)
 MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgReportSDRdaemonFECStreamTiming, Message)
 
-SDRdaemonFECInput::SDRdaemonFECInput(const QTimer& masterTimer, DeviceAPI *deviceAPI) :
+SDRdaemonFECInput::SDRdaemonFECInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI) :
     m_deviceAPI(deviceAPI),
 	m_address("127.0.0.1"),
 	m_port(9090),

plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h

@@ -24,7 +24,7 @@
 #include <iostream>
 #include <stdint.h>
 
-class DeviceAPI;
+class DeviceSourceAPI;
 class SDRdaemonFECUDPHandler;
 
 class SDRdaemonFECInput : public DeviceSampleSource {
@@ -258,7 +258,7 @@ public:
 		{ }
 	};
 
-	SDRdaemonFECInput(const QTimer& masterTimer, DeviceAPI *deviceAPI);
+	SDRdaemonFECInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI);
 	virtual ~SDRdaemonFECInput();
 
 	virtual bool init(const Message& message);
@@ -274,7 +274,7 @@ public:
 	virtual bool handleMessage(const Message& message);
 
 private:
-	DeviceAPI *m_deviceAPI;
+	DeviceSourceAPI *m_deviceAPI;
 	QMutex m_mutex;
 	QString m_address;
 	quint16 m_port;

plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp

@@ -17,11 +17,12 @@
 #include <QtPlugin>
 #include <QAction>
 #include "plugin/pluginapi.h"
-#include "device/deviceapi.h"
 #include "util/simpleserializer.h"
 
 #include "sdrdaemonfecplugin.h"
 
+#include <device/devicesourceapi.h>
+
 #include "sdrdaemonfecgui.h"
 
 const PluginDescriptor SDRdaemonFECPlugin::m_pluginDescriptor = {
@@ -68,7 +69,7 @@ PluginInterface::SampleSourceDevices SDRdaemonFECPlugin::enumSampleSources()
 	return result;
 }
 
-PluginGUI* SDRdaemonFECPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI)
+PluginGUI* SDRdaemonFECPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
 {
 	if(sourceId == m_deviceTypeID)
 	{

plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.h

@@ -36,7 +36,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;
 

plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp

@@ -19,13 +19,13 @@
 #include <QTimer>
 #include <unistd.h>
 
-#include "device/deviceapi.h"
 #include "dsp/dspcommands.h"
 #include "dsp/dspengine.h"
 #include "sdrdaemonfecinput.h"
 #include "sdrdaemonfecudphandler.h"
+#include <device/devicesourceapi.h>
 
-SDRdaemonFECUDPHandler::SDRdaemonFECUDPHandler(SampleSinkFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *devieAPI) :
+SDRdaemonFECUDPHandler::SDRdaemonFECUDPHandler(SampleSinkFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceSourceAPI *devieAPI) :
     m_deviceAPI(devieAPI),
 	m_sdrDaemonBuffer(m_rateDivider),
 	m_dataSocket(0),

plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h

@@ -30,13 +30,13 @@
 class SampleSinkFifo;
 class MessageQueue;
 class QTimer;
-class DeviceAPI;
+class DeviceSourceAPI;
 
 class SDRdaemonFECUDPHandler : public QObject
 {
 	Q_OBJECT
 public:
-	SDRdaemonFECUDPHandler(SampleSinkFifo* sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *deviceAPI);
+	SDRdaemonFECUDPHandler(SampleSinkFifo* sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceSourceAPI *deviceAPI);
 	~SDRdaemonFECUDPHandler();
 	void connectTimer(const QTimer* timer);
 	void start();
@@ -48,7 +48,7 @@ public slots:
 	void dataReadyRead();
 
 private:
-	DeviceAPI *m_deviceAPI;
+	DeviceSourceAPI *m_deviceAPI;
 	SDRdaemonFECBuffer m_sdrDaemonBuffer;
 	QUdpSocket *m_dataSocket;
 	QHostAddress m_dataAddress;