X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fintf_msg.h;h=c55fb9eaf79125a2e318e90473c836c2eeb9d728;hb=cf3d0f29d2487ff675ca54ba3588040f3b18621a;hp=5b44f17c71b3c2deb5e04ae7d6e97e74cdf5e9fb;hpb=2ad5fa640d389a2261699c0b657484b436aef23e;p=vlc

diff --git a/include/intf_msg.h b/include/intf_msg.h
index 5b44f17c71..c55fb9eaf7 100644
--- a/include/intf_msg.h
+++ b/include/intf_msg.h
@@ -1,69 +1,45 @@
 /*****************************************************************************
  * intf_msg.h: messages interface
- * (c)1999 VideoLAN
- *****************************************************************************
  * This library provides basic functions for threads to interact with user
  * interface, such as message output. See config.h for output configuration.
- *****************************************************************************/
-
-/*****************************************************************************
- * intf_DbgMsg macros and functions
  *****************************************************************************
- * The intf_DbgMsg* functions are defined as macro to be able to use the
- * compiler extensions and print the file, the function and the line number
- * from which they have been called. They call _intf_DbgMsg*() functions after
- * having added debugging informations.
- * Outside DEBUG mode, intf_DbgMsg* functions do nothing.
+ * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: intf_msg.h,v 1.18 2002/02/19 00:50:19 sam Exp $
+ *
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * 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
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
-#ifdef DEBUG
-
-/* DEBUG mode */
-void    _intf_DbgMsg        ( char *psz_file, char *psz_function, int i_line,
-                              char *psz_format, ... );
-void    _intf_DbgMsgImm     ( char *psz_file, char *psz_function, int i_line,
-                              char *psz_format, ... );
-
-#define intf_DbgMsg( format, args... ) \
-    _intf_DbgMsg( __FILE__, __FUNCTION__, __LINE__, format, ## args )
-#define intf_DbgMsgImm( format, args... ) \
-    _intf_DbgMsg( __FILE__, __FUNCTION__, __LINE__, format, ## args )
-
-#else
-
-/* Non-DEBUG mode */
-#define intf_DbgMsg( format, args... )
-#define intf_DbgMsgImm( format, args...)
-
-#endif
 
 /*****************************************************************************
- * intf_FlushMsg macro and function
- *****************************************************************************
- * intf_FlushMsg is a function which flushs message queue and print all messages
- * remaining. It is only usefull if INTF_MSG_QUEUE is defined. In this case, it
- * is really a function. In the other case, it is a macro doing nothing.
+ * Prototypes
  *****************************************************************************/
-#ifdef INTF_MSG_QUEUE
-
-/* Message queue mode */
-void    intf_FlushMsg       ( void );
+#ifndef PLUGIN
+void intf_Msg            ( char *psz_format, ... );
+void intf_ErrMsg         ( char *psz_format, ... );
+void intf_WarnMsg        ( int i_level, char *psz_format, ... );
+void intf_StatMsg        ( char *psz_format, ... );
 
+void intf_WarnHexDump    ( int i_level, void *p_data, int i_size );
 #else
+#   define intf_MsgSub p_symbols->intf_MsgSub
+#   define intf_MsgUnsub p_symbols->intf_MsgUnsub
 
-/* Direct mode */
-#define intf_FlushMsg()     ;
-
+#   define intf_Msg p_symbols->intf_Msg
+#   define intf_ErrMsg p_symbols->intf_ErrMsg
+#   define intf_StatMsg p_symbols->intf_StatMsg
+#   define intf_WarnMsg p_symbols->intf_WarnMsg
 #endif
 
-/*****************************************************************************
- * Prototypes
- *****************************************************************************/
-p_intf_msg_t intf_MsgCreate      ( void );
-void         intf_MsgDestroy     ( void );
-
-void         intf_Msg            ( char *psz_format, ... );
-void         intf_ErrMsg         ( char *psz_format, ... );
-void         intf_IntfMsg        ( char *psz_format, ... );
-
-void         intf_MsgImm         ( char *psz_format, ... );
-void         intf_ErrMsgImm      ( char *psz_format, ... );