VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-14 23:43:43 -04:00
Code Issues Projects Releases Wiki Activity

Implemented multiple sample sources for one preset

Browse Source
This commit is contained in:
Edouard Griffiths
2015-10-01 16:57:33 +02:00
parent c85813b577
commit fa79c55f41
6 changed files with 241 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include-gpl/mainwindow.h
+1 -1
View File
@@ -103,7 +103,7 @@ private:
PluginManager* m_pluginManager;
void loadSettings();
void loadPresetSettings(const Preset* preset);
void loadPresetSettings(Preset* preset);
void savePresetSettings(Preset* preset);
void saveSettings();
include-gpl/plugin/pluginmanager.h
+2 -1
View File
@@ -47,7 +47,7 @@ public:
void registerSampleSource(const QString& sourceName, PluginInterface* plugin);
void loadSettings(const Preset* preset);
void loadSettings(Preset* preset);
void saveSettings(Preset* preset);
void freeAll();
@@ -58,6 +58,7 @@ public:
void fillSampleSourceSelector(QComboBox* comboBox);
int selectSampleSource(int index);
int selectFirstSampleSource(const QString& sourceId);
int selectSampleSourceBySerialOrSequence(const QString& sourceId, const QString& sourceSerial, int sourceSequence);
private:
struct ChannelRegistration {
include-gpl/settings/preset.h
+5 -1
View File
@@ -61,6 +61,7 @@ public:
int getChannelCount() const { return m_channelConfigs.count(); }
const ChannelConfig& getChannelConfig(int index) const { return m_channelConfigs.at(index); }
/*
void setSourceConfig(const QString& sourceId, const QString& sourceSerial, int sourceSequence, const QByteArray& config)
{
m_sourceId = sourceId;
@@ -72,7 +73,7 @@ public:
const QString& getSourceId() const { return m_sourceId; }
const QString& getSourceSerial() const { return m_sourceSerial; }
const int getSourceSequence() const { return m_sourceSequence; }
const QByteArray& getSourceConfig() const { return m_sourceConfig; }
const QByteArray& getSourceConfig() const { return m_sourceConfig; }*/
void addOrUpdateSourceConfig(const QString& sourceId,
const QString& sourceSerial,
@@ -83,6 +84,8 @@ public:
const QString& sourceSerial,
int sourceSequence);
const QByteArray* findCurrentSourceConfig(QString& sourceId, QString& sourceSerial, int& sourceSequence) const;
protected:
// group and preset description
QString m_group;
@@ -107,6 +110,7 @@ protected:
// sources and configurations
SourceConfigs m_sourceConfigs;
SourceConfigs::const_iterator m_currentSourceConfig;
// screen and dock layout
QByteArray m_layout;