VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-05 06:37:51 -04:00
Code Issues Projects Releases Wiki Activity

Removed main window reference from device sink API

Browse Source
This commit is contained in:
f4exb 2017-10-24 16:58:12 +02:00
parent 7d746755c1
commit 933542e289
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sdrgui/device/devicesinkapi.cpp
View File

@ -22,12 +22,11 @@
#include "plugin/plugininterface.h" #include "plugin/plugininterface.h"
#include "gui/glspectrum.h" #include "gui/glspectrum.h"
#include "gui/channelwindow.h" #include "gui/channelwindow.h"
#include "mainwindow.h"
#include "settings/preset.h" #include "settings/preset.h"
#include "dsp/dspengine.h"
// TODO: extract GUI dependencies in a separate object // TODO: extract GUI dependencies in a separate object
DeviceSinkAPI::DeviceSinkAPI(MainWindow *mainWindow, DeviceSinkAPI::DeviceSinkAPI(int deviceTabIndex,
int deviceTabIndex,
DSPDeviceSinkEngine *deviceSinkEngine, DSPDeviceSinkEngine *deviceSinkEngine,
GLSpectrum *glSpectrum, GLSpectrum *glSpectrum,
ChannelWindow *channelWindow) : ChannelWindow *channelWindow) :
@ -40,7 +39,7 @@ DeviceSinkAPI::DeviceSinkAPI(MainWindow *mainWindow,
m_sampleSinkPluginInstanceUI(0), m_sampleSinkPluginInstanceUI(0),
m_buddySharedPtr(0), m_buddySharedPtr(0),
m_isBuddyLeader(false), m_isBuddyLeader(false),
m_masterTimer(mainWindow->getMasterTimer()) // TODO: get master timer directly not from main window m_masterTimer(DSPEngine::instance()->getMasterTimer())
{ {
} }

4
sdrgui/device/devicesinkapi.h
View File

@ -23,7 +23,6 @@
#include "dsp/dspdevicesinkengine.h" #include "dsp/dspdevicesinkengine.h"
#include "util/export.h" #include "util/export.h"
class MainWindow;
class GLSpectrum; class GLSpectrum;
class ChannelWindow; class ChannelWindow;
class BasebandSampleSource; class BasebandSampleSource;
@ -130,8 +129,7 @@ protected:
typedef QList<ChannelInstanceRegistration> ChannelInstanceRegistrations; typedef QList<ChannelInstanceRegistration> ChannelInstanceRegistrations;
DeviceSinkAPI(MainWindow *mainWindow, DeviceSinkAPI(int deviceTabIndex,
int deviceTabIndex,
DSPDeviceSinkEngine *deviceEngine, DSPDeviceSinkEngine *deviceEngine,
GLSpectrum *glSpectrum, GLSpectrum *glSpectrum,
ChannelWindow *channelWindow); ChannelWindow *channelWindow);

2
sdrgui/device/devicesourceapi.cpp
View File

@ -39,7 +39,7 @@ DeviceSourceAPI::DeviceSourceAPI(int deviceTabIndex,
m_sampleSourcePluginInstanceUI(0), m_sampleSourcePluginInstanceUI(0),
m_buddySharedPtr(0), m_buddySharedPtr(0),
m_isBuddyLeader(false), m_isBuddyLeader(false),
m_masterTimer(DSPEngine::instance()->getMasterTimer()) // TODO: get master timer directly not from main window m_masterTimer(DSPEngine::instance()->getMasterTimer())
{ {
} }

2
sdrgui/mainwindow.cpp
View File

@ -258,7 +258,7 @@ void MainWindow::addSinkDevice()
char tabNameCStr[16]; char tabNameCStr[16];
sprintf(tabNameCStr, "T%d", deviceTabIndex); sprintf(tabNameCStr, "T%d", deviceTabIndex);
DeviceSinkAPI *deviceSinkAPI = new DeviceSinkAPI(this, deviceTabIndex, dspDeviceSinkEngine, m_deviceUIs.back()->m_spectrum, m_deviceUIs.back()->m_channelWindow); DeviceSinkAPI *deviceSinkAPI = new DeviceSinkAPI(deviceTabIndex, dspDeviceSinkEngine, m_deviceUIs.back()->m_spectrum, m_deviceUIs.back()->m_channelWindow);
m_deviceUIs.back()->m_deviceSourceAPI = 0; m_deviceUIs.back()->m_deviceSourceAPI = 0;
m_deviceUIs.back()->m_deviceSinkAPI = deviceSinkAPI; m_deviceUIs.back()->m_deviceSinkAPI = deviceSinkAPI;