X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_vlm.h;h=9bbb4a57cd45b0302b49b0ebd11b288c520249af;hb=6b42b421710760b88561364ecc585b93aee7790a;hp=563f2b4cbe27da5964b3f708b571891052fb39e3;hpb=f464bb35e8601535462bfd1bbcd8d2de79d404d7;p=vlc

diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h
index 563f2b4cbe..9bbb4a57cd 100644
--- a/include/vlc_vlm.h
+++ b/include/vlc_vlm.h
@@ -29,17 +29,13 @@
 #ifndef _VLC_VLM_H
 #define _VLC_VLM_H 1
 
-#ifdef __cpluplus
-extern "C" {
-#endif
-
 #include <vlc_input.h>
 
 /* VLM media */
 typedef struct
 {
     int64_t     id;
-    vlc_bool_t  b_enabled;
+    bool  b_enabled;
 
     /* */
     char *psz_name;
@@ -54,10 +50,10 @@ typedef struct
     char *psz_output;
 
     /* */
-    vlc_bool_t b_vod;
+    bool b_vod;
     struct
     {
-        vlc_bool_t b_loop;
+        bool b_loop;
     } broadcast;
     struct
     {
@@ -74,7 +70,7 @@ typedef struct
     int64_t     i_time;
     int64_t     i_length;
     double      d_position;
-    vlc_bool_t  b_paused;
+    bool  b_paused;
     int         i_rate;     // normal is INPUT_RATE_DEFAULT
 } vlm_media_instance_t;
 
@@ -151,6 +147,10 @@ struct vlm_message_t
 };
 
 
+#ifdef __cpluplus
+extern "C" {
+#endif
+
 #define vlm_New( a ) __vlm_New( VLC_OBJECT(a) )
 VLC_EXPORT( vlm_t *, __vlm_New, ( vlc_object_t * ) );
 VLC_EXPORT( void,      vlm_Delete, ( vlm_t * ) );
@@ -170,10 +170,10 @@ static inline void vlm_media_Init( vlm_media_t *p_media )
     TAB_INIT( p_media->i_input, p_media->ppsz_input );
     TAB_INIT( p_media->i_option, p_media->ppsz_option );
     p_media->psz_output = NULL;
-    p_media->b_vod = VLC_FALSE;
+    p_media->b_vod = false;
 
     p_media->vod.psz_mux = NULL;
-    p_media->broadcast.b_loop = VLC_FALSE;
+    p_media->broadcast.b_loop = false;
 }
 
 static inline void vlm_media_Copy( vlm_media_t *p_dst, vlm_media_t *p_src )
@@ -208,8 +208,7 @@ static inline void vlm_media_Copy( vlm_media_t *p_dst, vlm_media_t *p_src )
 static inline void vlm_media_Clean( vlm_media_t *p_media )
 {
     int i;
-    if( p_media->psz_name )
-        free( p_media->psz_name );
+    free( p_media->psz_name );
 
     for( i = 0; i < p_media->i_input; i++ )
         free( p_media->ppsz_input[i]) ;
@@ -219,17 +218,13 @@ static inline void vlm_media_Clean( vlm_media_t *p_media )
         free( p_media->ppsz_option[i]) ;
     TAB_CLEAN(p_media->i_option, p_media->ppsz_option );
 
-    if( p_media->psz_output )
-        free( p_media->psz_output );
+    free( p_media->psz_output );
     if( p_media->b_vod )
-    {
-        if( p_media->vod.psz_mux )
-            free( p_media->vod.psz_mux );
-    }
+        free( p_media->vod.psz_mux );
 }
 static inline vlm_media_t *vlm_media_New(void)
 {
-    vlm_media_t *p_media = malloc( sizeof(vlm_media_t) );
+    vlm_media_t *p_media = (vlm_media_t *)malloc( sizeof(vlm_media_t) );
     if( p_media )
         vlm_media_Init( p_media );
     return p_media;
@@ -255,17 +250,16 @@ static inline void vlm_media_instance_Init( vlm_media_instance_t *p_instance )
     p_instance->i_time = 0;
     p_instance->i_length = 0;
     p_instance->d_position = 0.0;
-    p_instance->b_paused = VLC_FALSE;
+    p_instance->b_paused = false;
     p_instance->i_rate = INPUT_RATE_DEFAULT;
 }
 static inline void vlm_media_instance_Clean( vlm_media_instance_t *p_instance )
 {
-    if( p_instance->psz_name )
-        free( p_instance->psz_name );
+    free( p_instance->psz_name );
 }
 static inline vlm_media_instance_t *vlm_media_instance_New(void)
 {
-    vlm_media_instance_t *p_instance = malloc( sizeof(vlm_media_instance_t) );
+    vlm_media_instance_t *p_instance = (vlm_media_instance_t *) malloc( sizeof(vlm_media_instance_t) );
     if( p_instance )
         vlm_media_instance_Init( p_instance );
     return p_instance;