[vlc-commits] MKV: improve debugging of metadata

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Aug 23 14:14:09 2012 +0200| [b6b914ef2207f6f79e81b0a1d6c83174d0309c7d] | committer: Jean-Baptiste Kempf

MKV: improve debugging of metadata

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b6b914ef2207f6f79e81b0a1d6c83174d0309c7d
---

 modules/demux/mkv/matroska_segment.cpp |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index 5522c41..fab4929 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -218,16 +218,6 @@ void matroska_segment_c::LoadCues( KaxCues *cues )
 }
 
 
-#define PARSE_TAG( type ) \
-    do { \
-    msg_Dbg( &sys.demuxer, "|   + " type ); \
-    ep->Down();                             \
-    while( ( el = ep->Get() ) != NULL )     \
-    {                                       \
-        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() ); \
-    }                                      \
-    ep->Up(); } while( 0 )
-
 static const struct {
     vlc_meta_type_t type;
     const char *key;
@@ -285,10 +275,11 @@ void matroska_segment_c::ParseSimpleTags( KaxTagSimple *tag )
         if( !strcmp( k, metadata_map[i].key ) )
         {
             vlc_meta_Set( sys.meta, metadata_map[i].type, v );
+            msg_Dbg( &sys.demuxer, "|   |   + Meta %s: %s", k, v);
             goto done;
         }
     }
-    msg_Dbg( &sys.demuxer, "|   |   + %s: %s", k, v);
+    msg_Dbg( &sys.demuxer, "|   |   + Meta %s: %s", k, v);
     vlc_meta_AddExtra( sys.meta, k, v );
 done:
     free( k );
@@ -296,6 +287,17 @@ done:
     return;
 }
 
+#define PARSE_TAG( type ) \
+    do { \
+    msg_Dbg( &sys.demuxer, "|   + " type ); \
+    ep->Down();                             \
+    while( ( el = ep->Get() ) != NULL )     \
+    {                                       \
+        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() ); \
+    }                                      \
+    ep->Up(); } while( 0 )
+
+
 void matroska_segment_c::LoadTags( KaxTags *tags )
 {
     /* Master elements */