VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-10-01 09:16:39 -04:00
Code Issues Projects Releases Wiki Activity

Multi device support: suppress reference to DSPEngine in PluginAPI

Browse Source
This commit is contained in:
f4exb 2016-05-11 16:03:03 +02:00
parent c556a16caa
commit e3d39c7d3f
4 changed files with 5 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdrbase/mainwindow.cpp
View File

@ -64,7 +64,6 @@ MainWindow::MainWindow(QWidget* parent) :
m_sampleFileName(std::string("./test.sdriq")) m_sampleFileName(std::string("./test.sdriq"))
{ {
qDebug() << "MainWindow::MainWindow: start"; qDebug() << "MainWindow::MainWindow: start";
m_pluginManager = new PluginManager(this, m_dspEngine);
connect(m_dspEngine->getOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); connect(m_dspEngine->getOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
m_dspEngine->start(); m_dspEngine->start();
@ -105,6 +104,7 @@ MainWindow::MainWindow(QWidget* parent) :
qDebug() << "MainWindow::MainWindow: m_pluginManager->loadPlugins ..."; qDebug() << "MainWindow::MainWindow: m_pluginManager->loadPlugins ...";
m_pluginManager = new PluginManager(this, m_dspEngine);
m_pluginManager->loadPlugins(); m_pluginManager->loadPlugins();
//bool sampleSourceSignalsBlocked = ui->sampleSource->blockSignals(true); //bool sampleSourceSignalsBlocked = ui->sampleSource->blockSignals(true);

37
sdrbase/plugin/pluginapi.cpp
View File

@ -54,47 +54,14 @@ void PluginAPI::removeChannelMarker(ChannelMarker* channelMarker)
m_mainWindow->removeChannelMarker(channelMarker); m_mainWindow->removeChannelMarker(channelMarker);
} }
/*
void PluginAPI::setSampleSource(SampleSource* sampleSource)
{
m_dspEngine->stopAcquistion();
m_dspEngine->setSource(sampleSource);
}
void PluginAPI::addSampleSink(SampleSink* sampleSink)
{
m_dspEngine->addSink(sampleSink);
}
void PluginAPI::removeSampleSink(SampleSink* sampleSink)
{
m_dspEngine->removeSink(sampleSink);
}
MessageQueue* PluginAPI::getDSPEngineMessageQueue()
{
return m_dspEngine->getInputMessageQueue();
}
void PluginAPI::addAudioSource(AudioFifo* audioFifo)
{
m_dspEngine->addAudioSink(audioFifo);
}
void PluginAPI::removeAudioSource(AudioFifo* audioFifo)
{
m_dspEngine->removeAudioSink(audioFifo);
}*/
void PluginAPI::registerSampleSource(const QString& sourceName, PluginInterface* plugin) void PluginAPI::registerSampleSource(const QString& sourceName, PluginInterface* plugin)
{ {
m_pluginManager->registerSampleSource(sourceName, plugin); m_pluginManager->registerSampleSource(sourceName, plugin);
} }
PluginAPI::PluginAPI(PluginManager* pluginManager, MainWindow* mainWindow, DSPEngine* dspEngine) : PluginAPI::PluginAPI(PluginManager* pluginManager, MainWindow* mainWindow) :
QObject(mainWindow), QObject(mainWindow),
m_pluginManager(pluginManager), m_pluginManager(pluginManager),
m_mainWindow(mainWindow), m_mainWindow(mainWindow)
m_dspEngine(dspEngine)
{ {
} }

13
sdrbase/plugin/pluginapi.h
View File

@ -36,16 +36,6 @@ public:
void addChannelMarker(ChannelMarker* channelMarker); void addChannelMarker(ChannelMarker* channelMarker);
void removeChannelMarker(ChannelMarker* channelMarker); void removeChannelMarker(ChannelMarker* channelMarker);
// DSPEngine access
/* Direct access with DSP engine singleton
void setSampleSource(SampleSource* sampleSource);
void addSampleSink(SampleSink* sampleSink);
void removeSampleSink(SampleSink* sampleSink);
MessageQueue* getDSPEngineMessageQueue();
void addAudioSource(AudioFifo* audioFifo);
void removeAudioSource(AudioFifo* audioFifo);
*/
// Sample Source stuff // Sample Source stuff
void registerSampleSource(const QString& sourceName, PluginInterface* plugin); void registerSampleSource(const QString& sourceName, PluginInterface* plugin);
@ -55,9 +45,8 @@ public:
protected: protected:
PluginManager* m_pluginManager; PluginManager* m_pluginManager;
MainWindow* m_mainWindow; MainWindow* m_mainWindow;
DSPEngine* m_dspEngine;
PluginAPI(PluginManager* pluginManager, MainWindow* mainWindow, DSPEngine* dspEngine); PluginAPI(PluginManager* pluginManager, MainWindow* mainWindow);
friend class PluginManager; friend class PluginManager;
}; };

2
sdrbase/plugin/pluginmanager.cpp
View File

@ -12,7 +12,7 @@
PluginManager::PluginManager(MainWindow* mainWindow, DSPEngine* dspEngine, QObject* parent) : PluginManager::PluginManager(MainWindow* mainWindow, DSPEngine* dspEngine, QObject* parent) :
QObject(parent), QObject(parent),
m_pluginAPI(this, mainWindow, dspEngine), m_pluginAPI(this, mainWindow),
m_mainWindow(mainWindow), m_mainWindow(mainWindow),
m_dspEngine(dspEngine), m_dspEngine(dspEngine),
m_sampleSourceId(), m_sampleSourceId(),