Updated audio and video driver lists

2 files changed, 19 insertions, 15 deletions

diff --git a/config.c b/config.c
index ff47938b..661d4d0f 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.21 2007-01-07 03:35:04 phintuka Exp $
+ * $Id: config.c,v 1.22 2007-01-19 14:21:48 phintuka Exp $
  *
  */
 
@@ -37,17 +37,17 @@ const char *config_t::s_decoderPriority[] =
 const char *config_t::s_fieldOrder[] =
   {"normal", "inverted", NULL};
 const char *config_t::s_audioDriverNames[] =
-  {"automatic","Alsa","OSS","no audio","Arts","ESound",NULL};
+  {"automatic", "Alsa", "OSS", "no audio", "Arts", "ESD", "Jack", NULL};
 const char *config_t::s_audioDrivers[] =
-  {"auto","alsa","oss","none","arts","esound",NULL};
+  {"auto",      "alsa", "oss", "none",     "arts", "esd", "jack", NULL};
 const char *config_t::s_videoDriverNamesX11[] =
-  {"automatic","XShm","Xv","XvMC","XvMC+VLD","Vidix","no video",NULL};
+  {"automatic", "XShm", "Xv", "XvMC", "XvMC+VLD", "Vidix", "XDirectFB", "OpenGL", "SDL", "no video",NULL};
 const char *config_t::s_videoDriversX11[] =
-  {"auto","X11","xv","xvmc","xxmc","vidix","none",NULL};
+  {"auto",      "X11",  "xv", "xvmc", "xxmc",     "vidix", "DirectFB",  "opengl", "sdl", "none",    NULL};
 const char *config_t::s_videoDriverNamesFB[] =
-  {"automatic","Framebuffer","DirectFB","VidixFB","No Video",NULL};
+  {"automatic", "Framebuffer", "DirectFB", "VidixFB", "DXR3",   "No Video", NULL};
 const char *config_t::s_videoDriversFB[] =
-  {"auto","fb","DirectFB","vidixfb","none",NULL};
+  {"auto",      "fb",          "DirectFB", "vidixfb", "aadxr3", "none",     NULL};
 const char *config_t::s_frontendNames[] =
   {"X11 (sxfe)", "Framebuffer (fbfe)", "Off", NULL};
 const char *config_t::s_frontends[] =
diff --git a/config.h b/config.h
index 463d326a..df1a907b 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.14 2006-12-24 09:46:59 phintuka Exp $
+ * $Id: config.h,v 1.15 2007-01-19 14:21:48 phintuka Exp $
  *
  */
 
@@ -60,8 +60,9 @@
 #define AUDIO_DRIVER_OSS         2
 #define AUDIO_DRIVER_NONE        3
 #define AUDIO_DRIVER_ARTS        4
-#define AUDIO_DRIVER_ESOUND      5
-#define AUDIO_DRIVER_count       6
+#define AUDIO_DRIVER_ESD         5
+#define AUDIO_DRIVER_JACK        6
+#define AUDIO_DRIVER_count       7
 
 // Video driver
 #define X11_DRIVER_AUTO          0
@@ -70,15 +71,19 @@
 #define X11_DRIVER_XVMC          3
 #define X11_DRIVER_XXMC          4
 #define X11_DRIVER_VIDIX         5
-#define X11_DRIVER_NONE          6
-#define X11_DRIVER_count         7
+#define X11_DRIVER_DIRECTFB      6
+#define X11_DRIVER_OPENGL        7
+#define X11_DRIVER_SDL           8
+#define X11_DRIVER_NONE          9
+#define X11_DRIVER_count         10
 
 #define FB_DRIVER_AUTO           0
 #define FB_DRIVER_FB             1
 #define FB_DRIVER_DIRECTFB       2
 #define FB_DRIVER_VIDIXFB        3
-#define FB_DRIVER_NONE           4
-#define FB_DRIVER_count          5
+#define FB_DRIVER_DXR3           4
+#define FB_DRIVER_NONE           5
+#define FB_DRIVER_count          6
 
 // Local frontend
 #define FRONTEND_X11             0
@@ -197,7 +202,6 @@ class config_t {
 
     char local_frontend[64];
     char modeline[64];
-    
     int  fullscreen;
     int  modeswitch;
     int  width;