VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -04:00
Code Issues Projects Releases Wiki Activity

Merged with f4exb branch

Browse Source
This commit is contained in:
f4exb
2015-08-09 10:36:31 +02:00
parent 3fd1346d08 4ba6f66cac
commit c5409e9b0f
27 changed files with 77 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/plugin/pluginmanager.cpp
+10 -11
View File
@@ -8,8 +8,7 @@
#include "dsp/dspengine.h"
#include "dsp/samplesource/samplesource.h"
#include <iostream>
#include <cstdio>
#include <QDebug>
#include "util/stacktrace.h"
PluginManager::PluginManager(MainWindow* mainWindow, DSPEngine* dspEngine, QObject* parent) :
@@ -72,16 +71,16 @@ void PluginManager::removeChannelInstance(PluginGUI* pluginGUI)
void PluginManager::registerSampleSource(const QString& sourceName, PluginInterface* plugin)
{
std::cerr << "PluginManager::registerSampleSource "
qDebug() << "PluginManager::registerSampleSource "
<< plugin->getPluginDescriptor().displayedName.toStdString()
<< " with source name " << sourceName.toStdString() << std::endl;
<< " with source name " << sourceName.toStdString();
m_sampleSourceRegistrations.append(SampleSourceRegistration(sourceName, plugin));
}
void PluginManager::loadSettings(const Preset* preset)
{
std::cerr << "PluginManager::loadSettings" << std::endl;
qDebug() << "PluginManager::loadSettings";
fprintf(stderr, "-------- [%s | %s] --------\n", qPrintable(preset->getGroup()), qPrintable(preset->getDescription()));
@@ -125,10 +124,10 @@ void PluginManager::loadSettings(const Preset* preset)
renameChannelInstances();
if(m_sampleSourceInstance != NULL) {
std::cerr << "m_sampleSourceInstance->deserializeGeneral (" << m_sampleSourceInstance->getName().toStdString() << ")" << std::endl;
qDebug() << "m_sampleSourceInstance->deserializeGeneral (" << m_sampleSourceInstance->getName().toStdString() << ")";
m_sampleSourceInstance->deserializeGeneral(preset->getSourceGeneralConfig());
if(m_sampleSource == preset->getSource()) {
std::cerr << "m_sampleSourceInstance->deserialize" << std::endl;
qDebug() << "m_sampleSourceInstance->deserialize";
m_sampleSourceInstance->deserialize(preset->getSourceConfig());
}
}
@@ -215,7 +214,7 @@ void PluginManager::fillSampleSourceSelector(QComboBox* comboBox)
int PluginManager::selectSampleSource(int index)
{
std::cout << "PluginManager::selectSampleSource by index" << std::endl;
qDebug() << "PluginManager::selectSampleSource by index";
m_dspEngine->stopAcquistion();
@@ -245,14 +244,14 @@ int PluginManager::selectSampleSource(int index)
return -1;
m_sampleSource = m_sampleSourceDevices[index].m_sourceName;
std::cerr << "m_sampleSource at index " << index << " is " << m_sampleSource.toStdString() << std::endl;
qDebug() << "m_sampleSource at index " << index << " is " << m_sampleSource.toStdString();
m_sampleSourceInstance = m_sampleSourceDevices[index].m_plugin->createSampleSource(m_sampleSource, m_sampleSourceDevices[index].m_address);
return index;
}
int PluginManager::selectSampleSource(const QString& source)
{
std::cout << "PluginManager::selectSampleSource by name: " << source.toStdString() << std::endl;
qDebug() << "PluginManager::selectSampleSource by name: " << source.toStdString();
int index = -1;
@@ -282,7 +281,7 @@ int PluginManager::selectSampleSource(const QString& source)
return -1;
m_sampleSource = m_sampleSourceDevices[index].m_sourceName;
std::cerr << "m_sampleSource at index " << index << " is " << m_sampleSource.toStdString() << std::endl;
qDebug() << "m_sampleSource at index " << index << " is " << m_sampleSource.toStdString();
m_sampleSourceInstance = m_sampleSourceDevices[index].m_plugin->createSampleSource(m_sampleSource, m_sampleSourceDevices[index].m_address);
return index;
}