spatializer: convert to audio filter2

[vlc] / modules / misc / logger.c

diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index db842d13ac0edf03affe8a0d0e8dd115674c768b..9a7e1bc2fd717b316a1751aaf02f1ca5f0f7d283 100644 (file)
--- a/modules/misc/logger.c
+++ b/modules/misc/logger.c
@@ -37,10 +37,6 @@
 
 #include <assert.h>
 
-#ifdef UNDER_CE
-#   define _IONBF 0x0004
-#endif
-
 #define MODE_TEXT 0
 #define MODE_HTML 1
 #define MODE_SYSLOG 2
@@ -72,7 +68,7 @@
     "  </body>\n" \
     "</html>\n"
 
-#if HAVE_SYSLOG_H
+#ifdef HAVE_SYSLOG_H
 #include <syslog.h>
 #endif
 
@@ -234,7 +230,7 @@ static int Open( vlc_object_t *p_this )
         if( !psz_file )
         {
 #ifdef __APPLE__
-            char *home = config_GetUserDir(VLC_HOME_DIR);
+            char *home = config_GetUserDir(VLC_DOCUMENTS_DIR);
             if( home == NULL
              || asprintf( &psz_file, "%s/"LOG_DIR"/%s", home,
                 (p_sys->msg.i_mode == MODE_HTML) ? LOG_FILE_HTML
@@ -378,6 +374,8 @@ static void Overflow (msg_cb_data_t *p_sys, msg_item_t *p_item, unsigned overrun
     if (verbosity < priority)
         return;
 
+    int canc = vlc_savecancel();
+
     switch( p_sys->i_mode )
     {
         case MODE_HTML:
@@ -393,6 +391,8 @@ static void Overflow (msg_cb_data_t *p_sys, msg_item_t *p_item, unsigned overrun
             TextPrint( p_item, p_sys->p_file );
             break;
     }
+
+    vlc_restorecancel( canc );
 }
 
 static const char ppsz_type[4][11] = {