VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 01:39:05 -05:00
Code Issues Projects Releases Wiki Activity

Removed main window reference from device source API

Browse Source
This commit is contained in:
f4exb 2017-10-24 16:54:01 +02:00
parent 9cfe817e96
commit 7d746755c1
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sdrgui/device/devicesourceapi.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
DeviceSourceAPI::DeviceSourceAPI(MainWindow *mainWindow, DeviceSourceAPI::DeviceSourceAPI(int deviceTabIndex,
int deviceTabIndex,
DSPDeviceSourceEngine *deviceSourceEngine, DSPDeviceSourceEngine *deviceSourceEngine,
GLSpectrum *glSpectrum, GLSpectrum *glSpectrum,
ChannelWindow *channelWindow) : ChannelWindow *channelWindow) :
@ -40,7 +39,7 @@ DeviceSourceAPI::DeviceSourceAPI(MainWindow *mainWindow,
m_sampleSourcePluginInstanceUI(0), m_sampleSourcePluginInstanceUI(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()) // TODO: get master timer directly not from main window
{ {
} }

4
sdrgui/device/devicesourceapi.h
View File

@ -25,7 +25,6 @@
#include "util/export.h" #include "util/export.h"
class MainWindow;
class GLSpectrum; class GLSpectrum;
class ChannelWindow; class ChannelWindow;
class BasebandSampleSink; class BasebandSampleSink;
@ -131,8 +130,7 @@ protected:
typedef QList<ChannelInstanceRegistration> ChannelInstanceRegistrations; typedef QList<ChannelInstanceRegistration> ChannelInstanceRegistrations;
DeviceSourceAPI(MainWindow *mainWindow, DeviceSourceAPI(int deviceTabIndex,
int deviceTabIndex,
DSPDeviceSourceEngine *deviceSourceEngine, DSPDeviceSourceEngine *deviceSourceEngine,
GLSpectrum *glSpectrum, GLSpectrum *glSpectrum,
ChannelWindow *channelWindow); ChannelWindow *channelWindow);

2
sdrgui/mainwindow.cpp
View File

@ -203,7 +203,7 @@ void MainWindow::addSourceDevice()
char tabNameCStr[16]; char tabNameCStr[16];
sprintf(tabNameCStr, "R%d", deviceTabIndex); sprintf(tabNameCStr, "R%d", deviceTabIndex);
DeviceSourceAPI *deviceSourceAPI = new DeviceSourceAPI(this, deviceTabIndex, dspDeviceSourceEngine, m_deviceUIs.back()->m_spectrum, m_deviceUIs.back()->m_channelWindow); DeviceSourceAPI *deviceSourceAPI = new DeviceSourceAPI(deviceTabIndex, dspDeviceSourceEngine, m_deviceUIs.back()->m_spectrum, m_deviceUIs.back()->m_channelWindow);
m_deviceUIs.back()->m_deviceSourceAPI = deviceSourceAPI; m_deviceUIs.back()->m_deviceSourceAPI = deviceSourceAPI;
m_deviceUIs.back()->m_samplingDeviceControl->setDeviceAPI(deviceSourceAPI); m_deviceUIs.back()->m_samplingDeviceControl->setDeviceAPI(deviceSourceAPI);