VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Modulators: changed viewChanged to channelMarkerChanged to be more specific

This commit is contained in:
f4exb 2017-10-14 05:09:20 +02:00
parent cc7b69ebe3
commit 2da2aaad3e
12 changed files with 15 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/channeltx/modam/ammodgui.cpp
View File

@ -111,7 +111,7 @@ bool AMModGUI::handleMessage(const Message& message)
}
}
void AMModGUI::viewChanged()
void AMModGUI::channelMarkerChanged()
{
applySettings();
}
@ -303,7 +303,7 @@ AMModGUI::AMModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pare
m_settings.setChannelMarker(&m_channelMarker);
m_settings.setCWKeyerGUI(ui->cwKeyerGUI);
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged()));
m_deviceAPI->registerChannelInstance(m_channelID, this);
m_deviceAPI->addChannelMarker(&m_channelMarker);

2
plugins/channeltx/modam/ammodgui.h
View File

@ -56,7 +56,7 @@ public:
static const QString m_channelID;
private slots:
void viewChanged();
void channelMarkerChanged();
void handleSourceMessages();
void on_deltaFrequency_changed(qint64 value);

4
plugins/channeltx/modatv/atvmodgui.cpp
View File

@ -236,7 +236,7 @@ bool ATVModGUI::handleMessage(const Message& message)
}
}
void ATVModGUI::viewChanged()
void ATVModGUI::channelMarkerChanged()
{
applySettings();
}
@ -641,7 +641,7 @@ ATVModGUI::ATVModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pa
m_channelMarker.setCenterFrequency(0);
m_channelMarker.setVisible(true);
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged()));
m_deviceAPI->registerChannelInstance(m_channelID, this);
m_deviceAPI->addChannelMarker(&m_channelMarker);

2
plugins/channeltx/modatv/atvmodgui.h
View File

@ -58,7 +58,7 @@ public:
static const QString m_channelID;
private slots:
void viewChanged();
void channelMarkerChanged();
void channelizerOutputSampleRateChanged();
void handleSourceMessages();

4
plugins/channeltx/modnfm/nfmmodgui.cpp
View File

@ -110,7 +110,7 @@ bool NFMModGUI::handleMessage(const Message& message)
}
}
void NFMModGUI::viewChanged()
void NFMModGUI::channelMarkerChanged()
{
applySettings();
}
@ -328,7 +328,7 @@ NFMModGUI::NFMModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pa
m_channelMarker.setTitle("NFM Modulator");
m_channelMarker.setVisible(true);
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged()));
m_deviceAPI->registerChannelInstance(m_channelID, this);
m_deviceAPI->addChannelMarker(&m_channelMarker);

2
plugins/channeltx/modnfm/nfmmodgui.h
View File

@ -55,7 +55,7 @@ public:
static const QString m_channelID;
private slots:
void viewChanged();
void channelMarkerChanged();
void handleSourceMessages();
void on_deltaFrequency_changed(qint64 value);

4
plugins/channeltx/modssb/ssbmodgui.cpp
View File

@ -228,7 +228,7 @@ bool SSBModGUI::handleMessage(const Message& message)
}
}
void SSBModGUI::viewChanged()
void SSBModGUI::channelMarkerChanged()
{
applySettings();
}
@ -568,7 +568,7 @@ SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pa
m_channelMarker.setCenterFrequency(0);
m_channelMarker.setVisible(true);
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged()));
m_deviceAPI->registerChannelInstance(m_channelID, this);
m_deviceAPI->addChannelMarker(&m_channelMarker);

2
plugins/channeltx/modssb/ssbmodgui.h
View File

@ -58,7 +58,7 @@ public:
static const QString m_channelID;
private slots:
void viewChanged();
void channelMarkerChanged();
void handleSourceMessages();
void on_deltaFrequency_changed(qint64 value);

14
plugins/channeltx/modwfm/wfmmod.cpp
View File

@ -26,7 +26,6 @@
#include "wfmmod.h"
MESSAGE_CLASS_DEFINITION(WFMMod::MsgConfigureWFMMod, Message)
MESSAGE_CLASS_DEFINITION(WFMMod::MsgConfigureWFMModPrivate, Message)
MESSAGE_CLASS_DEFINITION(WFMMod::MsgConfigureFileSourceName, Message)
MESSAGE_CLASS_DEFINITION(WFMMod::MsgConfigureFileSourceSeek, Message)
MESSAGE_CLASS_DEFINITION(WFMMod::MsgConfigureAFInput, Message)
@ -89,19 +88,6 @@ WFMMod::~WFMMod()
DSPEngine::instance()->removeAudioSource(&m_audioFifo);
}
void WFMMod::configure(MessageQueue* messageQueue,
Real rfBandwidth,
Real afBandwidth,
float fmDeviation,
float toneFrequency,
float volumeFactor,
bool channelMute,
bool playLoop)
{
Message* cmd = MsgConfigureWFMModPrivate::create(rfBandwidth, afBandwidth, fmDeviation, toneFrequency, volumeFactor, channelMute, playLoop);
messageQueue->push(cmd);
}
void WFMMod::pull(Sample& sample)
{
if (m_settings.m_channelMute)

68
plugins/channeltx/modwfm/wfmmod.h
View File

@ -202,15 +202,6 @@ public:
WFMMod();
~WFMMod();
void configure(MessageQueue* messageQueue,
Real rfBandwidth,
Real afBandwidth,
float fmDeviation,
float toneFrequency,
float volumeFactor,
bool audioMute,
bool playLoop);
virtual void pull(Sample& sample);
virtual void pullAudio(int nbSamples);
virtual void start();
@ -232,65 +223,6 @@ signals:
private:
class MsgConfigureWFMModPrivate : public Message
{
MESSAGE_CLASS_DECLARATION
public:
Real getRFBandwidth() const { return m_rfBandwidth; }
Real getAFBandwidth() const { return m_afBandwidth; }
float getFMDeviation() const { return m_fmDeviation; }
float getToneFrequency() const { return m_toneFrequency; }
float getVolumeFactor() const { return m_volumeFactor; }
bool getChannelMute() const { return m_channelMute; }
bool getPlayLoop() const { return m_playLoop; }
static MsgConfigureWFMModPrivate* create(Real rfBandwidth,
Real afBandwidth,
float fmDeviation,
float toneFrequency,
float volumeFactor,
bool channelMute,
bool playLoop)
{
return new MsgConfigureWFMModPrivate(rfBandwidth,
afBandwidth,
fmDeviation,
toneFrequency,
volumeFactor,
channelMute,
playLoop);
}
private:
Real m_rfBandwidth;
Real m_afBandwidth;
float m_fmDeviation;
float m_toneFrequency;
float m_volumeFactor;
bool m_channelMute;
bool m_playLoop;
MsgConfigureWFMModPrivate(Real rfBandwidth,
Real afBandwidth,
float fmDeviation,
float toneFrequency,
float volumeFactor,
bool channelMute,
bool playLoop) :
Message(),
m_rfBandwidth(rfBandwidth),
m_afBandwidth(afBandwidth),
m_fmDeviation(fmDeviation),
m_toneFrequency(toneFrequency),
m_volumeFactor(volumeFactor),
m_channelMute(channelMute),
m_playLoop(playLoop)
{ }
};
//=================================================================
enum RateState {
RSInitialFill,
RSRunning

4
plugins/channeltx/modwfm/wfmmodgui.cpp
View File

@ -111,7 +111,7 @@ bool WFMModGUI::handleMessage(const Message& message)
}
}
void WFMModGUI::viewChanged()
void WFMModGUI::channelMarkerChanged()
{
applySettings();
}
@ -327,7 +327,7 @@ WFMModGUI::WFMModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pa
m_channelMarker.setTitle("WFM Modulator");
m_channelMarker.setVisible(true);
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged()));
m_deviceAPI->registerChannelInstance(m_channelID, this);
m_deviceAPI->addChannelMarker(&m_channelMarker);

2
plugins/channeltx/modwfm/wfmmodgui.h
View File

@ -58,7 +58,7 @@ public:
static const QString m_channelID;
private slots:
void viewChanged();
void channelMarkerChanged();
void handleSourceMessages();
void on_deltaFrequency_changed(qint64 value);