From: Mike Brady <4265913+mikebrady@users.noreply.github.com>
Date: Sat, 6 Aug 2022 18:19:43 +0000 (+0100)
Subject: Simplify use of an initial volume figure.
X-Git-Tag: 4.1-rc1~24^2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a23884238596247c5eaf7c9740c71a3fa0595534;p=thirdparty%2Fshairport-sync.git

Simplify use of an initial volume figure.
---

diff --git a/player.c b/player.c
index a76385b2..1bb286c8 100644
--- a/player.c
+++ b/player.c
@@ -2096,8 +2096,6 @@ void *player_thread_func(void *arg) {
   pthread_setcancelstate(oldState, NULL);
 
   double initial_volume = config.airplay_volume; // default
-  if (conn->initial_airplay_volume_set)          // if we have been given an initial volume
-    initial_volume = conn->initial_airplay_volume;
   // set the default volume to whatever it was before, as stored in the config airplay_volume
   debug(2, "Set initial volume to %f.", initial_volume);
   player_volume(initial_volume, conn); // will contain a cancellation point if asked to wait