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

FileSource: make Settings an independant struct

Browse Source
This commit is contained in:
f4exb
2017-12-24 11:04:30 +01:00
parent 996f964435
commit 351651c3e5
7 changed files with 107 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/filesource/filesourceinput.h
+7 -14
View File
@@ -24,35 +24,28 @@
#include <iostream>
#include <fstream>
#include "filesourcesettings.h"
class FileSourceThread;
class DeviceSourceAPI;
class FileSourceInput : public DeviceSampleSource {
public:
struct Settings {
QString m_fileName;
Settings();
void resetToDefaults();
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
};
class MsgConfigureFileSource : public Message {
MESSAGE_CLASS_DECLARATION
public:
const Settings& getSettings() const { return m_settings; }
const FileSourceSettings& getSettings() const { return m_settings; }
static MsgConfigureFileSource* create(const Settings& settings)
static MsgConfigureFileSource* create(const FileSourceSettings& settings)
{
return new MsgConfigureFileSource(settings);
}
private:
Settings m_settings;
FileSourceSettings m_settings;
MsgConfigureFileSource(const Settings& settings) :
MsgConfigureFileSource(const FileSourceSettings& settings) :
Message(),
m_settings(settings)
{ }
@@ -259,7 +252,7 @@ public:
private:
DeviceSourceAPI *m_deviceAPI;
QMutex m_mutex;
Settings m_settings;
FileSourceSettings m_settings;
std::ifstream m_ifstream;
FileSourceThread* m_fileSourceThread;
QString m_deviceDescription;