VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

RxTx semantic move: updated attributes and method names. Removed obsolete methods

This commit is contained in:
f4exb 2016-10-11 01:11:32 +02:00
parent 211f0570b5
commit 6b2e09ed10
3 changed files with 31 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
sdrbase/dsp/dspengine.cpp
View File

@ -20,7 +20,7 @@
#include "dsp/dspengine.h"
DSPEngine::DSPEngine() :
m_deviceEnginesUIDSequence(0),
m_deviceSourceEnginesUIDSequence(0),
m_audioSampleRate(48000) // Use default output device at 48 kHz
{
m_dvSerialSupport = false;
@ -30,9 +30,9 @@ DSPEngine::~DSPEngine()
{
m_audioOutput.setOnExit(true);
std::vector<DSPDeviceSourceEngine*>::iterator it = m_deviceEngines.begin();
std::vector<DSPDeviceSourceEngine*>::iterator it = m_deviceSourceEngines.begin();
while (it != m_deviceEngines.end())
while (it != m_deviceSourceEngines.end())
{
delete *it;
++it;
@ -45,44 +45,21 @@ DSPEngine *DSPEngine::instance()
return dspEngine;
}
DSPDeviceSourceEngine *DSPEngine::addDeviceEngine()
DSPDeviceSourceEngine *DSPEngine::addDeviceSourceEngine()
{
m_deviceEngines.push_back(new DSPDeviceSourceEngine(m_deviceEnginesUIDSequence));
m_deviceEnginesUIDSequence++;
return m_deviceEngines.back();
m_deviceSourceEngines.push_back(new DSPDeviceSourceEngine(m_deviceSourceEnginesUIDSequence));
m_deviceSourceEnginesUIDSequence++;
return m_deviceSourceEngines.back();
}
void DSPEngine::removeLastDeviceEngine()
void DSPEngine::removeLastDeviceSourceEngine()
{
if (m_deviceEngines.size() > 0)
if (m_deviceSourceEngines.size() > 0)
{
DSPDeviceSourceEngine *lastDeviceEngine = m_deviceEngines.back();
DSPDeviceSourceEngine *lastDeviceEngine = m_deviceSourceEngines.back();
delete lastDeviceEngine;
m_deviceEngines.pop_back();
m_deviceEnginesUIDSequence--;
}
}
void DSPEngine::stopAllAcquisitions()
{
std::vector<DSPDeviceSourceEngine*>::iterator it = m_deviceEngines.begin();
while (it != m_deviceEngines.end())
{
(*it)->stopAcquistion();
stopAudio();
++it;
}
}
void DSPEngine::stopAllDeviceEngines()
{
std::vector<DSPDeviceSourceEngine*>::iterator it = m_deviceEngines.begin();
while (it != m_deviceEngines.end())
{
(*it)->stop();
++it;
m_deviceSourceEngines.pop_back();
m_deviceSourceEnginesUIDSequence--;
}
}
@ -120,11 +97,11 @@ void DSPEngine::removeAudioSink(AudioFifo* audioFifo)
m_audioOutput.removeFifo(audioFifo);
}
DSPDeviceSourceEngine *DSPEngine::getDeviceEngineByUID(uint uid)
DSPDeviceSourceEngine *DSPEngine::getDeviceSourceEngineByUID(uint uid)
{
std::vector<DSPDeviceSourceEngine*>::iterator it = m_deviceEngines.begin();
std::vector<DSPDeviceSourceEngine*>::iterator it = m_deviceSourceEngines.begin();
while (it != m_deviceEngines.end())
while (it != m_deviceSourceEngines.end())
{
if ((*it)->getUID() == uid)
{

14
sdrbase/dsp/dspengine.h
View File

@ -40,18 +40,16 @@ public:
uint getAudioSampleRate() const { return m_audioSampleRate; }
DSPDeviceSourceEngine *addDeviceEngine();
void removeLastDeviceEngine();
void stopAllAcquisitions();
void stopAllDeviceEngines();
DSPDeviceSourceEngine *addDeviceSourceEngine();
void removeLastDeviceSourceEngine();
void startAudio();
void stopAudio();
void startAudioImmediate();
void stopAudioImmediate();
DSPDeviceSourceEngine *getDeviceEngineByIndex(uint deviceIndex) { return m_deviceEngines[deviceIndex]; }
DSPDeviceSourceEngine *getDeviceEngineByUID(uint uid);
DSPDeviceSourceEngine *getDeviceSourceEngineByIndex(uint deviceIndex) { return m_deviceSourceEngines[deviceIndex]; }
DSPDeviceSourceEngine *getDeviceSourceEngineByUID(uint uid);
void addAudioSink(AudioFifo* audioFifo); //!< Add the audio sink
void removeAudioSink(AudioFifo* audioFifo); //!< Remove the audio sink
@ -84,8 +82,8 @@ public:
}
private:
std::vector<DSPDeviceSourceEngine*> m_deviceEngines;
uint m_deviceEnginesUIDSequence;
std::vector<DSPDeviceSourceEngine*> m_deviceSourceEngines;
uint m_deviceSourceEnginesUIDSequence;
AudioOutput m_audioOutput;
uint m_audioSampleRate;
bool m_dvSerialSupport;

20
sdrbase/mainwindow.cpp
View File

@ -172,31 +172,31 @@ MainWindow::~MainWindow()
void MainWindow::addDevice()
{
DSPDeviceSourceEngine *dspDeviceEngine = m_dspEngine->addDeviceEngine();
dspDeviceEngine->start();
DSPDeviceSourceEngine *dspDeviceSourceEngine = m_dspEngine->addDeviceSourceEngine();
dspDeviceSourceEngine->start();
uint dspDeviceEngineUID = dspDeviceEngine->getUID();
uint dspDeviceSourceEngineUID = dspDeviceSourceEngine->getUID();
char tabNameCStr[16];
sprintf(tabNameCStr, "R%d", dspDeviceEngineUID);
sprintf(tabNameCStr, "R%d", dspDeviceSourceEngineUID);
m_deviceUIs.push_back(new DeviceUISet(m_masterTimer));
m_deviceUIs.back()->m_deviceEngine = dspDeviceEngine;
m_deviceUIs.back()->m_deviceEngine = dspDeviceSourceEngine;
DeviceAPI *deviceAPI = new DeviceAPI(this, m_deviceUIs.size()-1, dspDeviceEngine, m_deviceUIs.back()->m_spectrum, m_deviceUIs.back()->m_channelWindow);
DeviceAPI *deviceAPI = new DeviceAPI(this, m_deviceUIs.size()-1, dspDeviceSourceEngine, m_deviceUIs.back()->m_spectrum, m_deviceUIs.back()->m_channelWindow);
m_deviceUIs.back()->m_deviceAPI = deviceAPI;
m_deviceUIs.back()->m_samplingDeviceControl->setDeviceAPI(deviceAPI);
m_deviceUIs.back()->m_samplingDeviceControl->setPluginManager(m_pluginManager);
m_deviceUIs.back()->m_samplingDeviceControl->populateChannelSelector();
dspDeviceEngine->addSink(m_deviceUIs.back()->m_spectrumVis);
dspDeviceSourceEngine->addSink(m_deviceUIs.back()->m_spectrumVis);
ui->tabSpectra->addTab(m_deviceUIs.back()->m_spectrum, tabNameCStr);
ui->tabSpectraGUI->addTab(m_deviceUIs.back()->m_spectrumGUI, tabNameCStr);
ui->tabChannels->addTab(m_deviceUIs.back()->m_channelWindow, tabNameCStr);
bool sampleSourceSignalsBlocked = m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelector()->blockSignals(true);
m_pluginManager->duplicateLocalSampleSourceDevices(dspDeviceEngineUID);
m_pluginManager->fillSampleSourceSelector(m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelector(), dspDeviceEngineUID);
m_pluginManager->duplicateLocalSampleSourceDevices(dspDeviceSourceEngineUID);
m_pluginManager->fillSampleSourceSelector(m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelector(), dspDeviceSourceEngineUID);
connect(m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelectionConfirm(), SIGNAL(clicked(bool)), this, SLOT(on_sampleSource_confirmClicked(bool)));
@ -234,7 +234,7 @@ void MainWindow::removeLastDevice()
delete m_deviceUIs.back();
lastDeviceEngine->stop();
m_dspEngine->removeLastDeviceEngine();
m_dspEngine->removeLastDeviceSourceEngine();
m_deviceUIs.pop_back();
}