Skip to content

V
vlc-1.1
Commit 6c976c24 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Really fix access_alsa compilation

parent 6c5106a7
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 12 deletions
modules/access/alsa.c
View file @ 6c976c24
...@@ -499,11 +499,7 @@ static int OpenAudioDevAlsa( demux_t *p_demux ) ...@@ -499,11 +499,7 @@ static int OpenAudioDevAlsa( demux_t *p_demux )
} }
/* Set sample rate */ /* 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 ); 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 ) if( i_err < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot set sample rate (%s)", msg_Err( p_demux, "ALSA: cannot set sample rate (%s)",
...@@ -541,11 +537,7 @@ static int OpenAudioDevAlsa( demux_t *p_demux ) ...@@ -541,11 +537,7 @@ static int OpenAudioDevAlsa( demux_t *p_demux )
/* Set period time */ /* Set period time */
unsigned int period_time = buffer_time / 4; 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 ); 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 ) if( i_err < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot set period time (%s)", msg_Err( p_demux, "ALSA: cannot set period time (%s)",
...@@ -554,11 +546,7 @@ static int OpenAudioDevAlsa( demux_t *p_demux ) ...@@ -554,11 +546,7 @@ static int OpenAudioDevAlsa( demux_t *p_demux )
} }
/* Set buffer time */ /* 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 ); 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 ) if( i_err < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot set buffer time (%s)", msg_Err( p_demux, "ALSA: cannot set buffer time (%s)",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment