diff options
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | config.c | 10 | ||||
| -rw-r--r-- | config.h | 12 | ||||
| -rw-r--r-- | xine_frontend_main.c | 6 | ||||
| -rw-r--r-- | xineliboutput.c | 9 |
6 files changed, 24 insertions, 19 deletions
@@ -1,6 +1,7 @@ VDR Plugin 'xineliboutput' Revision History ------------------------------------------- +- Added vidix(fb) to supported video drivers (Thanks to Antti Seppälä) - Fixed control channel disconnection detection in frontend_svr.c - Try to detect when navigating in DVD menus and change functions of Up/Down/Left/Right/Ok/Back keys when in menus @@ -13,7 +13,7 @@ Description Simple framebuffer and/or X11 front-end for VDR. (displays OSD and video in raw X/Xv/XvMC window or - Linux framebuffer/DirectFB). + Linux framebuffer/DirectFB/vidixfb). Support for local and remote frontends. @@ -186,10 +186,11 @@ Using remote frontends --video xvmc:127.0.0.1:1.0 With framebuffer frontend (vdr-fbfe): - --video [fb | DirectFB] [:fb_device] + --video [fb | DirectFB | vidixfb] [:fb_device] examples: --video DirectFB --video fb:/dev/fb/1 + --video vidixfb De-interlacing De-interlacing can be switched on with command-line option @@ -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.16 2006-12-14 12:39:19 phintuka Exp $ + * $Id: config.c,v 1.17 2006-12-15 13:47:19 phintuka Exp $ * */ @@ -41,13 +41,13 @@ const char *config_t::s_audioDriverNames[] = const char *config_t::s_audioDrivers[] = {"auto","alsa","oss","none","arts","esound",NULL}; const char *config_t::s_videoDriverNamesX11[] = - {"automatic","XShm","Xv","XvMC","XvMC+VLD","no video",NULL}; + {"automatic","XShm","Xv","XvMC","XvMC+VLD","Vidix","no video",NULL}; const char *config_t::s_videoDriversX11[] = - {"auto","X11","xv","xvmc","xxmc","none",NULL}; + {"auto","X11","xv","xvmc","xxmc","vidix","none",NULL}; const char *config_t::s_videoDriverNamesFB[] = - {"automatic","Framebuffer","DirectFB","No Video",NULL}; + {"automatic","Framebuffer","DirectFB","VidixFB","No Video",NULL}; const char *config_t::s_videoDriversFB[] = - {"auto","fb","DirectFB","none",NULL}; + {"auto","fb","DirectFB","vidixfb","none",NULL}; const char *config_t::s_frontendNames[] = {"X11 (sxfe)", "Framebuffer (fbfe)", "Off", NULL}; const char *config_t::s_frontends[] = @@ -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.11 2006-12-14 12:42:58 phintuka Exp $ + * $Id: config.h,v 1.12 2006-12-15 13:47:19 phintuka Exp $ * */ @@ -68,14 +68,16 @@ #define X11_DRIVER_XV 2 #define X11_DRIVER_XVMC 3 #define X11_DRIVER_XXMC 4 -#define X11_DRIVER_NONE 5 -#define X11_DRIVER_count 6 +#define X11_DRIVER_VIDIX 5 +#define X11_DRIVER_NONE 6 +#define X11_DRIVER_count 7 #define FB_DRIVER_AUTO 0 #define FB_DRIVER_FB 1 #define FB_DRIVER_DIRECTFB 2 -#define FB_DRIVER_NONE 3 -#define FB_DRIVER_count 4 +#define FB_DRIVER_VIDIXFB 3 +#define FB_DRIVER_NONE 4 +#define FB_DRIVER_count 5 // Local frontend #define FRONTEND_X11 0 diff --git a/xine_frontend_main.c b/xine_frontend_main.c index 799b11d3..881c888a 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.15 2006-09-20 07:01:10 phintuka Exp $ + * $Id: xine_frontend_main.c,v 1.16 2006-12-15 13:47:20 phintuka Exp $ * */ @@ -179,8 +179,8 @@ static const char *help_str = " --audio=audiodriver[:device] Select audio driver and optional port\n" " drivers: auto, alsa, oss, arts, esound, none\n" " --video=videodriver Select video driver\n" - " X11: auto, x11, xshm, xv, xvmc, xxmc, none\n" - " framebuffer: auto, fb, DirectFB, none\n" + " X11: auto, x11, xshm, xv, xvmc, xxmc, vidix, none\n" + " framebuffer: auto, fb, DirectFB, vidixfb, 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 2e030fc6..3e38c840 100644 --- a/xineliboutput.c +++ b/xineliboutput.c @@ -21,7 +21,7 @@ * * xineliboutput.c: VDR Plugin interface * - * $Id: xineliboutput.c,v 1.13 2006-10-18 11:39:02 phintuka Exp $ + * $Id: xineliboutput.c,v 1.14 2006-12-15 13:47:20 phintuka Exp $ * */ @@ -100,8 +100,9 @@ const char cmdLineHelp[] = " auto, alsa, oss, arts, 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, none\n" -" for fbfe: auto, fb, DirectFB, none\n" +" for sxfe: auto, x11, xshm, xv, xvmc, xxmc,\n" +" vidix, none\n" +" for fbfe: auto, fb, DirectFB, vidixfb, none\n" #if 0 " -L --nolocal No local frontend, only remote frontends\n" " -m M --modeline=M Use modeline M for local frontend\n" @@ -113,7 +114,7 @@ const char cmdLineHelp[] = " -w --width=x Window width\n" " -h --height=x Window width\n" " -d DISP --display=DISP Use X11 display DISP\n" -" (or framebuffer device name)" +" (or framebuffer device name)\n" " -P NAME --post=NAME Use xine post plugin NAME\n" " format: pluginname[:arg=val[,arg=val]][,...]\n" " example: \n" |