Replace vlc_bool_t by bool, VLC_TRUE by true and VLC_FALSE by false.

[vlc] / modules / demux / ps.c

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index 57fde2e2451ae38b70190c00b6a167738850116d..0ee0360919cccce0e677f7405757a7d955717c0a 100644 (file)
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -24,7 +24,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
@@ -56,8 +59,8 @@ vlc_module_begin();
     set_callbacks( OpenForce, Close );
     add_shortcut( "ps" );
 
-    add_bool( "ps-trust-timestamps", VLC_TRUE, NULL, TIME_TEXT,
-                 TIME_LONGTEXT, VLC_TRUE );
+    add_bool( "ps-trust-timestamps", true, NULL, TIME_TEXT,
+                 TIME_LONGTEXT, true );
 
     add_submodule();
     set_description( _("MPEG-PS demuxer") );
@@ -80,9 +83,9 @@ struct demux_sys_t
     int         i_time_track;
     int64_t     i_current_pts;
 
-    vlc_bool_t  b_lost_sync;
-    vlc_bool_t  b_have_pack;
-    vlc_bool_t  b_seekable;
+    bool  b_lost_sync;
+    bool  b_have_pack;
+    bool  b_seekable;
 };
 
 static int Demux  ( demux_t *p_demux );
@@ -94,12 +97,12 @@ static block_t *ps_pkt_read   ( stream_t *, uint32_t i_code );
 /*****************************************************************************
  * Open
  *****************************************************************************/
-static int OpenCommon( vlc_object_t *p_this, vlc_bool_t b_force )
+static int OpenCommon( vlc_object_t *p_this, bool b_force )
 {
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
 
-    uint8_t     *p_peek;
+    const uint8_t *p_peek;
 
     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
     {
@@ -128,9 +131,9 @@ static int OpenCommon( vlc_object_t *p_this, vlc_bool_t b_force )
     p_sys->i_current_pts = (mtime_t) 0;
     p_sys->i_time_track = -1;
 
-    p_sys->b_lost_sync = VLC_FALSE;
-    p_sys->b_have_pack = VLC_FALSE;
-    p_sys->b_seekable  = VLC_FALSE;
+    p_sys->b_lost_sync = false;
+    p_sys->b_have_pack = false;
+    p_sys->b_seekable  = false;
 
     stream_Control( p_demux->s, STREAM_CAN_SEEK, &p_sys->b_seekable );
 
@@ -144,7 +147,7 @@ static int OpenCommon( vlc_object_t *p_this, vlc_bool_t b_force )
 
 static int OpenForce( vlc_object_t *p_this )
 {
-    return OpenCommon( p_this, VLC_TRUE );
+    return OpenCommon( p_this, true );
 }
 
 static int Open( vlc_object_t *p_this )
@@ -176,7 +179,7 @@ static void Close( vlc_object_t *p_this )
     free( p_sys );
 }
 
-static int Demux2( demux_t *p_demux, vlc_bool_t b_end )
+static int Demux2( demux_t *p_demux, bool b_end )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
     int i_ret, i_id;
@@ -193,12 +196,12 @@ static int Demux2( demux_t *p_demux, vlc_bool_t b_end )
         if( !p_sys->b_lost_sync )
             msg_Warn( p_demux, "garbage at input, trying to resync..." );
 
-        p_sys->b_lost_sync = VLC_TRUE;
+        p_sys->b_lost_sync = true;
         return 1;
     }
 
     if( p_sys->b_lost_sync ) msg_Warn( p_demux, "found sync code" );
-    p_sys->b_lost_sync = VLC_FALSE;
+    p_sys->b_lost_sync = false;
 
     if( ( p_pkt = ps_pkt_read( p_demux->s, i_code ) ) == NULL )
     {
@@ -238,14 +241,14 @@ static void FindLength( demux_t *p_demux )
         /* Check beginning */
         i = 0;
         i_current_pos = stream_Tell( p_demux->s );
-        while( !p_demux->b_die && i < 40 && Demux2( p_demux, VLC_FALSE ) > 0 ) i++;
+        while( !p_demux->b_die && i < 40 && Demux2( p_demux, false ) > 0 ) i++;
 
         /* Check end */
         i_size = stream_Size( p_demux->s );
         i_end = __MAX( 0, __MIN( 200000, i_size ) );
         stream_Seek( p_demux->s, i_size - i_end );
 
-        while( !p_demux->b_die && Demux2( p_demux, VLC_TRUE ) > 0 );
+        while( !p_demux->b_die && Demux2( p_demux, true ) > 0 );
         if( i_current_pos >= 0 ) stream_Seek( p_demux->s, i_current_pos );
     }
 
@@ -260,7 +263,7 @@ static void FindLength( demux_t *p_demux )
                 {
                     p_sys->i_length = i_length;
                     p_sys->i_time_track = i;
-                    msg_Dbg( p_demux, "we found a length of: %lld", p_sys->i_length );
+                    msg_Dbg( p_demux, "we found a length of: "I64Fd, p_sys->i_length );
                 }
             }
     }
@@ -286,12 +289,12 @@ static int Demux( demux_t *p_demux )
         if( !p_sys->b_lost_sync )
             msg_Warn( p_demux, "garbage at input, trying to resync..." );
 
-        p_sys->b_lost_sync = VLC_TRUE;
+        p_sys->b_lost_sync = true;
         return 1;
     }
 
     if( p_sys->b_lost_sync ) msg_Warn( p_demux, "found sync code" );
-    p_sys->b_lost_sync = VLC_FALSE;
+    p_sys->b_lost_sync = false;
 
     if( p_sys->i_length < 0 && p_sys->b_seekable )
         FindLength( p_demux );
@@ -310,7 +313,7 @@ static int Demux( demux_t *p_demux )
     case 0x1ba:
         if( !ps_pkt_parse_pack( p_pkt, &p_sys->i_scr, &i_mux_rate ) )
         {
-            if( !p_sys->b_have_pack ) p_sys->b_have_pack = VLC_TRUE;
+            if( !p_sys->b_have_pack ) p_sys->b_have_pack = true;
             /* done later on to work around bad vcd/svcd streams */
             /* es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_scr ); */
             if( i_mux_rate > 0 ) p_sys->i_mux_rate = i_mux_rate;
@@ -346,7 +349,7 @@ static int Demux( demux_t *p_demux )
     default:
         if( (i_id = ps_pkt_id( p_pkt )) >= 0xc0 )
         {
-            vlc_bool_t b_new = VLC_FALSE;
+            bool b_new = false;
             ps_track_t *tk = &p_sys->tk[PS_ID_TO_TK(i_id)];
 
             if( !tk->b_seen )
@@ -354,13 +357,13 @@ static int Demux( demux_t *p_demux )
                 if( !ps_track_fill( tk, &p_sys->psm, i_id ) )
                 {
                     tk->es = es_out_Add( p_demux->out, &tk->fmt );
-                    b_new = VLC_TRUE;
+                    b_new = true;
                 }
                 else
                 {
                     msg_Dbg( p_demux, "es id=0x%x format unknown", i_id );
                 }
-                tk->b_seen = VLC_TRUE;
+                tk->b_seen = true;
             }
 
             /* The popular VCD/SVCD subtitling WinSubMux does not
@@ -383,7 +386,7 @@ static int Demux( demux_t *p_demux )
                 if( !b_new && !p_sys->b_have_pack && tk->fmt.i_cat == AUDIO_ES && p_pkt->i_pts > 0 )
                 {
                     /* A hack to sync the A/V on PES files. */
-                    msg_Dbg( p_demux, "force SCR: %lld", p_pkt->i_pts );
+                    msg_Dbg( p_demux, "force SCR: "I64Fd, p_pkt->i_pts );
                     es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_pkt->i_pts );
                 }
 
@@ -503,7 +506,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
  */
 static int ps_pkt_resynch( stream_t *s, uint32_t *pi_code )
 {
-    uint8_t *p_peek;
+    const uint8_t *p_peek;
     int     i_peek;
     int     i_skip;
 
@@ -546,7 +549,7 @@ static int ps_pkt_resynch( stream_t *s, uint32_t *pi_code )
 
 static block_t *ps_pkt_read( stream_t *s, uint32_t i_code )
 {
-    uint8_t *p_peek;
+    const uint8_t *p_peek;
     int      i_peek = stream_Peek( s, &p_peek, 14 );
     int      i_size = ps_pkt_size( p_peek, i_peek );