diff options
author | phintuka <phintuka> | 2007-09-12 13:49:38 +0000 |
---|---|---|
committer | phintuka <phintuka> | 2007-09-12 13:49:38 +0000 |
commit | a48c7e615ee1bfc3ffa0c19ce440f18202baaf6e (patch) | |
tree | 66090125a4ae0a7216a8ceabd00e47ddff494b87 | |
parent | 3a73fe488595d16a196be4ae0f1dabcd8b91ad94 (diff) | |
download | xineliboutput-a48c7e615ee1bfc3ffa0c19ce440f18202baaf6e.tar.gz xineliboutput-a48c7e615ee1bfc3ffa0c19ce440f18202baaf6e.tar.bz2 |
Remove arts audio output support. From xine-lib ChangeLog:
xine-lib (1.1.90) (Unreleased)
* Remove aRTs output plugin; ALSA's DMix can allow to run both xine and aRTs
at the same time for Linux, and if other operating systems lacks a proper
software mixing facility you can consider alternative daemons. Note: aRTs
will not be present in KDE 4.
-rw-r--r-- | config.c | 5 | ||||
-rw-r--r-- | config.h | 9 | ||||
-rw-r--r-- | xineliboutput.c | 4 |
3 files changed, 8 insertions, 10 deletions
@@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: config.c,v 1.44 2007-09-12 13:39:01 phintuka Exp $ + * $Id: config.c,v 1.45 2007-09-12 13:49:38 phintuka Exp $ * */ @@ -87,7 +87,7 @@ const char *config_t::s_fieldOrder[ FIELD_ORDER_count+1 ] = { }; const char *config_t::s_audioDrivers[ AUDIO_DRIVER_count+1 ] = { - "auto", "alsa", "oss", "none", "arts", "esd", "jack", + "auto", "alsa", "oss", "none", "esd", "jack", NULL }; @@ -96,7 +96,6 @@ const char *config_t::s_audioDriverNames[ AUDIO_DRIVER_count+1 ] = { "Alsa", "OSS", trNOOP("no audio"), - "Arts", "ESD", "Jack", NULL @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: config.h,v 1.29 2007-06-19 06:06:22 phintuka Exp $ + * $Id: config.h,v 1.30 2007-09-12 13:49:37 phintuka Exp $ * */ @@ -53,10 +53,9 @@ #define AUDIO_DRIVER_ALSA 1 #define AUDIO_DRIVER_OSS 2 #define AUDIO_DRIVER_NONE 3 -#define AUDIO_DRIVER_ARTS 4 -#define AUDIO_DRIVER_ESD 5 -#define AUDIO_DRIVER_JACK 6 -#define AUDIO_DRIVER_count 7 +#define AUDIO_DRIVER_ESD 4 +#define AUDIO_DRIVER_JACK 5 +#define AUDIO_DRIVER_count 6 // Video driver #define X11_DRIVER_AUTO 0 diff --git a/xineliboutput.c b/xineliboutput.c index 81885e47..ec9641ae 100644 --- a/xineliboutput.c +++ b/xineliboutput.c @@ -21,7 +21,7 @@ * * xineliboutput.c: VDR Plugin interface * - * $Id: xineliboutput.c,v 1.21 2007-06-11 19:18:41 phintuka Exp $ + * $Id: xineliboutput.c,v 1.22 2007-09-12 13:49:38 phintuka Exp $ * */ @@ -99,7 +99,7 @@ const char cmdLineHelp[] = " --remote=<ip>:<port> (default is all interfaces)\n" " -A NAME --audio=NAME Use audio driver NAME for local frontend\n" " Supported values:\n" -" auto, alsa, oss, arts, esound, none\n" +" auto, alsa, oss, esound, none\n" " -V NAME --video=NAME Use video driver NAME for local frontend\n" " Supported values:\n" " for sxfe: auto, x11, xshm, xv, xvmc, xxmc,\n" |