Changeset 6c52c72bfbfb9c63fd1fb6e2b7e762fbabf49591

Timestamp:

25/03/08 22:14:57 (8 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1206479697 +0200

git-parent:

[7b7d2516fcb4a501a923557ca1f9ffb5f1c77ccd]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1206479697 +0200

Message:

Store the object type name rather than object type ID within log messages.

This remove the triplicated id to name conversion and saves many lookups.
It also removes the obnoxious "private" messages.

Files:

• include/vlc_messages.h (modified) (2 diffs)
• modules/gui/beos/MessagesWindow.cpp (modified) (2 diffs)
• src/control/log.c (modified) (1 diff)
• src/libvlc.sym (modified) (1 diff)
• src/misc/messages.c (modified) (4 diffs)

include/vlc_messages.h

@@ -60 +60 @@
-    int     i_type;                             /**< message type, see below */
-    int     i_object_id;
-int     i
+const char *psz
-    char *  psz_module;
-    char *  psz_msg;                            /**< the message itself */
@@ -161 +161 @@
-VLC_EXPORT( msg_subscription_t*, __msg_Subscribe, ( vlc_object_t *, int ) );
-VLC_EXPORT( void, __msg_Unsubscribe, ( vlc_object_t *, msg_subscription_t * ) );
-
-VLC_EXPORT(const char *, msg_GetObjectTypeName, (int i_object_type ));
-
-/**

modules/gui/beos/MessagesWindow.cpp

@@ -55 +55 @@
-
-    int i_start, oldLength;
-
+onst c
-    rgb_color red = { 200, 0, 0 };
-    rgb_color gray = { 150, 150, 150 };
@@ -81 +81 @@
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-            if( LockLooper() )

src/control/log.c

@@ -173 +173 @@
-                msg = p_iter->p_messages->p_msg+i_pos;
-                buffer->i_severity  = msg->i_type;
-_GetObjectTypeName(msg->i_object_type)
+->psz_object_type
-                buffer->psz_name    = msg->psz_module;
-                buffer->psz_header  = msg->psz_header;

src/libvlc.sym

@@ -174 +174 @@
-__msg_Generic
-__msg_GenericVa
-msg_GetObjectTypeName
-__msg_Info
-__msg_Subscribe

src/misc/messages.c

@@ -198 +198 @@
-}
-
-const char *msg_GetObjectTypeName(int i_object_type )
-{
-    switch( i_object_type )
-    {
-        case VLC_OBJECT_GLOBAL: return "global";
-        case VLC_OBJECT_LIBVLC: return "libvlc";
-        case VLC_OBJECT_MODULE: return "module";
-        case VLC_OBJECT_INTF: return "interface";
-        case VLC_OBJECT_PLAYLIST: return "playlist";
-        case VLC_OBJECT_ITEM: return "item";
-        case VLC_OBJECT_INPUT: return "input";
-        case VLC_OBJECT_DECODER: return "decoder";
-        case VLC_OBJECT_PACKETIZER: return "packetizer";
-        case VLC_OBJECT_ENCODER: return "encoder";
-        case VLC_OBJECT_VOUT: return "video output";
-        case VLC_OBJECT_AOUT: return "audio output";
-        case VLC_OBJECT_SOUT: return "stream output";
-        case VLC_OBJECT_HTTPD: return "http server";
-        case VLC_OBJECT_HTTPD_HOST: return "http server";
-        case VLC_OBJECT_DIALOGS: return "dialogs provider";
-        case VLC_OBJECT_VLM: return "vlm";
-        case VLC_OBJECT_ANNOUNCE: return "announce handler";
-        case VLC_OBJECT_DEMUX: return "demuxer";
-        case VLC_OBJECT_ACCESS: return "access";
-        case VLC_OBJECT_META_ENGINE: return "meta engine";
-        default: return "private";
-    }
-}
-
-/*****************************************************************************
- * __msg_*: print a message
@@ -480 +451 @@
-                p_item->i_type =        VLC_MSG_WARN;
-                p_item->i_object_id =   p_this->i_object_id;
-i_object_type = p_this->i
+psz_object_type = p_this->psz
-                p_item->psz_module =    strdup( "message" );
-                p_item->psz_msg =       strdup( "message queue overflowed" );
@@ -502 +473 @@
-    p_item->i_type =        i_type;
-    p_item->i_object_id =   p_this->i_object_id;
-i_object_type = p_this->i
+psz_object_type = p_this->psz
-    p_item->psz_module =    strdup( psz_module );
-    p_item->psz_msg =       psz_str;
@@ -604 +575 @@
-    }
-
-msg_GetObjectTypeName(p_item->i_object_type)
+p_item->psz_object_type
-
-#ifdef UNDER_CE