Doxyfile:

[vlc] / src / misc / messages.c

diff --git a/src/misc/messages.c b/src/misc/messages.c
index 228252bfc3ebe30f910c4a9633d83aab6eec0469..8d01dea5c92f0e00062bb45a8fc7eb7b04308232 100644 (file)
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -4,7 +4,7 @@
  * modules, especially intf modules. See config.h for output configuration.
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: messages.c,v 1.21 2002/11/10 18:04:24 sam Exp $
+ * $Id: messages.c,v 1.34 2003/06/24 13:33:49 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -13,7 +13,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -43,10 +43,21 @@
 #endif
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>                                      /* close(), write() */
+#   include <unistd.h>                                   /* close(), write() */
 #endif
 
-#include "interface.h"
+#include "vlc_interface.h"
+
+/*****************************************************************************
+ * Local macros
+ *****************************************************************************/
+#if defined(HAVE_VA_COPY)
+#   define vlc_va_copy(dest,src) va_copy(dest,src)
+#elif defined(HAVE___VA_COPY)
+#   define vlc_va_copy(dest,src) __va_copy(dest,src)
+#else
+#   define vlc_va_copy(dest,src) (dest)=(src)
+#endif
 
 /*****************************************************************************
  * Local prototypes
@@ -75,6 +86,14 @@ void __msg_Create( vlc_object_t *p_this )
 
     p_this->p_libvlc->msg_bank.i_sub = 0;
     p_this->p_libvlc->msg_bank.pp_sub = NULL;
+
+#ifdef UNDER_CE
+    p_this->p_libvlc->msg_bank.logfile =
+        CreateFile( L"vlc-log.txt", GENERIC_WRITE,
+                    FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
+                    CREATE_ALWAYS, 0, NULL );
+    SetFilePointer( p_this->p_libvlc->msg_bank.logfile, 0, NULL, FILE_END );
+#endif
 }
 
 /*****************************************************************************
@@ -124,6 +143,10 @@ void __msg_Destroy( vlc_object_t *p_this )
         FlushMsg( &p_this->p_libvlc->msg_bank );
     }
 
+#ifdef UNDER_CE
+    CloseHandle( p_this->p_libvlc->msg_bank.logfile );
+#endif
+
     /* Destroy lock */
     vlc_mutex_destroy( &p_this->p_libvlc->msg_bank.lock );
 }
@@ -232,22 +255,25 @@ DECLARE_MSG_FN( __msg_Dbg,  VLC_MSG_DBG );
  * a warning.
  *****************************************************************************/
 static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
-                      const char *psz_format, va_list args )
+                      const char *psz_format, va_list _args )
 {
     msg_bank_t * p_bank = &p_this->p_libvlc->msg_bank;       /* message bank */
     char *       psz_str = NULL;                 /* formatted message string */
+    va_list      args;
     msg_item_t * p_item = NULL;                        /* pointer to message */
     msg_item_t   item;                    /* message in case of a full queue */
 
-#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN)
+#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS)
     int          i_size = strlen(psz_format) + INTF_MAX_MSG_SIZE;
 #endif
 
     /*
      * Convert message to string
      */
-#if defined(HAVE_VASPRINTF) && !defined(SYS_DARWIN)
+#if defined(HAVE_VASPRINTF) && !defined(SYS_DARWIN) && !defined( SYS_BEOS )
+    vlc_va_copy( args, _args );
     vasprintf( &psz_str, psz_format, args );
+    va_end( args );
 #else
     psz_str = (char*) malloc( i_size * sizeof(char) );
 #endif
@@ -260,13 +286,17 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
 #else
         fprintf( stderr, "main warning: can't store message: " );
 #endif
+        vlc_va_copy( args, _args );
         vfprintf( stderr, psz_format, args );
+        va_end( args );
         fprintf( stderr, "\n" );
         return;
     }
 
-#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN)
+#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS)
+    vlc_va_copy( args, _args );
     vsnprintf( psz_str, i_size, psz_format, args );
+    va_end( args );
     psz_str[ i_size - 1 ] = 0; /* Just in case */
 #endif
 
@@ -301,7 +331,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
             p_item = p_bank->msg + p_bank->i_stop;
             p_bank->i_stop = (p_bank->i_stop + 1) % VLC_MSG_QSIZE;
 
-            p_item->i_type =        VLC_MSG_ERR;
+            p_item->i_type =        VLC_MSG_WARN;
             p_item->i_object_id =   p_this->i_object_id;
             p_item->i_object_type = p_this->i_object_type;
             p_item->psz_module =    strdup( "message" );
@@ -403,6 +433,9 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
 #   define WHITE   COL(37)
 #   define GRAY    "\033[0m"
 
+#ifdef UNDER_CE
+    int i_dummy;
+#endif
     static const char * ppsz_type[4] = { "", " error", " warning", " debug" };
     static const char *ppsz_color[4] = { WHITE, RED, YELLOW, GRAY };
     char *psz_object = "private";
@@ -439,6 +472,19 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
         case VLC_OBJECT_SOUT: psz_object = "stream output"; break;
     }
 
+#ifdef UNDER_CE
+#   define CE_WRITE(str) WriteFile( p_this->p_libvlc->msg_bank.logfile, \
+                                    str, strlen(str), &i_dummy, NULL );
+    CE_WRITE( p_item->psz_module );
+    CE_WRITE( " " );
+    CE_WRITE( psz_object );
+    CE_WRITE( ppsz_type[i_type] );
+    CE_WRITE( ": " );
+    CE_WRITE( p_item->psz_msg );
+    CE_WRITE( "\r\n" );
+    FlushFileBuffers( p_this->p_libvlc->msg_bank.logfile );
+
+#else
     /* Send the message to stderr */
     if( p_this->p_libvlc->b_color )
     {
@@ -454,7 +500,8 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
                          p_item->psz_msg );
     }
 
-#if defined(WIN32)
+#   if defined(WIN32)
     fflush( stderr );
+#   endif
 #endif
 }