diff options
| -rw-r--r-- | xine_frontend.c | 10 | ||||
| -rw-r--r-- | xine_frontend_main.c | 14 |
2 files changed, 8 insertions, 16 deletions
diff --git a/xine_frontend.c b/xine_frontend.c index 7ae49019..3804edfa 100644 --- a/xine_frontend.c +++ b/xine_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend.c,v 1.77 2008-11-11 19:04:02 rofafor Exp $ + * $Id: xine_frontend.c,v 1.78 2008-11-11 20:43:16 phintuka Exp $ * */ @@ -35,9 +35,6 @@ #undef MAX #define MAX(a,b) ( (a) > (b) ? (a) : (b)) -#ifdef FE_STANDALONE -static int verbose_xine_log = 0; -#endif char *strn0cpy(char *dest, const char *src, int n) { @@ -496,11 +493,8 @@ static int fe_xine_init(frontend_t *this_gen, const char *audio_driver, if(!this->xine) return 0; -#ifdef FE_STANDALONE - this->xine->verbosity = verbose_xine_log; -#else + /* Set xine engine logging verbosity */ this->xine->verbosity = (SysLogLevel>2); -#endif /*xine_register_log_cb(this->xine, xine_log_cb, this);*/ diff --git a/xine_frontend_main.c b/xine_frontend_main.c index 8560991c..7a16c155 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.54 2008-11-11 00:02:33 phintuka Exp $ + * $Id: xine_frontend_main.c,v 1.55 2008-11-11 20:43:16 phintuka Exp $ * */ @@ -398,7 +398,7 @@ int main(int argc, char *argv[]) case 'H': printf("\nUsage: %s [options] [" MRL_ID "[+udp|+tcp|+rtp]:[//host[:port]]] \n" "\nAvailable options:\n", exec_name); printf("%s", help_str); - list_plugins(NULL, verbose_xine_log); + list_plugins(NULL, SysLogLevel>2); exit(0); case 'A': adrv = strdup(optarg); adev = strchr(adrv, ':'); @@ -472,12 +472,10 @@ int main(int argc, char *argv[]) PRINTF("LIRC device: %s%s\n", lirc_dev, repeat_emu?", emulating key repeat":""); break; - case 'v': verbose_xine_log = 1; - SysLogLevel = 3; + case 'v': SysLogLevel = 3; PRINTF("Verbose mode\n"); break; - case 's': verbose_xine_log = 0; - SysLogLevel = 1; + case 's': SysLogLevel = 1; PRINTF("Silent mode\n"); break; case 'S': slave_mode = 1; @@ -613,11 +611,11 @@ int main(int argc, char *argv[]) if(!fe->xine_init(fe, adrv, adev, gdrv, 250, static_post_plugins)) { fprintf(stderr, "Error initializing xine\n"); fe->fe_free(fe); - list_plugins(NULL, verbose_xine_log); + list_plugins(NULL, SysLogLevel>2); return -5; } if(SysLogLevel>2) - list_plugins(((fe_t*)fe)->xine, verbose_xine_log); + list_plugins(((fe_t*)fe)->xine, SysLogLevel>2); /* signal handlers */ |