libvlc: use vlc_common.h (libvlccore) instead of vlc/vlc.h

[vlc] / src / input / demux.c

diff --git a/src/input/demux.c b/src/input/demux.c
index 4bd3163c07c8b1b035e34e433344e4d28c1806f0..586bc0996ec93c4a8bdb3f4af348e2dd294c35c5 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -25,21 +25,21 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "input_internal.h"
 
-static vlc_bool_t SkipID3Tag( demux_t * );
-static vlc_bool_t SkipAPETag( demux_t *p_demux );
+static bool SkipID3Tag( demux_t * );
+static bool SkipAPETag( demux_t *p_demux );
 
 /*****************************************************************************
- * demux2_New:
+ * demux_New:
  *  if s is NULL then load a access_demux
  *****************************************************************************/
-demux_t *__demux2_New( vlc_object_t *p_obj,
+demux_t *__demux_New( vlc_object_t *p_obj,
                        const char *psz_access, const char *psz_demux,
                        const char *psz_path,
-                       stream_t *s, es_out_t *out, vlc_bool_t b_quick )
+                       stream_t *s, es_out_t *out, bool b_quick )
 {
     demux_t *p_demux = vlc_object_create( p_obj, VLC_OBJECT_DEMUX );
     const char *psz_module;
@@ -156,16 +156,16 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
             SkipAPETag( p_demux );
 
         p_demux->p_module =
-            module_Need( p_demux, "demux2", psz_module,
+            module_Need( p_demux, "demux", psz_module,
                          !strcmp( psz_module, p_demux->psz_demux ) ?
-                         VLC_TRUE : VLC_FALSE );
+                         true : false );
     }
     else
     {
         p_demux->p_module =
             module_Need( p_demux, "access_demux", psz_module,
                          !strcmp( psz_module, p_demux->psz_access ) ?
-                         VLC_TRUE : VLC_FALSE );
+                         true : false );
     }
 
     if( p_demux->p_module == NULL )
@@ -174,7 +174,7 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
         free( p_demux->psz_path );
         free( p_demux->psz_demux );
         free( p_demux->psz_access );
-        vlc_object_destroy( p_demux );
+        vlc_object_release( p_demux );
         return NULL;
     }
 
@@ -182,9 +182,9 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
 }
 
 /*****************************************************************************
- * demux2_Delete:
+ * demux_Delete:
  *****************************************************************************/
-void demux2_Delete( demux_t *p_demux )
+void demux_Delete( demux_t *p_demux )
 {
     module_Unneed( p_demux, p_demux->p_module );
     vlc_object_detach( p_demux );
@@ -193,13 +193,13 @@ void demux2_Delete( demux_t *p_demux )
     free( p_demux->psz_demux );
     free( p_demux->psz_access );
 
-    vlc_object_destroy( p_demux );
+    vlc_object_release( p_demux );
 }
 
 /*****************************************************************************
- * demux2_vaControlHelper:
+ * demux_vaControlHelper:
  *****************************************************************************/
-int demux2_vaControlHelper( stream_t *s,
+int demux_vaControlHelper( stream_t *s,
                             int64_t i_start, int64_t i_end,
                             int i_bitrate, int i_align,
                             int i_query, va_list args )
@@ -219,7 +219,7 @@ int demux2_vaControlHelper( stream_t *s,
             pi64 = (int64_t*)va_arg( args, int64_t * );
             if( i_bitrate > 0 && i_end > i_start )
             {
-                *pi64 = I64C(8000000) * (i_end - i_start) / i_bitrate;
+                *pi64 = INT64_C(8000000) * (i_end - i_start) / i_bitrate;
                 return VLC_SUCCESS;
             }
             return VLC_EGENERIC;
@@ -228,7 +228,7 @@ int demux2_vaControlHelper( stream_t *s,
             pi64 = (int64_t*)va_arg( args, int64_t * );
             if( i_bitrate > 0 && i_end > i_start )
             {
-                *pi64 = I64C(8000000) * (i_tell - i_start) / i_bitrate;
+                *pi64 = INT64_C(8000000) * (i_tell - i_start) / i_bitrate;
                 return VLC_SUCCESS;
             }
             return VLC_EGENERIC;
@@ -262,7 +262,7 @@ int demux2_vaControlHelper( stream_t *s,
             i64 = (int64_t)va_arg( args, int64_t );
             if( i_bitrate > 0 && i64 >= 0 )
             {
-                int64_t i_block = i64 * i_bitrate / I64C(8000000) / i_align;
+                int64_t i_block = i64 * i_bitrate / INT64_C(8000000) / i_align;
                 if( stream_Seek( s, i_start + i_block * i_align ) )
                 {
                     return VLC_EGENERIC;
@@ -325,7 +325,7 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
     s->pf_control= DStreamControl;
 
     s->i_char_width = 1;
-    s->b_little_endian = VLC_FALSE;
+    s->b_little_endian = false;
 
     s->p_sys = malloc( sizeof( d_stream_sys_t) );
     p_sys = (d_stream_sys_t*)s->p_sys;
@@ -337,18 +337,18 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
     p_sys->psz_name = strdup( psz_demux );
 
     /* decoder fifo */
-    if( ( p_sys->p_fifo = block_FifoNew( s ) ) == NULL )
+    if( ( p_sys->p_fifo = block_FifoNew() ) == NULL )
     {
         msg_Err( s, "out of memory" );
-        vlc_object_destroy( s );
+        vlc_object_release( s );
         free( p_sys );
         return NULL;
     }
 
     if( vlc_thread_create( s, "stream out", DStreamThread,
-                           VLC_THREAD_PRIORITY_INPUT, VLC_FALSE ) )
+                           VLC_THREAD_PRIORITY_INPUT, false ) )
     {
-        vlc_object_destroy( s );
+        vlc_object_release( s );
         free( p_sys );
         return NULL;
     }
@@ -374,14 +374,14 @@ void stream_DemuxDelete( stream_t *s )
     block_FifoPut( p_sys->p_fifo, p_empty );
     vlc_thread_join( s );
 
-    if( p_sys->p_demux ) demux2_Delete( p_sys->p_demux );
+    if( p_sys->p_demux ) demux_Delete( p_sys->p_demux );
     if( p_sys->p_block ) block_Release( p_sys->p_block );
 
     block_FifoRelease( p_sys->p_fifo );
     free( p_sys->psz_name );
     free( p_sys );
 
-    vlc_object_destroy( s );
+    vlc_object_release( s );
 }
 
 
@@ -468,7 +468,7 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
 {
     d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
     int64_t    *p_i64;
-    vlc_bool_t *p_b;
+    bool *p_b;
     int        *p_int;
 
     switch( i_query )
@@ -479,13 +479,13 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
             return VLC_SUCCESS;
 
         case STREAM_CAN_SEEK:
-            p_b = (vlc_bool_t*) va_arg( args, vlc_bool_t * );
-            *p_b = VLC_FALSE;
+            p_b = (bool*) va_arg( args, bool * );
+            *p_b = false;
             return VLC_SUCCESS;
 
         case STREAM_CAN_FASTSEEK:
-            p_b = (vlc_bool_t*) va_arg( args, vlc_bool_t * );
-            *p_b = VLC_FALSE;
+            p_b = (bool*) va_arg( args, bool * );
+            *p_b = false;
             return VLC_SUCCESS;
 
         case STREAM_GET_POSITION:
@@ -530,8 +530,8 @@ static int DStreamThread( stream_t *s )
     demux_t *p_demux;
 
     /* Create the demuxer */
-    if( !(p_demux = demux2_New( s, "", p_sys->psz_name, "", s, p_sys->out,
-                               VLC_FALSE )) )
+    if( !(p_demux = demux_New( s, "", p_sys->psz_name, "", s, p_sys->out,
+                               false )) )
     {
         return VLC_EGENERIC;
     }
@@ -551,7 +551,7 @@ static int DStreamThread( stream_t *s )
 /****************************************************************************
  * Utility functions
  ****************************************************************************/
-static vlc_bool_t SkipID3Tag( demux_t *p_demux )
+static bool SkipID3Tag( demux_t *p_demux )
 {
     const uint8_t *p_peek;
     uint8_t version, revision;
@@ -559,14 +559,14 @@ static vlc_bool_t SkipID3Tag( demux_t *p_demux )
     int b_footer;
 
     if( !p_demux->s )
-        return VLC_FALSE;
+        return false;
 
     /* Get 10 byte id3 header */
     if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 )
-        return VLC_FALSE;
+        return false;
 
     if( memcmp( p_peek, "ID3", 3 ) )
-        return VLC_FALSE;
+        return false;
 
     version = p_peek[3];
     revision = p_peek[4];
@@ -581,9 +581,9 @@ static vlc_bool_t SkipID3Tag( demux_t *p_demux )
 
     msg_Dbg( p_demux, "ID3v2.%d revision %d tag found, skipping %d bytes",
              version, revision, i_size );
-    return VLC_TRUE;
+    return true;
 }
-static vlc_bool_t SkipAPETag( demux_t *p_demux )
+static bool SkipAPETag( demux_t *p_demux )
 {
     const uint8_t *p_peek;
     int i_version;
@@ -591,19 +591,19 @@ static vlc_bool_t SkipAPETag( demux_t *p_demux )
     uint32_t flags;
 
     if( !p_demux->s )
-        return VLC_FALSE;
+        return false;
 
     /* Get 32 byte ape header */
     if( stream_Peek( p_demux->s, &p_peek, 32 ) < 32 )
-        return VLC_FALSE;
+        return false;
 
     if( memcmp( p_peek, "APETAGEX", 8 ) )
-        return VLC_FALSE;
+        return false;
 
     i_version = GetDWLE( &p_peek[8] );
     flags = GetDWLE( &p_peek[8+4+4] );
     if( ( i_version != 1000 && i_version != 2000 ) || !( flags & (1<<29) ) )
-        return VLC_FALSE;
+        return false;
 
     i_size = GetDWLE( &p_peek[8+4] ) + ( (flags&(1<<30)) ? 32 : 0 );
 
@@ -612,6 +612,6 @@ static vlc_bool_t SkipAPETag( demux_t *p_demux )
 
     msg_Dbg( p_demux, "AP2 v%d tag found, skipping %d bytes",
              i_version/1000, i_size );
-    return VLC_TRUE;
+    return true;
 }