diff --git a/plugins/channeltx/modam/ammod.cpp b/plugins/channeltx/modam/ammod.cpp
index eb2da34bd..de57a690f 100644
--- a/plugins/channeltx/modam/ammod.cpp
+++ b/plugins/channeltx/modam/ammod.cpp
@@ -93,6 +93,13 @@ void AMMod::configure(MessageQueue* messageQueue,
void AMMod::pull(Sample& sample)
{
+ if (m_running.m_channelMute)
+ {
+ sample.m_real = 0.0f;
+ sample.m_imag = 0.0f;
+ return;
+ }
+
Complex ci;
m_settingsMutex.lock();
@@ -266,7 +273,7 @@ bool AMMod::handleMessage(const Message& cmd)
m_config.m_modFactor = cfg.getModFactor();
m_config.m_toneFrequency = cfg.getToneFrequency();
m_config.m_volumeFactor = cfg.getVolumeFactor();
- m_config.m_audioMute = cfg.getAudioMute();
+ m_config.m_channelMute = cfg.getChannelMute();
m_config.m_playLoop = cfg.getPlayLoop();
apply();
@@ -276,7 +283,7 @@ bool AMMod::handleMessage(const Message& cmd)
<< " m_modFactor: " << m_config.m_modFactor
<< " m_toneFrequency: " << m_config.m_toneFrequency
<< " m_volumeFactor: " << m_config.m_volumeFactor
- << " m_audioMute: " << m_config.m_audioMute
+ << " m_audioMute: " << m_config.m_channelMute
<< " m_playLoop: " << m_config.m_playLoop;
return true;
@@ -369,7 +376,7 @@ void AMMod::apply()
m_running.m_toneFrequency = m_config.m_toneFrequency;
m_running.m_volumeFactor = m_config.m_volumeFactor;
m_running.m_audioSampleRate = m_config.m_audioSampleRate;
- m_running.m_audioMute = m_config.m_audioMute;
+ m_running.m_channelMute = m_config.m_channelMute;
m_running.m_playLoop = m_config.m_playLoop;
}
diff --git a/plugins/channeltx/modam/ammod.h b/plugins/channeltx/modam/ammod.h
index d5ac23c9f..0e16320f2 100644
--- a/plugins/channeltx/modam/ammod.h
+++ b/plugins/channeltx/modam/ammod.h
@@ -181,7 +181,7 @@ public:
float modFactor,
float toneFrequency,
float volumeFactor,
- bool audioMute,
+ bool channelMute,
bool playLoop);
virtual void pull(Sample& sample);
@@ -213,12 +213,12 @@ private:
float getModFactor() const { return m_modFactor; }
float getToneFrequency() const { return m_toneFrequency; }
float getVolumeFactor() const { return m_volumeFactor; }
- bool getAudioMute() const { return m_audioMute; }
+ bool getChannelMute() const { return m_channelMute; }
bool getPlayLoop() const { return m_playLoop; }
- static MsgConfigureAMMod* create(Real rfBandwidth, float modFactor, float toneFreqeuncy, float volumeFactor, bool audioMute, bool playLoop)
+ static MsgConfigureAMMod* create(Real rfBandwidth, float modFactor, float toneFreqeuncy, float volumeFactor, bool channelMute, bool playLoop)
{
- return new MsgConfigureAMMod(rfBandwidth, modFactor, toneFreqeuncy, volumeFactor, audioMute, playLoop);
+ return new MsgConfigureAMMod(rfBandwidth, modFactor, toneFreqeuncy, volumeFactor, channelMute, playLoop);
}
private:
@@ -226,16 +226,16 @@ private:
float m_modFactor;
float m_toneFrequency;
float m_volumeFactor;
- bool m_audioMute;
+ bool m_channelMute;
bool m_playLoop;
- MsgConfigureAMMod(Real rfBandwidth, float modFactor, float toneFrequency, float volumeFactor, bool audioMute, bool playLoop) :
+ MsgConfigureAMMod(Real rfBandwidth, float modFactor, float toneFrequency, float volumeFactor, bool channelMute, bool playLoop) :
Message(),
m_rfBandwidth(rfBandwidth),
m_modFactor(modFactor),
m_toneFrequency(toneFrequency),
m_volumeFactor(volumeFactor),
- m_audioMute(audioMute),
+ m_channelMute(channelMute),
m_playLoop(playLoop)
{ }
};
@@ -261,7 +261,7 @@ private:
float m_toneFrequency;
float m_volumeFactor;
quint32 m_audioSampleRate;
- bool m_audioMute;
+ bool m_channelMute;
bool m_playLoop;
Config() :
@@ -272,7 +272,7 @@ private:
m_toneFrequency(100),
m_volumeFactor(1.0f),
m_audioSampleRate(0),
- m_audioMute(false),
+ m_channelMute(false),
m_playLoop(false)
{ }
};
diff --git a/plugins/channeltx/modam/ammodgui.cpp b/plugins/channeltx/modam/ammodgui.cpp
index 2bab8e783..e6d0e2601 100644
--- a/plugins/channeltx/modam/ammodgui.cpp
+++ b/plugins/channeltx/modam/ammodgui.cpp
@@ -233,7 +233,7 @@ void AMModGUI::on_toneFrequency_valueChanged(int value)
}
-void AMModGUI::on_audioMute_toggled(bool checked)
+void AMModGUI::on_channelMute_toggled(bool checked)
{
applySettings();
}
@@ -423,7 +423,7 @@ void AMModGUI::applySettings()
ui->modPercent->value() / 100.0f,
ui->toneFrequency->value() * 10.0f,
ui->volume->value() / 10.0f ,
- ui->audioMute->isChecked(),
+ ui->channelMute->isChecked(),
ui->playLoop->isChecked());
}
}
diff --git a/plugins/channeltx/modam/ammodgui.h b/plugins/channeltx/modam/ammodgui.h
index e2ec7ed18..a059727ce 100644
--- a/plugins/channeltx/modam/ammodgui.h
+++ b/plugins/channeltx/modam/ammodgui.h
@@ -63,7 +63,7 @@ private slots:
void on_rfBW_valueChanged(int value);
void on_modPercent_valueChanged(int value);
void on_volume_valueChanged(int value);
- void on_audioMute_toggled(bool checked);
+ void on_channelMute_toggled(bool checked);
void on_tone_toggled(bool checked);
void on_toneFrequency_valueChanged(int value);
void on_mic_toggled(bool checked);
diff --git a/plugins/channeltx/modam/ammodgui.ui b/plugins/channeltx/modam/ammodgui.ui
index f8c801788..a844008f5 100644
--- a/plugins/channeltx/modam/ammodgui.ui
+++ b/plugins/channeltx/modam/ammodgui.ui
@@ -56,7 +56,16 @@
3
-
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
2
-
@@ -158,7 +167,7 @@
-
-
+
Mute/Unmute audio
@@ -655,11 +664,6 @@
-
- ButtonSwitch
- QToolButton
-
-
RollupWidget
QWidget
@@ -678,6 +682,11 @@
1
+
+ ButtonSwitch
+ QToolButton
+
+
CWKeyerGUI
QWidget
@@ -687,6 +696,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/channeltx/modam/readme.md b/plugins/channeltx/modam/readme.md
index b51f050ec..d195e8c0a 100644
--- a/plugins/channeltx/modam/readme.md
+++ b/plugins/channeltx/modam/readme.md
@@ -20,9 +20,9 @@ Use the wheels to adjust the frequency shift in Hz from the center frequency of
Average total power in dB relative to a +/- 1.0 amplitude signal generated in the pass band.
-
4: Audio mute
+4: Channel mute
-Use this button to toggle audio mute for this channel.
+Use this button to toggle mute for this channel.
5: RF bandwidth
diff --git a/plugins/channeltx/modnfm/readme.md b/plugins/channeltx/modnfm/readme.md
index 9e2d1246a..c97aeef1c 100644
--- a/plugins/channeltx/modnfm/readme.md
+++ b/plugins/channeltx/modnfm/readme.md
@@ -20,9 +20,9 @@ Use the wheels to adjust the frequency shift in Hz from the center frequency of
Average total power in dB relative to a +/- 1.0 amplitude signal generated in the pass band.
-4: Audio mute
+4: Channel mute
-Use this button to toggle audio mute for this channel.
+Use this button to toggle mute for this channel.
5: RF bandwidth
diff --git a/plugins/channeltx/modwfm/readme.md b/plugins/channeltx/modwfm/readme.md
index 270408bf2..57566bf14 100644
--- a/plugins/channeltx/modwfm/readme.md
+++ b/plugins/channeltx/modwfm/readme.md
@@ -20,9 +20,9 @@ Use the wheels to adjust the frequency shift in Hz from the center frequency of
Average total power in dB relative to a +/- 1.0 amplitude signal generated in the pass band.
-4: Audio mute
+4: Channel mute
-Use this button to toggle audio mute for this channel.
+Use this button to toggle mute for this channel.
5: RF bandwidth