VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-04-30 03:14:01 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2643 from srcejon/acars

Browse Source 
Freq Scanner: Don't unmute manually muted channels.
This commit is contained in:
Edouard Griffiths 2026-02-12 13:26:26 +01:00 committed by GitHub
commit a81ce00adf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 129 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
plugins/channelrx/freqscanner/freqscanner.cpp
View File

@ -240,7 +240,7 @@ bool FreqScanner::handleMessage(const Message& cmd)
}
else if (MsgStartScan::match(cmd))
{
muteAll(m_settings);
muteAll();
startScan();
return true;
@ -248,6 +248,7 @@ bool FreqScanner::handleMessage(const Message& cmd)
else if (MsgStopScan::match(cmd))
{
stopScan();
unmuteAll();
return true;
}
@ -304,7 +305,7 @@ void FreqScanner::initScan()
// if (m_scanChannelIndex < 0) { // Always false
// applyChannelSetting(m_settings.m_channel);
// }
ChannelWebAPIUtils::setAudioMute(m_scanDeviceSetIndex, m_scanChannelIndex, true);
mute(m_scanDeviceSetIndex, m_scanChannelIndex);
if (m_centerFrequency != m_stepStartFrequency) {
setDeviceCenterFrequency(m_stepStartFrequency);
@ -529,7 +530,7 @@ void FreqScanner::processScanResults(const QDateTime& fftStartTime, const QList<
ChannelWebAPIUtils::setFrequencyOffset(m_scanDeviceSetIndex, m_scanChannelIndex, offset + m_settings.m_channelShift);
// Unmute the channel
ChannelWebAPIUtils::setAudioMute(m_scanDeviceSetIndex, m_scanChannelIndex, false);
unmute(m_scanDeviceSetIndex, m_scanChannelIndex);
// Apply squelch
if (!activeFrequencySettings->m_squelch.isEmpty())
@ -706,30 +707,86 @@ void FreqScanner::setCenterFrequency(qint64 frequency)
}
}
// Ensure a channel is muted and remember if we muted it, as opposed to user having manually muted it
void FreqScanner::mute(unsigned int deviceSetIndex, unsigned int channelIndex)
{
QString channel = QString("R%1:%2").arg(deviceSetIndex).arg(channelIndex);
if (m_autoMutedChannels.contains(channel) && (m_autoMutedChannels[channel] == true)) {
return; // Already muted
}
bool muted = false;
if (ChannelWebAPIUtils::getAudioMute(deviceSetIndex, channelIndex, muted))
{
if (!muted)
{
ChannelWebAPIUtils::setAudioMute(deviceSetIndex, channelIndex, true);
m_autoMutedChannels.insert(channel, true);
}
else
{
m_autoMutedChannels.insert(channel, false);
}
}
}
// Unmute channel if it was auto-muted
void FreqScanner::unmute(unsigned int deviceSetIndex, unsigned int channelIndex)
{
QString channel = QString("R%1:%2").arg(deviceSetIndex).arg(channelIndex);
bool autoMuted = m_autoMutedChannels[channel];
if (autoMuted)
{
ChannelWebAPIUtils::setAudioMute(deviceSetIndex, channelIndex, false);
m_autoMutedChannels.insert(channel, false);
}
}
// Mute all channels
void FreqScanner::muteAll(const FreqScannerSettings& settings)
void FreqScanner::muteAll()
{
QStringList channels;
channels.append(settings.m_channel);
for (int i = 0; i < settings.m_frequencySettings.size(); i++)
channels.append(m_settings.m_channel);
for (int i = 0; i < m_settings.m_frequencySettings.size(); i++)
{
QString channel = settings.m_frequencySettings[i].m_channel;
QString channel = m_settings.m_frequencySettings[i].m_channel;
if (!channel.isEmpty() && !channels.contains(channel)) {
channels.append(channel);
}
}
m_autoMutedChannels.clear();
for (const auto& channel : channels)
{
unsigned int deviceSetIndex, channelIndex;
if (MainCore::getDeviceAndChannelIndexFromId(channel, deviceSetIndex, channelIndex)) {
ChannelWebAPIUtils::setAudioMute(deviceSetIndex, channelIndex, true);
mute(deviceSetIndex, channelIndex);
}
}
}
// Unmute all channels that were auto-muted
void FreqScanner::unmuteAll()
{
for (auto it = m_autoMutedChannels.begin(); it != m_autoMutedChannels.end(); ++it)
{
QString channel = it.key();
bool autoMuted = it.value();
if (autoMuted)
{
unsigned int deviceSetIndex, channelIndex;
if (MainCore::getDeviceAndChannelIndexFromId(channel, deviceSetIndex, channelIndex)) {
unmute(deviceSetIndex, channelIndex);
}
}
}
m_autoMutedChannels.clear();
}
void FreqScanner::applyChannelSetting(const QString& channel)
{
if (!MainCore::getDeviceAndChannelIndexFromId(channel, m_scanDeviceSetIndex, m_scanChannelIndex)) {

6
plugins/channelrx/freqscanner/freqscanner.h
View File

@ -363,7 +363,6 @@ public:
uint32_t getNumberOfDeviceStreams() const;
void calcScannerSampleRate(int channelBW, int basebandSampleRate, int& scannerSampleRate, int& fftSize, int& binsPerChannel);
static void muteAll(const FreqScannerSettings& settings);
static const char * const m_channelIdURI;
static const char * const m_channelId;
@ -404,6 +403,7 @@ private:
} m_state;
QTimer m_timeoutTimer;
QHash<QString,bool> m_autoMutedChannels; // Whether we have muted this channel
virtual bool handleMessage(const Message& cmd);
void applySettings(const FreqScannerSettings& settings, const QStringList& settingsKeys, bool force = false);
@ -424,6 +424,10 @@ private:
void processScanResults(const QDateTime& fftStartTime, const QList<MsgScanResult::ScanResult>& results);
void setDeviceCenterFrequency(qint64 frequency);
void applyChannelSetting(const QString& channel);
void muteAll();
void unmuteAll();
void mute(unsigned int deviceSetIndex, unsigned int channelIndex);
void unmute(unsigned int deviceSetIndex, unsigned int channelIndex);
static QList<SWGSDRangel::SWGFreqScannerFrequency *> *createFrequencyList(const FreqScannerSettings& settings);

26
plugins/channelrx/freqscanner/freqscannergui.cpp
View File

@ -1052,6 +1052,30 @@ void FreqScannerGUI::setAllEnabled(bool enable)
}
}
// Mute all channels
void FreqScannerGUI::muteAll()
{
QStringList channels;
channels.append(m_settings.m_channel);
for (int i = 0; i < m_settings.m_frequencySettings.size(); i++)
{
QString channel = m_settings.m_frequencySettings[i].m_channel;
if (!channel.isEmpty() && !channels.contains(channel)) {
channels.append(channel);
}
}
for (const auto& channel : channels)
{
unsigned int deviceSetIndex, channelIndex;
if (MainCore::getDeviceAndChannelIndexFromId(channel, deviceSetIndex, channelIndex)) {
ChannelWebAPIUtils::setAudioMute(deviceSetIndex, channelIndex, true);
}
}
}
void FreqScannerGUI::table_customContextMenuRequested(QPoint pos)
{
QTableWidgetItem* item = ui->table->itemAt(pos);
@ -1120,7 +1144,7 @@ void FreqScannerGUI::table_customContextMenuRequested(QPoint pos)
}
// Mute all channels
m_freqScanner->muteAll(m_settings);
muteAll();
// Tune to frequency
if ((frequency - m_settings.m_channelBandwidth / 2 < m_deviceCenterFrequency - m_basebandSampleRate / 2)

1
plugins/channelrx/freqscanner/freqscannergui.h
View File

@ -102,6 +102,7 @@ private:
void updateChannelsCombo(QComboBox *combo, const AvailableChannelOrFeatureList& channels, const QString& channel, bool empty);
void updateChannelsList(const AvailableChannelOrFeatureList& channels, const QStringList& renameFrom, const QStringList& renameTo);
void setAllEnabled(bool enable);
void muteAll();
void leaveEvent(QEvent*);
void enterEvent(EnterEventType*);

32
sdrbase/channel/channelwebapiutils.cpp
View File

@ -966,6 +966,38 @@ bool ChannelWebAPIUtils::setFrequencyOffset(unsigned int deviceIndex, int channe
return false;
}
bool ChannelWebAPIUtils::getAudioMute(unsigned int deviceIndex, int channelIndex, bool& mute)
{
SWGSDRangel::SWGChannelSettings channelSettingsResponse;
QString errorResponse;
int httpRC;
QJsonObject* jsonObj;
ChannelAPI* channel = MainCore::instance()->getChannel(deviceIndex, channelIndex);
if (channel != nullptr)
{
httpRC = channel->webapiSettingsGet(channelSettingsResponse, errorResponse);
if (httpRC / 100 != 2)
{
qWarning("ChannelWebAPIUtils::getAudioMute: get channel settings error %d: %s",
httpRC, qPrintable(errorResponse));
return false;
}
jsonObj = channelSettingsResponse.asJsonObject();
int muteInt;
if (WebAPIUtils::getSubObjectInt(*jsonObj, "audioMute", muteInt))
{
mute = (bool) muteInt;
delete jsonObj;
return true;
}
delete jsonObj;
}
return false;
}
bool ChannelWebAPIUtils::setAudioMute(unsigned int deviceIndex, int channelIndex, bool mute)
{
SWGSDRangel::SWGChannelSettings channelSettingsResponse;

1
sdrbase/channel/channelwebapiutils.h
View File

@ -91,6 +91,7 @@ public:
static bool stop(unsigned int deviceIndex, int subsystemIndex=0);
static bool getFrequencyOffset(unsigned int deviceIndex, int channelIndex, int& offset);
static bool setFrequencyOffset(unsigned int deviceIndex, int channelIndex, int offset);
static bool getAudioMute(unsigned int deviceIndex, int channelIndex, bool& mute);
static bool setAudioMute(unsigned int deviceIndex, int channelIndex, bool mute);
static bool startStopFileSinks(unsigned int deviceIndex, bool start);
static bool satelliteAOS(const QString name, bool northToSouthPass, const QString &tle, QDateTime dateTime);