Move mute to function API

Author: HA5KFU Rádióamatőr Klub

src/applications/gqrx/remote_control.cpp

@@ -52,6 +52,7 @@ RemoteControl::RemoteControl(QObject *parent) :
     audio_recorder_status = false;
     receiver_running = false;
     hamlib_compatible = false;
+    is_audio_muted = false;
 
     rc_port = DEFAULT_RC_PORT;
     rc_allowed_hosts.append(DEFAULT_RC_ALLOWED_HOSTS);
@@ -656,7 +657,7 @@ QString RemoteControl::cmd_get_level(QStringList cmdlist)
         QStringList names;
         for(auto &g : gains)
             names.push_back(QString("%1_GAIN").arg(QString::fromStdString(g.name)));
-        answer = QString("SQL STRENGTH AF MUTE %1\n").arg(names.join(" "));
+        answer = QString("SQL STRENGTH AF %1\n").arg(names.join(" "));
     }
     else if (lvl.compare("STRENGTH", Qt::CaseInsensitive) == 0 || lvl.isEmpty())
     {
@@ -670,10 +671,6 @@ QString RemoteControl::cmd_get_level(QStringList cmdlist)
     {
         answer = QString("%1\n").arg((double)audio_gain, 0, 'f', 1);
     }
-    else if (lvl.compare("MUTE", Qt::CaseInsensitive) == 0)
-    {
-        answer = QString("%1\n").arg(is_audio_muted ? '1' : '0');
-    }
     else if (lvl.endsWith("_GAIN"))
     {
         lvl.chop(5);
@@ -706,7 +703,7 @@ QString RemoteControl::cmd_set_level(QStringList cmdlist)
         QStringList names;
         for(auto &g : gains)
             names.push_back(QString("%1_GAIN").arg(QString::fromStdString(g.name)));
-        answer = QString("SQL MUTE AF %1\n").arg(names.join(" "));
+        answer = QString("SQL AF %1\n").arg(names.join(" "));
     }
     else if (lvl.compare("SQL", Qt::CaseInsensitive) == 0)
     {
@@ -737,20 +734,6 @@ QString RemoteControl::cmd_set_level(QStringList cmdlist)
         {
             answer = QString("RPRT 1\n");
         }
-    }
-	else if (lvl.compare("MUTE", Qt::CaseInsensitive) == 0)
-    {
-        bool ok;
-        short muted = cmdlist.value(2, "ERR").toShort(&ok);
-        if (ok)
-        {
-            answer = QString("RPRT 0\n");
-            emit newAudioMuted(muted != 0);
-        }
-        else
-        {
-            answer = QString("RPRT 1\n");
-        }
     }
     else if (lvl.endsWith("_GAIN"))
     {
@@ -778,13 +761,15 @@ QString RemoteControl::cmd_get_func(QStringList cmdlist)
     QString func = cmdlist.value(1, "");
 
     if (func == "?")
-        answer = QString("RECORD DSP RDS\n");
+        answer = QString("RECORD DSP RDS MUTE\n");
     else if (func.compare("RECORD", Qt::CaseInsensitive) == 0)
         answer = QString("%1\n").arg(audio_recorder_status);
     else if (func.compare("DSP", Qt::CaseInsensitive) == 0)
         answer = QString("%1\n").arg(receiver_running);
     else if (func.compare("RDS", Qt::CaseInsensitive) == 0)
         answer = QString("%1\n").arg(rds_status);
+	else if (func.compare("MUTE", Qt::CaseInsensitive) == 0)
+        answer = QString("%1\n").arg(is_audio_muted ? '1' : '0');
     else
         answer = QString("RPRT 1\n");
 
@@ -801,7 +786,7 @@ QString RemoteControl::cmd_set_func(QStringList cmdlist)
 
     if (func == "?")
     {
-        answer = QString("RECORD DSP RDS\n");
+        answer = QString("RECORD DSP RDS MUTE\n");
     }
     else if ((func.compare("RECORD", Qt::CaseInsensitive) == 0) && ok)
     {
@@ -827,6 +812,15 @@ QString RemoteControl::cmd_set_func(QStringList cmdlist)
             emit dspChanged(false);
 
         answer = QString("RPRT 0\n");
+    }
+	else if (func.compare("MUTE", Qt::CaseInsensitive) == 0)
+    {
+		if (status)
+			emit newAudioMuted(true);
+		else
+			emit newAudioMuted(false);
+
+		answer = QString("RPRT 0\n");
     }
     else if ((func.compare("RDS", Qt::CaseInsensitive) == 0) && ok)
     {