* configure.ac.in, modules/audio_output/arts.c, modules/audio_output/esd.c:

   fixed the arts and esd audio plugins after the recent changes to aout3
   (untested).

diff --git a/configure.ac.in b/configure.ac.in
index 91d3caa2999d065f9198971cf0fa69edb0efcc7b..91b32d19ca2ff4c477f5fc956fd02b2c8f9f116c 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1770,7 +1770,7 @@ AC_ARG_ENABLE(esd,
      AC_PATH_PROG(ESD_CONFIG, esd-config, no)
      if test "x${ESD_CONFIG}" != "xno"
      then
-       #PLUGINS="${PLUGINS} esd"
+       PLUGINS="${PLUGINS} esd"
        CFLAGS_esd="${CFLAGS_esd} `${ESD_CONFIG} --cflags`"
        LDFLAGS_esd="${LDFLAGS_esd} `${ESD_CONFIG} --libs`"
      fi
@@ -1786,7 +1786,7 @@ AC_ARG_ENABLE(arts,
      AC_PATH_PROG(ARTS_CONFIG, artsc-config, no)
      if test "x${ARTS_CONFIG}" != "xno"
      then
-       #PLUGINS="${PLUGINS} arts"
+       PLUGINS="${PLUGINS} arts"
        CFLAGS_arts="${CFLAGS_arts} `${ARTS_CONFIG} --cflags`"
        LDFLAGS_arts="${LDFLAGS_arts} `${ARTS_CONFIG} --libs `"
      fi

diff --git a/modules/audio_output/arts.c b/modules/audio_output/arts.c
index 801260ca5892c042d6ad3f9881162055417e9c9a..70055b126433dedd37c5dbb429a0ac2639102766 100644 (file)
--- a/modules/audio_output/arts.c
+++ b/modules/audio_output/arts.c
@@ -2,7 +2,7 @@
  * arts.c : aRts module
  *****************************************************************************
  * Copyright (C) 2001-2002 VideoLAN
- * $Id: arts.c,v 1.15 2002/11/08 10:26:53 gbazin Exp $
+ * $Id: arts.c,v 1.16 2002/11/15 17:17:29 gbazin Exp $
  *
  * Authors: Emmanuel Blindauer <manu@agat.net>
  *          Samuel Hocevar <sam@zoy.org>
@@ -106,7 +106,8 @@ static int Open( vlc_object_t *p_this )
     {
         /* aRts doesn't support more than two channels. */
         i_nb_channels = 2;
-        p_aout->output.output.i_channels = AOUT_CHAN_STEREO;
+        p_aout->output.output.i_physical_channels =
+            AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
     }
 
     /* Open a socket for playing a stream, set format to 16 bits */

diff --git a/modules/audio_output/esd.c b/modules/audio_output/esd.c
index 055a1a8d905d7ed835d86a63974aac03ed7ac2b7..96dfdffcc33906198d8253b3a8595e0d8cd87055 100644 (file)
--- a/modules/audio_output/esd.c
+++ b/modules/audio_output/esd.c
@@ -2,7 +2,7 @@
  * esd.c : EsounD module
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: esd.c,v 1.14 2002/10/20 12:23:47 massiot Exp $
+ * $Id: esd.c,v 1.15 2002/11/15 17:17:29 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -100,7 +100,8 @@ static int Open( vlc_object_t *p_this )
     {
         /* EsounD doesn't support more than two channels. */
         i_nb_channels = 2;
-        p_aout->output.output.i_channels = AOUT_CHAN_STEREO;
+        p_aout->output.output.i_physical_channels =
+            AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
     }
 
     switch( i_nb_channels )