diff options
Diffstat (limited to 'xine_frontend_main.c')
| -rw-r--r-- | xine_frontend_main.c | 39 |
1 files changed, 11 insertions, 28 deletions
diff --git a/xine_frontend_main.c b/xine_frontend_main.c index 7c8a3171..3bf2a747 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.4 2008-09-26 19:36:01 phintuka Exp $ * */ @@ -17,29 +17,6 @@ #include "tools/vdrdiscovery.h" -#if 0 -static void xine_log_cb(void *data, int section) -{ - fprintf(stderr, "xine: log section %d\n",section); -} - -static void print_xine_log(xine_t *xine) -{ - int i, j; - int logs = xine_get_log_section_count(xine); - const char * const * names = xine_get_log_names(xine); - for(i=0; i<logs; i++) { - const char * const * lines = xine_get_log(xine, i); - if(lines[0]) { - printf("\nLOG: %s\n",names[i]); - j=-1; - while(lines[++j] && *lines[++j] ) - printf(" %2d: %s", j, lines[j]); - } - } -} -#endif - static void list_plugins_type(xine_t *xine, const char *msg, typeof (xine_list_audio_output_plugins) list_func) { static xine_t *tmp_xine = NULL; @@ -291,7 +268,7 @@ static void SignalHandler(int signum) static char *strcatrealloc(char *dest, const char *src) { - int l; + size_t l; if (!src || !*src) return dest; @@ -322,7 +299,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" @@ -338,8 +317,8 @@ static const char help_str[] = " --nokbd Disable keyboard input\n" " --daemon Run as daemon (disable keyboard,\n" " log to syslog and fork to background)\n" - " --slave Enable slave mode (read commands from stdin)\r\n" - " --reconnect Automatically reconnect when connection has been lost" + " --slave Enable slave mode (read commands from stdin)\n" + " --reconnect Automatically reconnect when connection has been lost\n" " --tcp Use TCP transport\n" " --udp Use UDP transport\n" " --rtp Use RTP transport\n\n" @@ -464,7 +443,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); @@ -669,7 +652,7 @@ int main(int argc, char *argv[]) } /* Connect to VDR xineliboutput server */ - if(!fe_xine_open(fe, mrl)) { + if(!fe->xine_open(fe, mrl)) { /*print_xine_log(((fe_t *)fe)->xine);*/ if(!firsttry) { PRINTF("Error opening %s\n", mrl); |