Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / modules / misc / logger.c

diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index be1cec2fdfeefefcd52680069b5db4a8e649ef69..e8347227c3d6ac559d8f1b92fc910acb68f36de6 100644 (file)
--- a/modules/misc/logger.c
+++ b/modules/misc/logger.c
@@ -32,7 +32,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
-#include <vlc_playlist.h>
+#include <vlc_fs.h>
 #include <vlc_charset.h>
 
 #include <assert.h>
@@ -232,7 +232,7 @@ static int Open( vlc_object_t *p_this )
 
     if( p_sys->msg.i_mode != MODE_SYSLOG )
     {
-        char *psz_file = config_GetPsz( p_intf, "logfile" );
+        char *psz_file = var_InheritString( p_intf, "logfile" );
         if( !psz_file )
         {
 #ifdef __APPLE__
@@ -261,7 +261,7 @@ static int Open( vlc_object_t *p_this )
 
         /* Open the log file and remove any buffering for the stream */
         msg_Dbg( p_intf, "opening logfile `%s'", psz_file );
-        p_sys->msg.p_file = utf8_fopen( psz_file, "at" );
+        p_sys->msg.p_file = vlc_fopen( psz_file, "at" );
         if( p_sys->msg.p_file == NULL )
         {
             msg_Err( p_intf, "error opening logfile `%s'", psz_file );
@@ -373,8 +373,20 @@ static void Overflow (msg_cb_data_t *p_sys, msg_item_t *p_item, unsigned overrun
     if (verbosity == -1)
         verbosity = var_CreateGetInteger( p_sys->p_intf, "verbose" );
 
-    if (verbosity < p_item->i_type)
-        return;
+    switch( p_item->i_type )
+    {
+        case VLC_MSG_INFO:
+        case VLC_MSG_ERR:
+            if( verbosity < 0 ) return;
+            break;
+        case VLC_MSG_WARN:
+            if( verbosity < 1 ) return;
+            break;
+        case VLC_MSG_DBG:
+            if( verbosity < 2 ) return;
+            break;
+    }
+
 
     int canc = vlc_savecancel();
 
@@ -406,8 +418,8 @@ static const char ppsz_type[4][11] = {
 
 static void TextPrint( const msg_item_t *p_msg, FILE *p_file )
 {
-    fprintf( p_file, "%s%s%s\n", p_msg->psz_module, ppsz_type[p_msg->i_type],
-             p_msg->psz_msg );
+    utf8_fprintf( p_file, "%s%s%s\n", p_msg->psz_module,
+                  ppsz_type[p_msg->i_type], p_msg->psz_msg );
 }
 
 #ifdef HAVE_SYSLOG_H