vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Nov 18 19:59:07 2012 +0200| [24f8bc8dc6e9ab30351982b790ea93bee24500da] | committer: Rémi Denis-Courmont
ALSA: require version 1.0.24 or later > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=24f8bc8dc6e9ab30351982b790ea93bee24500da --- configure.ac | 4 ++-- modules/audio_output/alsa.c | 22 ---------------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/configure.ac b/configure.ac index aabbe79..8ae63c5 100644 --- a/configure.ac +++ b/configure.ac @@ -3321,11 +3321,11 @@ AC_ARG_ENABLE(alsa, ]) have_alsa="no" AS_IF([test "${enable_alsa}" != "no"], [ - PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.16], [ + PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.24], [ have_alsa="yes" ], [ AS_IF([test "x${enable_alsa}" != "x"], [ - AC_MSG_ERROR([$ALSA_PKG_ERRORS. alsa-lib 1.0.16 or later required.]) + AC_MSG_ERROR([$ALSA_PKG_ERRORS. alsa-lib 1.0.24 or later required.]) ]) ]) ]) diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c index f8857f7..abdae3c 100644 --- a/modules/audio_output/alsa.c +++ b/modules/audio_output/alsa.c @@ -295,30 +295,8 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) const int mode = SND_PCM_NO_AUTO_RESAMPLE; int val = snd_pcm_open (&pcm, device, SND_PCM_STREAM_PLAYBACK, mode); -#if (SND_LIB_VERSION <= 0x010015) -# warning Please update alsa-lib to version > 1.0.21a. - var_Create (aout->p_libvlc, "alsa-working", VLC_VAR_BOOL); - if (val != 0 && var_GetBool (aout->p_libvlc, "alsa-working")) - dialog_Fatal (aout, "ALSA version problem", - "VLC failed to re-initialize your audio output device.\n" - "Please update alsa-lib to version 1.0.22 or higher " - "to fix this issue."); - var_SetBool (aout->p_libvlc, "alsa-working", !val); -#endif if (val != 0) { -#if (SND_LIB_VERSION <= 0x010017) -# warning Please update alsa-lib to version > 1.0.23. - var_Create (aout->p_libvlc, "alsa-broken", VLC_VAR_BOOL); - if (!var_GetBool (aout->p_libvlc, "alsa-broken")) - { - var_SetBool (aout->p_libvlc, "alsa-broken", true); - dialog_Fatal (aout, "Potential ALSA version problem", - "VLC failed to initialize your audio output device (if any).\n" - "Please update alsa-lib to version 1.0.24 or higher " - "to try to fix this issue."); - } -#endif msg_Err (aout, "cannot open ALSA device \"%s\": %s", device, snd_strerror (val)); dialog_Fatal (aout, _("Audio output failed"), _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
