From: Mke Brady <mikebrady@eircom.net>
Date: Sat, 26 Dec 2015 15:14:01 +0000 (+0000)
Subject: Tiny changes
X-Git-Tag: 2.7.6~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e395ff3a50315709fb7c388389285793c6fef12;p=thirdparty%2Fshairport-sync.git

Tiny changes
---

diff --git a/audio_alsa.c b/audio_alsa.c
index 64656ef3..b725d78a 100644
--- a/audio_alsa.c
+++ b/audio_alsa.c
@@ -453,8 +453,12 @@ static void parameters(audio_parameters *info) {
 static void volume(double vol) {
   // debug(1,"Setting volume db to %f, for volume input of %f.",vol_setting/100,vol);
   set_volume = vol;
-  if (snd_mixer_selem_set_playback_dB_all(alsa_mix_elem, vol, -1) != 0)
-    die("Failed to set playback dB volume");
+  if (snd_mixer_selem_set_playback_dB_all(alsa_mix_elem, vol, 0) != 0) {
+    debug(1,"Can't set playback volume accurately to %f dB.",vol);
+    if (snd_mixer_selem_set_playback_dB_all(alsa_mix_elem, vol, -1) != 0)
+      if (snd_mixer_selem_set_playback_dB_all(alsa_mix_elem, vol, 1) != 0)
+        die("Failed to set playback dB volume");
+  }
 }
 
 static void linear_volume(double vol) {
diff --git a/player.c b/player.c
index 5330f49d..0b24a67e 100644
--- a/player.c
+++ b/player.c
@@ -579,9 +579,8 @@ static abuf_t *buffer_get_frame(void) {
                  << 32) /
                     44100;
 
-            uint32_t filler_size = frame_size;
             uint32_t max_dac_delay = 4410;
-            filler_size = 4410; // 0.1 second -- the maximum we'll add to the DAC
+            uint32_t filler_size = max_dac_delay; // 0.1 second -- the maximum we'll add to the DAC
 
             if (local_time_now >= first_packet_time_to_play) {
               // we've gone past the time...