]> git.ipfire.org Git - thirdparty/shairport-sync.git/commitdiff
Merge remote-tracking branch 'upstream/development' into development
authorMike Brady <mikebrady@eircom.net>
Mon, 26 Sep 2016 15:42:33 +0000 (16:42 +0100)
committerMike Brady <mikebrady@eircom.net>
Mon, 26 Sep 2016 15:42:33 +0000 (16:42 +0100)
Merging 3.0d to 2.8.4.8

1  2 
audio_alsa.c

diff --cc audio_alsa.c
index e5289ad0b104dfa7b1fd84e58a7b54e7c9ddfe54,0e9de51c5ba9383e74e52782759915f39341cff9..3ebe464246ca03dbe7afcdb869f5b16fb32931be
@@@ -417,12 -386,11 +417,16 @@@ int open_alsa_device(void) 
    // snd_pcm_uframes_t frames = 441 * 10;
    snd_pcm_uframes_t buffer_size, actual_buffer_length;
    snd_pcm_access_t access;
+   
+   // ensure no calls are made to the alsa device enquiring about the buffer length if synchronisation is disabled.
+   if (config.no_sync!=0)
+       audio_alsa.delay = NULL;
  
 +  // ensure no calls are made to the alsa device enquiring about the buffer length if
 +  // synchronisation is disabled.
 +  if (config.no_sync != 0)
 +    audio_alsa.delay = NULL;
 +
    ret = snd_pcm_open(&alsa_handle, alsa_out_dev, SND_PCM_STREAM_PLAYBACK, 0);
    if (ret < 0)
      return (ret);