VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-14 15:33:34 -04:00
Code Issues Projects Releases Wiki Activity

RxTx semantic move: renamed DeviceAPI to DeviceSourceAPI

Browse Source
This commit is contained in:
f4exb
2016-10-11 01:17:55 +02:00
parent 6b2e09ed10
commit 32595f81b9
106 changed files with 333 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/sdrdaemon/sdrdaemongui.cpp
+3 -2
View File
@@ -30,7 +30,6 @@
#include <nanomsg/pair.h>
#include "ui_sdrdaemongui.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 "sdrdaemongui.h"
#include <device/devicesourceapi.h>
#include <dsp/filerecord.h>
SDRdaemonGui::SDRdaemonGui(DeviceAPI *deviceAPI, QWidget* parent) :
SDRdaemonGui::SDRdaemonGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
ui(new Ui::SDRdaemonGui),
m_deviceAPI(deviceAPI),
plugins/samplesource/sdrdaemon/sdrdaemongui.h
+3 -3
View File
@@ -23,7 +23,7 @@
#include "sdrdaemoninput.h"
class DeviceAPI;
class DeviceSourceAPI;
class FileRecord;
namespace Ui {
@@ -34,7 +34,7 @@ class SDRdaemonGui : public QWidget, public PluginGUI {
Q_OBJECT
public:
explicit SDRdaemonGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit SDRdaemonGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~SDRdaemonGui();
void destroy();
@@ -51,7 +51,7 @@ public:
private:
Ui::SDRdaemonGui* ui;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
QTimer m_updateTimer;
QTimer m_statusTimer;
DeviceSampleSource* m_sampleSource;
plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp
+2 -2
View File
@@ -18,13 +18,13 @@
#include <errno.h>
#include <QDebug>
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "sdrdaemongui.h"
#include "sdrdaemoninput.h"
#include <device/devicesourceapi.h>
#include <dsp/filerecord.h>
#include "sdrdaemonudphandler.h"
@@ -39,7 +39,7 @@ MESSAGE_CLASS_DEFINITION(SDRdaemonInput::MsgReportSDRdaemonAcquisition, Message)
MESSAGE_CLASS_DEFINITION(SDRdaemonInput::MsgReportSDRdaemonStreamData, Message)
MESSAGE_CLASS_DEFINITION(SDRdaemonInput::MsgReportSDRdaemonStreamTiming, Message)
SDRdaemonInput::SDRdaemonInput(const QTimer& masterTimer, DeviceAPI *deviceAPI) :
SDRdaemonInput::SDRdaemonInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_address("127.0.0.1"),
m_port(9090),
plugins/samplesource/sdrdaemon/sdrdaemoninput.h
+3 -3
View File
@@ -24,7 +24,7 @@
#include <iostream>
#include <stdint.h>
class DeviceAPI;
class DeviceSourceAPI;
class SDRdaemonUDPHandler;
class SDRdaemonInput : public DeviceSampleSource {
@@ -274,7 +274,7 @@ public:
{ }
};
SDRdaemonInput(const QTimer& masterTimer, DeviceAPI *deviceAPI);
SDRdaemonInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI);
virtual ~SDRdaemonInput();
virtual bool init(const Message& message);
@@ -290,7 +290,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/sdrdaemon/sdrdaemonplugin.cpp
+2 -2
View File
@@ -17,11 +17,11 @@
#include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "sdrdaemongui.h"
#include "sdrdaemonplugin.h"
#include <device/devicesourceapi.h>
const PluginDescriptor SDRdaemonPlugin::m_pluginDescriptor = {
QString("SDRdaemon input"),
@@ -67,7 +67,7 @@ PluginInterface::SampleSourceDevices SDRdaemonPlugin::enumSampleSources()
return result;
}
PluginGUI* SDRdaemonPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI)
PluginGUI* SDRdaemonPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{
plugins/samplesource/sdrdaemon/sdrdaemonplugin.h
+1 -1
View File
@@ -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/sdrdaemon/sdrdaemonudphandler.cpp
+4 -2
View File
@@ -19,13 +19,15 @@
#include <QTimer>
#include <unistd.h>
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "sdrdaemonudphandler.h"
#include <device/devicesourceapi.h>
#include "sdrdaemoninput.h"
SDRdaemonUDPHandler::SDRdaemonUDPHandler(SampleSinkFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *devieAPI) :
SDRdaemonUDPHandler::SDRdaemonUDPHandler(SampleSinkFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceSourceAPI *devieAPI) :
m_deviceAPI(devieAPI),
m_sdrDaemonBuffer(m_rateDivider),
m_dataSocket(0),
plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h
+3 -3
View File
@@ -30,13 +30,13 @@
class SampleSinkFifo;
class MessageQueue;
class QTimer;
class DeviceAPI;
class DeviceSourceAPI;
class SDRdaemonUDPHandler : public QObject
{
Q_OBJECT
public:
SDRdaemonUDPHandler(SampleSinkFifo* sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *deviceAPI);
SDRdaemonUDPHandler(SampleSinkFifo* sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceSourceAPI *deviceAPI);
~SDRdaemonUDPHandler();
void connectTimer(const QTimer* timer);
void start();
@@ -50,7 +50,7 @@ public slots:
void dataReadyRead();
private:
DeviceAPI *m_deviceAPI;
DeviceSourceAPI *m_deviceAPI;
SDRdaemonBuffer m_sdrDaemonBuffer;
QUdpSocket *m_dataSocket;
QHostAddress m_dataAddress;