From a48c7e615ee1bfc3ffa0c19ce440f18202baaf6e Mon Sep 17 00:00:00 2001
From: phintuka <phintuka>
Date: Wed, 12 Sep 2007 13:49:38 +0000
Subject: 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.

---
 config.c        | 5 ++---
 config.h        | 9 ++++-----
 xineliboutput.c | 4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/config.c b/config.c
index a904a149..05dfe114 100644
--- a/config.c
+++ b/config.c
@@ -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
diff --git a/config.h b/config.h
index 9439fb8b..a6716873 100644
--- a/config.h
+++ b/config.h
@@ -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"
-- 
cgit v1.2.3