diff options
| -rw-r--r-- | xine_frontend.c | 15 | ||||
| -rw-r--r-- | xine_frontend_main.c | 7 |
2 files changed, 8 insertions, 14 deletions
diff --git a/xine_frontend.c b/xine_frontend.c index 2dbb7ac7..db828e05 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.71 2008-11-01 07:23:00 phintuka Exp $ + * $Id: xine_frontend.c,v 1.72 2008-11-04 12:19:07 phintuka Exp $ * */ @@ -16,7 +16,6 @@ XINE_SUB_VERSION) #endif -#define NEED_x_syslog #define LOG_MODULENAME "[vdr-fe] " #include "logdefs.h" @@ -78,17 +77,7 @@ typedef struct fe_s { } fe_t; - -#ifdef FE_STANDALONE - /* next two symbols are dynamically linked from input plugin */ - int SysLogLevel __attribute__((visibility("default"))) = 2; /* errors and info, no debug */ - int LogToSysLog __attribute__((visibility("default"))) = 0; /* log to syslog instead of console */ - - static int verbose_xine_log = 0; -#else - int LogToSysLog __attribute__((visibility("default"))) = 1; /* dynamically linked from input plugin */ -#endif - +static int verbose_xine_log = 0; static inline char *strn0cpy(char *dest, const char *src, int n) { diff --git a/xine_frontend_main.c b/xine_frontend_main.c index 6c8c7205..8a796b1d 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.51 2008-11-01 07:23:00 phintuka Exp $ + * $Id: xine_frontend_main.c,v 1.52 2008-11-04 12:19:07 phintuka Exp $ * */ @@ -18,6 +18,9 @@ #include "tools/vdrdiscovery.h" +/* next symbol is dynamically linked from input plugin */ +int SysLogLevel __attribute__((visibility("default"))) = 2; /* errors and info, no debug */ + static void list_plugins_type(xine_t *xine, const char *msg, typeof (xine_list_audio_output_plugins) list_func) { @@ -372,6 +375,8 @@ int main(int argc, char *argv[]) int repeat_emu = 0; char *exec_name = argv[0]; + LogToSysLog = 0; + if(strrchr(argv[0],'/')) exec_name = strrchr(argv[0],'/')+1; |