diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | m4/alsa.m4 | 4 | ||||
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 4 |
4 files changed, 3 insertions, 11 deletions
@@ -9,6 +9,7 @@ xine-lib (1.1.1) * new DirectFB video output plugin with many improvements (output to overlay or TV, deinterlacing, image controls, zoom, OSD, double/triple buffering, vsync, flicker filtering, field parity control) + * overlay cropping fixes for small streams or when using cropping support xine-lib (1.1.0) * new quality deinterlacer from dscaler: GreedyH (Greedy High Motion) diff --git a/configure.ac b/configure.ac index be41441d3..728332175 100644 --- a/configure.ac +++ b/configure.ac @@ -1304,15 +1304,10 @@ AM_PATH_ALSA(0.9.0rc4, if test x"$have_alsa09" = "xyes"; then AC_DEFINE(HAVE_ALSA09,1,[Define this if you have ALSA 0.9.x or later installed]) fi - if test x"$have_alsa_1_0_9" = "xyes"; then - AC_DEFINE(HAVE_ALSA_1_0_9,1,[Define this if you have ALSA 1.0.9 or later installed]) - fi ], AC_MSG_RESULT(*** All of ALSA dependent parts will be disabled ***)) AM_CONDITIONAL(HAVE_ALSA, test x"$no_alsa" != "xyes") AM_CONDITIONAL(HAVE_ALSA09, test x"$have_alsa09" = "xyes") -AM_CONDITIONAL(HAVE_ALSA_1_0_9, test x"$have_alsa_1_0_9" = "xyes") - dnl --------------------------------------------- dnl ESD support diff --git a/m4/alsa.m4 b/m4/alsa.m4 index e74d32175..47d939421 100644 --- a/m4/alsa.m4 +++ b/m4/alsa.m4 @@ -30,7 +30,6 @@ dnl AC_DEFINE() HAVE_GL, dnl $no_alsa is set to "yes" if alsa isn't found. dnl $have_alsa05 is set to "yes" if installed alsa version is <= 0.5 dnl $have_alsa09 is set to "yes" if installed alsa version is >= 0.9 -dnl $have_alsa_1_0_9 is set to "yes" if installed alsa version is >= 1.0.9 dnl dnl Internal macro XINE_ALSA_CHECK_VERSION @@ -84,7 +83,6 @@ AC_DEFUN([AM_PATH_ALSA], no_alsa="yes" have_alsa05="no" have_alsa09="no" - have_alsa_1_0_9="no" if test x"$enable_alsa" != "xno"; then @@ -214,8 +212,6 @@ XINE_ALSA_CHECK_VERSION([<= 0.5 series], have_alsa05, [SND_LIB_VERSION < 0x00060 XINE_ALSA_CHECK_VERSION([>= 0.9 series], have_alsa09, [SND_LIB_VERSION >= 0x000900]) -XINE_ALSA_CHECK_VERSION([>= 1.0.9], have_alsa_1_0_9, [SND_LIB_VERSION >= 0x010009]) - dnl dnl Version checking done. dnl diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 3fe787af3..9f188222c 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -26,7 +26,7 @@ * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk> * * - * $Id: audio_alsa_out.c,v 1.155 2005/07/31 14:58:50 dsalt Exp $ + * $Id: audio_alsa_out.c,v 1.156 2005/09/24 19:27:33 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -471,7 +471,7 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int this->num_channels, err, snd_strerror(err)); goto close; } -#ifdef HAVE_ALSA_1_0_9 +#if SND_LIB_VERSION >= 0x010009 /* Restrict a configuration space to contain only real hardware rates */ err = snd_pcm_hw_params_set_rate_resample(this->audio_fd, params, 0); #endif |