alsa: use the pcm status to compute the delay. fix #894 (spdif passthrough)

Please report loudly any regression, using spdif or not.

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index a90e2fde0a85a0bba929bc67819793e1e41538fd..28bc6f2a514eba73bb8b45c29fc9947077a7052f 100644 (file)
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -826,28 +826,12 @@ static void ALSAFill( aout_instance_t * p_aout )
     {
         /* Here the device should be in RUNNING state.
          * p_status is valid. */
-
-#if 0
-        /* This apparently does not work correctly in Alsa 1.0.11 */
-        snd_pcm_status_get_tstamp( p_status, &ts_next );
-        next_date = (mtime_t)ts_next.tv_sec * 1000000 + ts_next.tv_usec;
-        if( next_date )
-        {
-            next_date += (mtime_t)snd_pcm_status_get_delay(p_status)
-                    * 1000000 / p_aout->output.output.i_rate;
-        }
-        else
-#endif
-        {
-            /* With screwed ALSA drivers the timestamp is always zero;
-             * use another method then */
-            snd_pcm_sframes_t delay = 0;
-
-            snd_pcm_delay( p_sys->p_snd_pcm, &delay );
-            next_date = mdate() + (mtime_t)(delay) * 1000000
-                        / p_aout->output.output.i_rate
-                        * p_aout->output.output.i_frame_length;
-        }
+        snd_pcm_sframes_t delay = snd_pcm_status_get_delay( p_status );
+        int i_bytes = snd_pcm_frames_to_bytes( p_sys->p_snd_pcm, delay );
+        next_date = mdate() + ( (mtime_t)i_bytes * 1000000
+                / p_aout->output.output.i_bytes_per_frame
+                / p_aout->output.output.i_rate
+                * p_aout->output.output.i_frame_length );
     }
 
     p_buffer = aout_OutputNextBuffer( p_aout, next_date,