From: Mike Brady <mikebrady@eircom.net>
Date: Fri, 5 May 2017 16:04:08 +0000 (+0100)
Subject: Use hardware volume control only to mute when there is a mixer but no switch.
X-Git-Tag: 3.1d16~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4fe414e94fdded7f3e806fa2e184800aa91ed8c;p=thirdparty%2Fshairport-sync.git

Use hardware volume control only to mute when there is a mixer but no switch.
---

diff --git a/player.c b/player.c
index a1cf082d..2ccfdf94 100644
--- a/player.c
+++ b/player.c
@@ -2231,8 +2231,10 @@ void player_volume(double airplay_volume, rtsp_conn_info* conn) {
 	    // debug(1,"Mute, with hardware mute and software_attenuation set to %d.",software_attenuation);
       config.output->mute(1); // use real mute if it's there
     } else {
-	    software_attenuation = sw_min_db; // set any software output to zero too
+    	if (config.output->volume==NULL) { // if there is also no hardware volume control
+	    	software_attenuation = sw_min_db; // set any software output to zero too
 	    // debug(1,"Mute, with no hardware mute and software_attenuation set to %d.",software_attenuation);
+	    }
     }
   } else {
     if (config.output->mute)