VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-27 02:09:14 -05:00
Code Issues Projects Releases Wiki Activity

Multi device support: restored AM demod plugin

Browse Source
This commit is contained in:
f4exb 2016-05-15 10:34:48 +02:00
parent f0b7f6bf4e
commit 8d480c899d
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/channel/demodam/amplugin.cpp
View File

@ -1,6 +1,7 @@
#include "amplugin.h" #include "amplugin.h"
#include <QtPlugin> #include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "amdemodgui.h" #include "amdemodgui.h"
@ -34,16 +35,18 @@ void AMPlugin::initPlugin(PluginAPI* pluginAPI)
PluginGUI* AMPlugin::createChannel(const QString& channelName) PluginGUI* AMPlugin::createChannel(const QString& channelName)
{ {
if(channelName == "de.maintech.sdrangelove.channel.am") { if(channelName == "de.maintech.sdrangelove.channel.am") {
return createInstanceAM(); AMDemodGUI* gui = AMDemodGUI::create(m_pluginAPI);
m_pluginAPI->registerChannelInstance("de.maintech.sdrangelove.channel.am", gui);
m_pluginAPI->addChannelRollup(gui);
return gui;
} else { } else {
return NULL; return NULL;
} }
} }
PluginGUI* AMPlugin::createInstanceAM() void AMPlugin::createInstanceAM()
{ {
AMDemodGUI* gui = AMDemodGUI::create(m_pluginAPI); AMDemodGUI* gui = AMDemodGUI::create(m_pluginAPI);
m_pluginAPI->registerChannelInstance("de.maintech.sdrangelove.channel.am", gui); m_pluginAPI->registerChannelInstance("de.maintech.sdrangelove.channel.am", gui);
m_pluginAPI->addChannelRollup(gui); m_pluginAPI->addChannelRollup(gui);
return gui;
} }

4
plugins/channel/demodam/amplugin.h
View File

@ -21,7 +21,9 @@ private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
PluginAPI* m_pluginAPI; PluginAPI* m_pluginAPI;
PluginGUI* createInstanceAM();
private slots:
void createInstanceAM();
}; };
#endif // INCLUDE_AMPLUGIN_H #endif // INCLUDE_AMPLUGIN_H

12
sdrbase/mainwindow.cpp
View File

@ -333,17 +333,13 @@ void MainWindow::savePresetSettings(Preset* preset)
qPrintable(preset->getGroup()), qPrintable(preset->getGroup()),
qPrintable(preset->getDescription())); qPrintable(preset->getDescription()));
preset->setSpectrumConfig(m_deviceUIs.back()->m_spectrumGUI->serialize());
preset->clearChannels();
// Save from currently selected source tab // Save from currently selected source tab
int currentSourceTabIndex = ui->tabInputsView->currentIndex(); int currentSourceTabIndex = ui->tabInputsView->currentIndex();
if (currentSourceTabIndex >= 0)
{
DeviceUISet *deviceUI = m_deviceUIs[currentSourceTabIndex]; DeviceUISet *deviceUI = m_deviceUIs[currentSourceTabIndex];
preset->setSpectrumConfig(deviceUI->m_spectrumGUI->serialize());
preset->clearChannels();
deviceUI->m_pluginManager->saveSettings(preset); deviceUI->m_pluginManager->saveSettings(preset);
}
preset->setLayout(saveState()); preset->setLayout(saveState());
} }
@ -674,7 +670,7 @@ void MainWindow::on_sampleSource_currentIndexChanged(int index)
{ {
DeviceUISet *deviceUI = m_deviceUIs[currentSourceTabIndex]; DeviceUISet *deviceUI = m_deviceUIs[currentSourceTabIndex];
deviceUI->m_pluginManager->saveSourceSettings(m_settings.getWorkingPreset()); deviceUI->m_pluginManager->saveSourceSettings(m_settings.getWorkingPreset());
deviceUI->m_pluginManager->selectSampleSourceByIndex(m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelector()->currentIndex()); deviceUI->m_pluginManager->selectSampleSourceByIndex(deviceUI->m_samplingDeviceControl->getDeviceSelector()->currentIndex());
m_settings.setSourceIndex(deviceUI->m_samplingDeviceControl->getDeviceSelector()->currentIndex()); m_settings.setSourceIndex(deviceUI->m_samplingDeviceControl->getDeviceSelector()->currentIndex());
deviceUI->m_pluginManager->loadSourceSettings(m_settings.getWorkingPreset()); deviceUI->m_pluginManager->loadSourceSettings(m_settings.getWorkingPreset());