[vlc-devel] commit: Really fix access_alsa compilation ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Aug 29 12:29:34 CEST 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug 29 13:29:23 2009 +0300| [6c976c2484e9f0ca6620d42f438db57f8e399c26] | committer: Rémi Denis-Courmont 

Really fix access_alsa compilation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6c976c2484e9f0ca6620d42f438db57f8e399c26
---

 modules/access/alsa.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/modules/access/alsa.c b/modules/access/alsa.c
index 67b5afa..b37b380 100644
--- a/modules/access/alsa.c
+++ b/modules/access/alsa.c
@@ -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)",




More information about the vlc-devel mailing list