From cadb546cc5192cbc3ff94c4f7eb9be85a7534a90 Mon Sep 17 00:00:00 2001
From: phintuka <phintuka>
Date: Sat, 17 Mar 2007 12:14:37 +0000
Subject: Video drivers list update

---
 config.c             |  8 ++++----
 config.h             | 11 ++++++-----
 xine_frontend_main.c |  6 +++---
 xineliboutput.c      |  6 +++---
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/config.c b/config.c
index 4fb4bafc..9f9b0c90 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.28 2007-03-14 17:39:38 phintuka Exp $
+ * $Id: config.c,v 1.29 2007-03-17 12:14:37 phintuka Exp $
  *
  */
 
@@ -52,11 +52,11 @@ const char *config_t::s_audioDrivers[] =
 const char *config_t::s_videoDriverNamesX11[] =
   {"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", "DirectFB",  "opengl", "sdl", "none",    NULL};
+  {"auto",      "xshm", "xv", "xvmc", "xxmc",     "vidix", "DirectFB",  "opengl", "sdl", "none",    NULL};
 const char *config_t::s_videoDriverNamesFB[] =
-  {"automatic", "Framebuffer", "DirectFB", "VidixFB", "DXR3",   "No Video", NULL};
+  {"automatic", "Framebuffer", "DirectFB", "SDL", "VidixFB", "DXR3",   "No Video", NULL};
 const char *config_t::s_videoDriversFB[] =
-  {"auto",      "fb",          "DirectFB", "vidixfb", "aadxr3", "none",     NULL};
+  {"auto",      "fb",          "DirectFB", "sdl", "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 089a1251..d58fb699 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.18 2007-03-14 17:08:07 phintuka Exp $
+ * $Id: config.h,v 1.19 2007-03-17 12:14:37 phintuka Exp $
  *
  */
 
@@ -80,10 +80,11 @@
 #define FB_DRIVER_AUTO           0
 #define FB_DRIVER_FB             1
 #define FB_DRIVER_DIRECTFB       2
-#define FB_DRIVER_VIDIXFB        3
-#define FB_DRIVER_DXR3           4
-#define FB_DRIVER_NONE           5
-#define FB_DRIVER_count          6
+#define FB_DRIVER_SDL            3
+#define FB_DRIVER_VIDIXFB        4
+#define FB_DRIVER_DXR3           5
+#define FB_DRIVER_NONE           6
+#define FB_DRIVER_count          7
 
 // Local frontend
 #define FRONTEND_X11             0
diff --git a/xine_frontend_main.c b/xine_frontend_main.c
index 55175c85..75ba5546 100644
--- a/xine_frontend_main.c
+++ b/xine_frontend_main.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_frontend_main.c,v 1.28 2007-03-15 21:41:16 phintuka Exp $
+ * $Id: xine_frontend_main.c,v 1.29 2007-03-17 12:14:37 phintuka Exp $
  *
  */
 
@@ -282,9 +282,9 @@ static const char *help_str =
     "                                 drivers: auto, alsa, oss, arts, esound, none\n"
     "   --video=videodriver[:device]  Select video driver and optional port\n"
     "                                 X11: auto, x11, xshm, xv, xvmc, xxmc, vidix,\n"
-    "                                      none\n"
+    "                                      sdl, opengl, none\n"
     "                                 framebuffer: auto, fb, DirectFB, vidixfb,\n"
-    "                                      dxr3, aadxr3, none\n"
+    "                                      sdl, dxr3, aadxr3, none\n"
     "   --display=displayaddress      X11 display address\n"
     "   --aspect=[auto|4:3|16:9|16:10|default] Display aspect ratio\n"
     "   --fullscreen                  Fullscreen mode\n"
diff --git a/xineliboutput.c b/xineliboutput.c
index 3d3c73fc..c899f5e4 100644
--- a/xineliboutput.c
+++ b/xineliboutput.c
@@ -21,7 +21,7 @@
  *
  * xineliboutput.c: VDR Plugin interface
  *
- * $Id: xineliboutput.c,v 1.18 2007-03-16 16:44:29 phintuka Exp $
+ * $Id: xineliboutput.c,v 1.19 2007-03-17 12:14:37 phintuka Exp $
  *
  */
 
@@ -101,9 +101,9 @@ const char cmdLineHelp[] =
 "  -V NAME   --video=NAME   Use video driver NAME for local frontend\n"
 "                           Supported values:\n"
 "                           for sxfe: auto, x11, xshm, xv, xvmc, xxmc,\n"
-"                                     vidix, none\n"
+"                                     vidix, sdl, opengl, none\n"
 "                           for fbfe: auto, fb, DirectFB, vidixfb,\n"
-"                                     dxr3, aadxr3, none\n"
+"                                     sdl, dxr3, aadxr3, none\n"
 #if 0
 "  -L        --nolocal      No local frontend, only remote frontends\n"
 "  -m M      --modeline=M   Use modeline M for local frontend\n"
-- 
cgit v1.2.3