VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-18 07:35:47 -05:00
Code Issues Projects Releases Wiki Activity

LocalSource plugin cleanup and fixes

Browse Source
This commit is contained in:
f4exb 2019-12-08 10:08:56 +01:00
parent 12735f26a9
commit f1112f64d0
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/channeltx/localsource/localsource.cpp
View File

@ -45,8 +45,7 @@ LocalSource::LocalSource(DeviceAPI *deviceAPI) :
m_deviceAPI(deviceAPI), m_deviceAPI(deviceAPI),
m_centerFrequency(0), m_centerFrequency(0),
m_frequencyOffset(0), m_frequencyOffset(0),
m_basebandSampleRate(48000), m_basebandSampleRate(48000)
m_settingsMutex(QMutex::Recursive)
{ {
setObjectName(m_channelId); setObjectName(m_channelId);

3
plugins/channeltx/localsource/localsource.h
View File

@ -19,7 +19,6 @@
#define INCLUDE_LOCALSOURCE_H_ #define INCLUDE_LOCALSOURCE_H_
#include <QObject> #include <QObject>
#include <QMutex>
#include <QNetworkRequest> #include <QNetworkRequest>
#include "dsp/basebandsamplesource.h" #include "dsp/basebandsamplesource.h"
@ -145,8 +144,6 @@ private:
QNetworkAccessManager *m_networkManager; QNetworkAccessManager *m_networkManager;
QNetworkRequest m_networkRequest; QNetworkRequest m_networkRequest;
QMutex m_settingsMutex;
void applySettings(const LocalSourceSettings& settings, bool force = false); void applySettings(const LocalSourceSettings& settings, bool force = false);
void propagateSampleRateAndFrequency(uint32_t index, uint32_t log2Interp); void propagateSampleRateAndFrequency(uint32_t index, uint32_t log2Interp);
static void validateFilterChainHash(LocalSourceSettings& settings); static void validateFilterChainHash(LocalSourceSettings& settings);

2
plugins/channeltx/localsource/localsourcebaseband.cpp
View File

@ -35,7 +35,7 @@ LocalSourceBaseband::LocalSourceBaseband() :
m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000)); m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(48000));
m_channelizer = new UpChannelizer(&m_source); m_channelizer = new UpChannelizer(&m_source);
qDebug("FileSourceBaseband::FileSourceBaseband"); qDebug("LocalSourceBaseband::LocalSourceBaseband");
QObject::connect( QObject::connect(
&m_sampleFifo, &m_sampleFifo,
&SampleSourceFifo::dataRead, &SampleSourceFifo::dataRead,

6
plugins/channeltx/localsource/localsourcebaseband.h
View File

@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#ifndef INCLUDE_FILESOURCEBASEBAND_H #ifndef INCLUDE_LOCALSOURCEBASEBAND_H
#define INCLUDE_FILESOURCEBASEBAND_H #define INCLUDE_LOCALSOURCEBASEBAND_H
#include <QObject> #include <QObject>
#include <QMutex> #include <QMutex>
@ -145,4 +145,4 @@ private slots:
}; };
#endif // INCLUDE_FILESOURCEBASEBAND_H #endif // INCLUDE_LOCALSOURCEBASEBAND_H

2
plugins/channeltx/localsource/localsourceplugin.cpp
View File

@ -29,7 +29,7 @@
const PluginDescriptor LocalSourcePlugin::m_pluginDescriptor = { const PluginDescriptor LocalSourcePlugin::m_pluginDescriptor = {
QString("Local channel source"), QString("Local channel source"),
QString("4.12.1"), QString("4.12.2"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,