From 1b95457d960f57300fe6e36f3dbfebadda3a6d87 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 22 Oct 2017 23:50:10 +0200 Subject: [PATCH] Device source and sink APIs: removed direct reference to main window --- plugins/samplesink/filesink/filesinkgui.cpp | 2 +- plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp | 2 +- plugins/samplesource/filesource/filesourcegui.cpp | 2 +- plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp | 2 +- sdrgui/device/devicesinkapi.cpp | 1 - sdrgui/device/devicesinkapi.h | 2 -- sdrgui/device/devicesourceapi.cpp | 1 - sdrgui/device/devicesourceapi.h | 2 -- 8 files changed, 4 insertions(+), 10 deletions(-) diff --git a/plugins/samplesink/filesink/filesinkgui.cpp b/plugins/samplesink/filesink/filesinkgui.cpp index c27564726..69abb54ab 100644 --- a/plugins/samplesink/filesink/filesinkgui.cpp +++ b/plugins/samplesink/filesink/filesinkgui.cpp @@ -59,7 +59,7 @@ FileSinkGui::FileSinkGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : ui->fileNameText->setText(m_fileName); - connect(&(m_deviceAPI->getMainWindow()->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); + connect(&(m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); m_statusTimer.start(500); diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp index 371f5905e..f3afc08ac 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp @@ -78,7 +78,7 @@ SDRdaemonSinkGui::SDRdaemonSinkGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(7, 32000U, 9000000U); - connect(&(m_deviceAPI->getMainWindow()->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); + connect(&(m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); m_statusTimer.start(500); diff --git a/plugins/samplesource/filesource/filesourcegui.cpp b/plugins/samplesource/filesource/filesourcegui.cpp index 712a63b66..b46a4c028 100644 --- a/plugins/samplesource/filesource/filesourcegui.cpp +++ b/plugins/samplesource/filesource/filesourcegui.cpp @@ -56,7 +56,7 @@ FileSourceGui::FileSourceGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : ui->centerFrequency->setValueRange(7, 0, pow(10,7)); ui->fileNameText->setText(m_fileName); - connect(&(m_deviceAPI->getMainWindow()->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); + connect(&(m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); m_statusTimer.start(500); diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp index 54b5d12d5..7135bd3f3 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp @@ -99,7 +99,7 @@ SDRdaemonSourceGui::SDRdaemonSourceGui(DeviceSourceAPI *deviceAPI, QWidget* pare connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); m_statusTimer.start(500); - connect(&(deviceAPI->getMainWindow()->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); + connect(&(deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); m_sampleSource = (SDRdaemonSourceInput*) m_deviceAPI->getSampleSource(); diff --git a/sdrgui/device/devicesinkapi.cpp b/sdrgui/device/devicesinkapi.cpp index d5e3413b1..ae612a4c1 100644 --- a/sdrgui/device/devicesinkapi.cpp +++ b/sdrgui/device/devicesinkapi.cpp @@ -31,7 +31,6 @@ DeviceSinkAPI::DeviceSinkAPI(MainWindow *mainWindow, DSPDeviceSinkEngine *deviceSinkEngine, GLSpectrum *glSpectrum, ChannelWindow *channelWindow) : - m_mainWindow(mainWindow), m_deviceTabIndex(deviceTabIndex), m_deviceSinkEngine(deviceSinkEngine), m_spectrum(glSpectrum), diff --git a/sdrgui/device/devicesinkapi.h b/sdrgui/device/devicesinkapi.h index 45c67ec97..fb2036d00 100644 --- a/sdrgui/device/devicesinkapi.h +++ b/sdrgui/device/devicesinkapi.h @@ -94,7 +94,6 @@ public: void loadChannelSettings(const Preset* preset, PluginAPI *pluginAPI); void saveChannelSettings(Preset* preset); - MainWindow *getMainWindow() { return m_mainWindow; } DSPDeviceSinkEngine *getDeviceSinkEngine() { return m_deviceSinkEngine; } const std::vector& getSourceBuddies() const { return m_sourceBuddies; } @@ -141,7 +140,6 @@ protected: void renameChannelInstances(); - MainWindow *m_mainWindow; int m_deviceTabIndex; DSPDeviceSinkEngine *m_deviceSinkEngine; GLSpectrum *m_spectrum; diff --git a/sdrgui/device/devicesourceapi.cpp b/sdrgui/device/devicesourceapi.cpp index fb63fc50a..0412c622f 100644 --- a/sdrgui/device/devicesourceapi.cpp +++ b/sdrgui/device/devicesourceapi.cpp @@ -31,7 +31,6 @@ DeviceSourceAPI::DeviceSourceAPI(MainWindow *mainWindow, DSPDeviceSourceEngine *deviceSourceEngine, GLSpectrum *glSpectrum, ChannelWindow *channelWindow) : - m_mainWindow(mainWindow), m_deviceTabIndex(deviceTabIndex), m_deviceSourceEngine(deviceSourceEngine), m_spectrum(glSpectrum), diff --git a/sdrgui/device/devicesourceapi.h b/sdrgui/device/devicesourceapi.h index 3e9e9c6f8..0433acd91 100644 --- a/sdrgui/device/devicesourceapi.h +++ b/sdrgui/device/devicesourceapi.h @@ -95,7 +95,6 @@ public: void loadChannelSettings(const Preset* preset, PluginAPI *pluginAPI); void saveChannelSettings(Preset* preset); - MainWindow *getMainWindow() { return m_mainWindow; } DSPDeviceSourceEngine *getDeviceSourceEngine() { return m_deviceSourceEngine; } const std::vector& getSourceBuddies() const { return m_sourceBuddies; } @@ -142,7 +141,6 @@ protected: void renameChannelInstances(); - MainWindow *m_mainWindow; int m_deviceTabIndex; DSPDeviceSourceEngine *m_deviceSourceEngine; GLSpectrum *m_spectrum;