]> git.sesse.net Git - vlc/commitdiff
Really fix access_alsa compilation
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 29 Aug 2009 10:29:23 +0000 (13:29 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 29 Aug 2009 10:29:23 +0000 (13:29 +0300)
modules/access/alsa.c

index 67b5afa5d062242d7a27509a24e10b27551d769a..b37b380983c0bfba54cb7eb90cfda98154826223 100644 (file)
@@ -499,11 +499,7 @@ static int OpenAudioDevAlsa( demux_t *p_demux )
     }
 
     /* Set sample rate */
-#ifdef HAVE_ALSA_NEW_API
     i_err = snd_pcm_hw_params_set_rate_near( p_sys->p_alsa_pcm, p_hw_params, &p_sys->i_sample_rate, NULL );
-#else
-    i_err = snd_pcm_hw_params_set_rate_near( p_sys->p_alsa_pcm, p_hw_params, p_sys->i_sample_rate, NULL );
-#endif
     if( i_err < 0 )
     {
         msg_Err( p_demux, "ALSA: cannot set sample rate (%s)",
@@ -541,11 +537,7 @@ static int OpenAudioDevAlsa( demux_t *p_demux )
 
     /* Set period time */
     unsigned int period_time = buffer_time / 4;
-#ifdef HAVE_ALSA_NEW_API
     i_err = snd_pcm_hw_params_set_period_time_near( p_sys->p_alsa_pcm, p_hw_params, &period_time, 0 );
-#else
-    i_err = snd_pcm_hw_params_set_period_time_near( p_sys->p_alsa_pcm, p_hw_params, period_time, 0 );
-#endif
     if( i_err < 0 )
     {
         msg_Err( p_demux, "ALSA: cannot set period time (%s)",
@@ -554,11 +546,7 @@ static int OpenAudioDevAlsa( demux_t *p_demux )
     }
 
     /* Set buffer time */
-#ifdef HAVE_ALSA_NEW_API
     i_err = snd_pcm_hw_params_set_buffer_time_near( p_sys->p_alsa_pcm, p_hw_params, &buffer_time, 0 );
-#else
-    i_err = snd_pcm_hw_params_set_buffer_time_near( p_sys->p_alsa_pcm, p_hw_params, buffer_time, 0 );
-#endif
     if( i_err < 0 )
     {
         msg_Err( p_demux, "ALSA: cannot set buffer time (%s)",