Changeset 26832b94e629a5848443e5c762ae3f9407b148d1

Timestamp:

02/03/03 01:39:42 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1044232782 +0000

git-parent:

[0b3d586510bb3cdaf9e6c3cf9cf9cf93f7507606]

git-author:

Sam Hocevar <sam@videolan.org> 1044232782 +0000

Message:

• ./modules/audio_output/alsa.c: Woody ALSA compilation fix.
  

Files:

• configure.ac.in (modified) (1 diff)
• modules/audio_output/alsa.c (modified) (5 diffs)

configure.ac.in

@@ -2144 +2144 @@
-     if test "x${have_alsa}" = "xtrue"
-     then
+       AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API
+                       #define ALSA_PCM_NEW_SW_PARAMS_API
+                       #include <alsa/asoundlib.h>],
+          [void foo() { snd_pcm_hw_params_get_period_time(0,0,0); }],
+           AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4))
-       PLUGINS="${PLUGINS} alsa"
-       LDFLAGS_alsa="${LDFLAGS_alsa} -lasound -lm -ldl"

modules/audio_output/alsa.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-0 2003/01/17 23:59:18
+1 2003/02/03 00:39:42
- *
- * Authors: Henri Fallon <henri@videolan.org> - Original Author
@@ -433 +433 @@
-
-    /* Set rate. */
+#ifdef HAVE_ALSA_NEW_API
-    if ( ( i_snd_rc = snd_pcm_hw_params_set_rate_near( p_sys->p_snd_pcm, p_hw,
-                                &p_aout->output.output.i_rate, NULL ) ) < 0 )
+#else
+    if ( ( i_snd_rc = snd_pcm_hw_params_set_rate_near( p_sys->p_snd_pcm, p_hw,
+                                p_aout->output.output.i_rate, NULL ) ) < 0 )
+#endif
-    {
-        msg_Err( p_aout, "unable to set sample rate (%s)",
@@ -442 +447 @@
-
-    /* Set buffer size. */
+#ifdef HAVE_ALSA_NEW_API
-    if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm,
-                                    p_hw, &i_buffer_size ) ) < 0 )
+#else
+    if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm,
+                                    p_hw, i_buffer_size ) ) < 0 )
+#endif
-    {
-        msg_Err( p_aout, "unable to set buffer size (%s)",
@@ -451 +461 @@
-
-    /* Set period size. */
+#ifdef HAVE_ALSA_NEW_API
-    if ( ( i_snd_rc = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm,
-                                    p_hw, &i_period_size, NULL ) ) < 0 )
+#else
+    if ( ( i_snd_rc = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm,
+                                    p_hw, i_period_size, NULL ) ) < 0 )
+#endif
-    {
-        msg_Err( p_aout, "unable to set period size (%s)",
@@ -468 +483 @@
-    }
-
+#ifdef HAVE_ALSA_NEW_API
-    if( ( i_snd_rc = snd_pcm_hw_params_get_period_time( p_hw,
-                                    &p_sys->i_period_time, NULL ) ) < 0 )
+#else
+    if( ( p_sys->i_period_time =
+                  snd_pcm_hw_params_get_period_time( p_hw, NULL ) ) < 0 )
+#endif
-    {
-        msg_Err( p_aout, "unable to get period time (%s)",