From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Fri, 21 Nov 2014 16:47:23 +0000 (+0100)
Subject: SVCDSub: do not reinvent msg_Dbg
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fd1f428e62dabe1083d6427c59d8af091128214b;p=vlc

SVCDSub: do not reinvent msg_Dbg
---

diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c
index 574e2d4c9e..a18fa69796 100644
--- a/modules/codec/svcdsub.c
+++ b/modules/codec/svcdsub.c
@@ -80,13 +80,6 @@ typedef enum  {
   SUBTITLE_BLOCK_COMPLETE = 2
 } packet_state_t;
 
-#ifndef NDEBUG
-# define dbg_print( s, args...) \
-     msg_Dbg(p_dec, "%s: "s, __func__ , ##args)
-#else
-# define dbg_print( s, args...)
-#endif
-
 struct decoder_sys_t
 {
   packet_state_t i_state; /* data-gathering state for this subtitle */
@@ -174,7 +167,9 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
 {
     block_t *p_block, *p_spu;
 
-    dbg_print( "" );
+#ifndef NDEBUG
+    msg_Dbg( p_dec, "Decode" );
+#endif
 
     if( pp_block == NULL || *pp_block == NULL ) return NULL;
 
@@ -314,7 +309,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
                       p_spu->i_buffer, p_sys->i_spu_size );
         }
 
-        dbg_print( "subtitle packet complete, size=%zu", p_spu->i_buffer );
+        msg_Dbg( p_dec, "subtitle packet complete, size=%zu", p_spu->i_buffer );
 
         p_sys->i_state = SUBTITLE_BLOCK_EMPTY;
         p_sys->p_spu = 0;