diff options
| author | phintuka <phintuka> | 2008-09-19 12:13:27 +0000 |
|---|---|---|
| committer | phintuka <phintuka> | 2008-09-19 12:13:27 +0000 |
| commit | 96499007b1728806c1d4764edbf2d2b5febcc370 (patch) | |
| tree | a9886c30a753d9529e50ca2e453c96f4cf9d6a0c | |
| parent | af6d096e23647b91c28757867ef25cf282f303f1 (diff) | |
| download | xineliboutput-96499007b1728806c1d4764edbf2d2b5febcc370.tar.gz xineliboutput-96499007b1728806c1d4764edbf2d2b5febcc370.tar.bz2 | |
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.70 2008-09-06 06:07:47 phintuka Exp $ + * $Id: config.c,v 1.71 2008-09-19 12:13:26 phintuka Exp $ * */ @@ -644,6 +644,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 42d1469d..11652d1c 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.48 2008-09-05 08:35:58 phintuka Exp $ + * $Id: xine_frontend_main.c,v 1.49 2008-09-19 12:13:23 phintuka Exp $ * */ @@ -291,7 +291,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" @@ -431,7 +433,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 24df108f..35010f67 100644 --- a/xineliboutput.c +++ b/xineliboutput.c @@ -21,7 +21,7 @@ * * xineliboutput.c: VDR Plugin interface * - * $Id: xineliboutput.c,v 1.31 2008-05-07 14:06:55 phintuka Exp $ + * $Id: xineliboutput.c,v 1.32 2008-09-19 12:13:27 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" |