1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-28 21:14:15 -04:00

SigMF File Input: refactored FileInputThread to FileInputWorker object moved to thread. This is the equivalent of what was done for FileInput

This commit is contained in:
f4exb
2020-07-11 09:42:48 +02:00
parent d4de16df74
commit c6ed2f2675
5 changed files with 103 additions and 109 deletions
@@ -25,6 +25,7 @@
#include <QString>
#include <QByteArray>
#include <QTimer>
#include <QThread>
#include <QNetworkRequest>
#include "dsp/sigmf_forward.h"
@@ -35,7 +36,7 @@
class QNetworkAccessManager;
class QNetworkReply;
class SigMFFileInputThread;
class SigMFFileInputWorker;
class DeviceAPI;
class SigMFFileInput : public DeviceSampleSource {
@@ -456,7 +457,8 @@ private:
bool m_crcOK;
bool m_recordLengthOK;
QString m_recordSummary;
SigMFFileInputThread* m_fileInputThread;
SigMFFileInputWorker* m_fileInputWorker;
QThread m_fileInputWorkerThread;
QString m_deviceDescription;
int m_sampleRate;
unsigned int m_sampleBytes;
@@ -467,6 +469,8 @@ private:
QNetworkAccessManager *m_networkManager;
QNetworkRequest m_networkRequest;
void startWorker();
void stopWorker();
bool openFileStreams(const QString& fileName);
void extractMeta(
sigmf::SigMF<sigmf::Global<core::DescrT, sdrangel::DescrT>,