Less memleaks in Qt interface.

[vlc] / modules / demux / mpeg / mpga.c

diff --git a/modules/demux/mpeg/mpga.c b/modules/demux/mpeg/mpga.c
index 957705d2ce5c643fd3db4b0395caf266cd88385d..9e0dbf48bc3612021f8dc65c4af6b40880a836a3 100644 (file)
--- a/modules/demux/mpeg/mpga.c
+++ b/modules/demux/mpeg/mpga.c
@@ -26,7 +26,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_codec.h>
 #include <vlc_input.h>
@@ -42,8 +47,8 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_description( _("MPEG audio / MP3 demuxer" ) );
-    set_capability( "demux2", 100 );
+    set_description( N_("MPEG audio / MP3 demuxer" ) );
+    set_capability( "demux", 100 );
     set_callbacks( Open, Close );
     add_shortcut( "mpga" );
     add_shortcut( "mp3" );
@@ -59,14 +64,14 @@ struct demux_sys_t
 {
     es_out_id_t *p_es;
 
-    vlc_bool_t  b_start;
+    bool  b_start;
     decoder_t   *p_packetizer;
 
     mtime_t     i_pts;
     mtime_t     i_time_offset;
     int         i_bitrate_avg;  /* extracted from Xing header */
 
-    vlc_bool_t b_initial_sync_failed;
+    bool b_initial_sync_failed;
 
     int i_xing_frames;
     int i_xing_bytes;
@@ -84,9 +89,9 @@ static int HeaderCheck( uint32_t h )
         || (((h >> 10) & 0x03) == 0x03 )    /* valide sampling freq ? */
         || ((h & 0x03) == 0x02 ))           /* valid emphasis ? */
     {
-        return VLC_FALSE;
+        return false;
     }
-    return VLC_TRUE;
+    return true;
 }
 
 #define MPGA_VERSION( h )   ( 1 - (((h)>>19)&0x01) )
@@ -116,20 +121,20 @@ static int Open( vlc_object_t * p_this )
 {
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
-    vlc_bool_t   b_forced = VLC_FALSE;
+    bool   b_forced = false;
 
     uint32_t     header;
     const uint8_t     *p_peek;
     block_t     *p_block_in, *p_block_out;
 
-    if( demux2_IsPathExtension( p_demux, ".mp3" ) )
-        b_forced = VLC_TRUE;
+    if( demux_IsPathExtension( p_demux, ".mp3" ) )
+        b_forced = true;
 
     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
 
     if( !HeaderCheck( header = GetDWBE( p_peek ) ) )
     {
-        vlc_bool_t b_ok = VLC_FALSE;
+        bool b_ok = false;
         int i_peek;
 
         if( !p_demux->b_force && !b_forced ) return VLC_EGENERIC;
@@ -139,7 +144,7 @@ static int Open( vlc_object_t * p_this )
         {
             if( HeaderCheck( header = GetDWBE( p_peek ) ) )
             {
-                b_ok = VLC_TRUE;
+                b_ok = true;
                 break;
             }
             p_peek += 1;
@@ -151,7 +156,7 @@ static int Open( vlc_object_t * p_this )
     DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys;
     memset( p_sys, 0, sizeof( demux_sys_t ) );
     p_sys->p_es = 0;
-    p_sys->b_start = VLC_TRUE;
+    p_sys->b_start = true;
 
     /* Load the mpeg audio packetizer */
     INIT_APACKETIZER( p_sys->p_packetizer, 'm', 'p', 'g', 'a' );
@@ -230,17 +235,17 @@ static int Open( vlc_object_t * p_this )
     if( p_block_out == NULL )
     {
         msg_Dbg( p_demux, "did not sync on first block" );
-        p_sys->b_initial_sync_failed = VLC_TRUE;
+        p_sys->b_initial_sync_failed = true;
     }
     else
-        p_sys->b_initial_sync_failed = VLC_FALSE;
+        p_sys->b_initial_sync_failed = false;
 
     p_sys->i_bitrate_avg = p_sys->p_packetizer->fmt_out.i_bitrate;
 
     if( p_sys->i_xing_bytes && p_sys->i_xing_frames &&
         p_sys->i_xing_frame_samples )
     {
-        p_sys->i_bitrate_avg = p_sys->i_xing_bytes * I64C(8) *
+        p_sys->i_bitrate_avg = p_sys->i_xing_bytes * INT64_C(8) *
             p_sys->p_packetizer->fmt_out.audio.i_rate /
             p_sys->i_xing_frames / p_sys->i_xing_frame_samples;
     }
@@ -249,7 +254,7 @@ static int Open( vlc_object_t * p_this )
     p_sys->p_block_out = p_block_out;
 
     /* */
-    p_sys->p_packetizer->fmt_out.b_packetized = VLC_TRUE;
+    p_sys->p_packetizer->fmt_out.b_packetized = true;
     p_sys->p_es = es_out_Add( p_demux->out,
                               &p_sys->p_packetizer->fmt_out);
     return VLC_SUCCESS;
@@ -266,7 +271,7 @@ static int Demux( demux_t *p_demux )
     block_t *p_block_in, *p_block_out;
     if( p_sys->b_start )
     {
-        p_sys->b_start = VLC_FALSE;
+        p_sys->b_start = false;
         p_block_in = p_sys->p_block_in;
         p_sys->p_block_in = NULL;
         p_block_out = p_sys->p_block_out;
@@ -279,7 +284,7 @@ static int Demux( demux_t *p_demux )
         {
             return 0;
         }
-        if( p_demux->p_sys->b_initial_sync_failed == VLC_TRUE )
+        if( p_demux->p_sys->b_initial_sync_failed == true )
         {
             p_block_in->i_pts = p_block_in->i_dts = 1;
             /* Only try to resync once */
@@ -333,7 +338,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 {
     demux_sys_t *p_sys  = p_demux->p_sys;
     int64_t *pi64;
-    vlc_bool_t *pb_bool;
+    bool *pb_bool;
     int i_ret;
     va_list args_save;
 
@@ -342,8 +347,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     switch( i_query )
     {
         case DEMUX_HAS_UNSUPPORTED_META:
-            pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
-            *pb_bool = VLC_TRUE;
+            pb_bool = (bool*)va_arg( args, bool* );
+            *pb_bool = true;
             return VLC_SUCCESS;
 
         case DEMUX_GET_TIME:
@@ -351,12 +356,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             *pi64 = p_sys->i_pts + p_sys->i_time_offset;
             return VLC_SUCCESS;
 
-        case DEMUX_SET_TIME:
-            /* FIXME TODO: implement a high precision seek (with mp3 parsing)
-             * needed for multi-input */
-
         case DEMUX_GET_LENGTH:
-            i_ret = demux2_vaControlHelper( p_demux->s, 0, -1,
+            i_ret = demux_vaControlHelper( p_demux->s, 0, -1,
                                             p_sys->i_bitrate_avg, 1, i_query,
                                             args );
             /* No bitrate, we can't have it precisely, but we can compute
@@ -378,14 +379,17 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             va_end( args_save );
             return i_ret;
 
+        case DEMUX_SET_TIME:
+            /* FIXME TODO: implement a high precision seek (with mp3 parsing)
+             * needed for multi-input */
         default:
-            i_ret = demux2_vaControlHelper( p_demux->s, 0, -1,
+            i_ret = demux_vaControlHelper( p_demux->s, 0, -1,
                                             p_sys->i_bitrate_avg, 1, i_query,
                                             args );
             if( !i_ret && p_sys->i_bitrate_avg > 0 &&
                 (i_query == DEMUX_SET_POSITION || i_query == DEMUX_SET_TIME) )
             {
-                int64_t i_time = I64C(8000000) * stream_Tell(p_demux->s) /
+                int64_t i_time = INT64_C(8000000) * stream_Tell(p_demux->s) /
                     p_sys->i_bitrate_avg;
 
                 /* Fix time_offset */