diff options
| author | phintuka <phintuka> | 2008-09-26 19:15:48 +0000 |
|---|---|---|
| committer | phintuka <phintuka> | 2008-09-26 19:15:48 +0000 |
| commit | 0b8cbf79f6674d18da3592ab45d7739974dd04ce (patch) | |
| tree | 64fcb4e824680b4bd6d62a7f3d67977032d11691 | |
| parent | 1c595821b9ee4792a4c1c77461fa221a40cd6083 (diff) | |
| download | xineliboutput-0b8cbf79f6674d18da3592ab45d7739974dd04ce.tar.gz xineliboutput-0b8cbf79f6674d18da3592ab45d7739974dd04ce.tar.bz2 | |
1.0.2: Backported bugfixes from CVS trunk
- Display warning message when HUD OSD not compiled in (Thanks to Rolf Ahrenberg)
| -rw-r--r-- | config.c | 5 | ||||
| -rw-r--r-- | xine_frontend_main.c | 8 | ||||
| -rw-r--r-- | xineliboutput.c | 4 |
3 files changed, 14 insertions, 3 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.63.2.1 2008-09-26 19:12:30 phintuka Exp $ + * $Id: config.c,v 1.63.2.2 2008-09-26 19:15:48 phintuka Exp $ * */ @@ -596,6 +596,9 @@ bool config_t::ProcessArgs(int argc, char *argv[]) case 'f': ProcessArg("Fullscreen", "1"); break; case 'D': ProcessArg("X11.HUDOSD", "1"); +#ifndef HAVE_XRENDER + LOGMSG("HUD OSD not supported\n"); +#endif break; case 'w': ProcessArg("Fullscreen", "0"); ProcessArg("X11.WindowWidth", optarg); diff --git a/xine_frontend_main.c b/xine_frontend_main.c index 7c8a3171..da254f9b 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.40 2008-04-28 20:03:52 phintuka Exp $ + * $Id: xine_frontend_main.c,v 1.40.2.1 2008-09-26 19:15:48 phintuka Exp $ * */ @@ -322,7 +322,9 @@ static const char help_str[] = " Use script to control HW aspect ratio:\n" " --aspect=auto:path_to_script\n" " --fullscreen Fullscreen mode\n" +#ifdef HAVE_XRENDER " --hud Head Up Display OSD mode\n" +#endif " --width=x Video window width\n" " --height=x Video window height\n" " --noscaling Disable all video scaling\n" @@ -464,7 +466,11 @@ int main(int argc, char *argv[]) PRINTF("Fullscreen mode\n"); break; case 'D': hud=1; +#ifdef HAVE_XRENDER PRINTF("HUD OSD mode\n"); +#else + PRINTF("HUD OSD not supported\n"); +#endif break; case 'w': width = atoi(optarg); PRINTF("Width: %d\n", width); diff --git a/xineliboutput.c b/xineliboutput.c index 1789160b..ed60048e 100644 --- a/xineliboutput.c +++ b/xineliboutput.c @@ -21,7 +21,7 @@ * * xineliboutput.c: VDR Plugin interface * - * $Id: xineliboutput.c,v 1.30 2008-05-07 12:31:55 phintuka Exp $ + * $Id: xineliboutput.c,v 1.30.2.1 2008-09-26 19:15:48 phintuka Exp $ * */ @@ -119,7 +119,9 @@ const char cmdLineHelp[] = " (example: )\n" #endif " -f --fullscreen Fullscreen mode (X11)\n" +#ifdef HAVE_XRENDER " -D --hud Head Up Display OSD (X11)\n" +#endif " -w --width=x Window width\n" " -h --height=x Window width\n" " -d DISP --display=DISP Use X11 display DISP\n" |