Commit d2d2e4f9 authored by Gildas Bazin's avatar Gildas Bazin

* 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).
parent da1b7383
...@@ -1770,7 +1770,7 @@ AC_ARG_ENABLE(esd, ...@@ -1770,7 +1770,7 @@ AC_ARG_ENABLE(esd,
AC_PATH_PROG(ESD_CONFIG, esd-config, no) AC_PATH_PROG(ESD_CONFIG, esd-config, no)
if test "x${ESD_CONFIG}" != "xno" if test "x${ESD_CONFIG}" != "xno"
then then
#PLUGINS="${PLUGINS} esd" PLUGINS="${PLUGINS} esd"
CFLAGS_esd="${CFLAGS_esd} `${ESD_CONFIG} --cflags`" CFLAGS_esd="${CFLAGS_esd} `${ESD_CONFIG} --cflags`"
LDFLAGS_esd="${LDFLAGS_esd} `${ESD_CONFIG} --libs`" LDFLAGS_esd="${LDFLAGS_esd} `${ESD_CONFIG} --libs`"
fi fi
...@@ -1786,7 +1786,7 @@ AC_ARG_ENABLE(arts, ...@@ -1786,7 +1786,7 @@ AC_ARG_ENABLE(arts,
AC_PATH_PROG(ARTS_CONFIG, artsc-config, no) AC_PATH_PROG(ARTS_CONFIG, artsc-config, no)
if test "x${ARTS_CONFIG}" != "xno" if test "x${ARTS_CONFIG}" != "xno"
then then
#PLUGINS="${PLUGINS} arts" PLUGINS="${PLUGINS} arts"
CFLAGS_arts="${CFLAGS_arts} `${ARTS_CONFIG} --cflags`" CFLAGS_arts="${CFLAGS_arts} `${ARTS_CONFIG} --cflags`"
LDFLAGS_arts="${LDFLAGS_arts} `${ARTS_CONFIG} --libs `" LDFLAGS_arts="${LDFLAGS_arts} `${ARTS_CONFIG} --libs `"
fi fi
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* arts.c : aRts module * arts.c : aRts module
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2002 VideoLAN * 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> * Authors: Emmanuel Blindauer <manu@agat.net>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -106,7 +106,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -106,7 +106,8 @@ static int Open( vlc_object_t *p_this )
{ {
/* aRts doesn't support more than two channels. */ /* aRts doesn't support more than two channels. */
i_nb_channels = 2; 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 */ /* Open a socket for playing a stream, set format to 16 bits */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* esd.c : EsounD module * esd.c : EsounD module
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -100,7 +100,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -100,7 +100,8 @@ static int Open( vlc_object_t *p_this )
{ {
/* EsounD doesn't support more than two channels. */ /* EsounD doesn't support more than two channels. */
i_nb_channels = 2; 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 ) switch( i_nb_channels )
......
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