Revert "events: use input_state_e in input_state_changed."

[vlc] / modules / demux / playlist / itml.h

diff --git a/modules/demux/playlist/itml.h b/modules/demux/playlist/itml.h
index a5191af645114d517763518b38ae0981817eee5d..b8bf37a6433a2ff57615d1d14c8f22cafba65ea4 100644 (file)
--- a/modules/demux/playlist/itml.h
+++ b/modules/demux/playlist/itml.h
@@ -2,7 +2,7 @@
  * itml.c : iTunes Music Library import functions
  *******************************************************************************
  * Copyright (C) 2007 the VideoLAN team
- * $Id: $
+ * $Id$
  *
  * Authors: Yoann Peronneau <yoann@videolan.org>
  *
@@ -26,10 +26,10 @@
  */
 
 /* defines */
-#define FREE(v)        if (v) {free(v);v=NULL;}
-#define FREE_NAME()    if (psz_name) {free(psz_name);psz_name=NULL;}
-#define FREE_VALUE()   if (psz_value) {free(psz_value);psz_value=NULL;}
-#define FREE_KEY()     if (psz_key) {free(psz_key);psz_key=NULL;}
+#define FREE(v)        free(v);v=NULL;
+#define FREE_NAME()    free(psz_name);psz_name=NULL;
+#define FREE_VALUE()   free(psz_value);psz_value=NULL;
+#define FREE_KEY()     free(psz_key);psz_key=NULL;
 #define FREE_ATT()     FREE_NAME();FREE_VALUE()
 #define FREE_ATT_KEY() FREE_NAME();FREE_VALUE();FREE_KEY()
 
@@ -61,21 +61,21 @@ struct xml_elem_hnd
     int type;
     union
     {
-        vlc_bool_t (*smpl) SIMPLE_INTERFACE;
-        vlc_bool_t (*cmplx) COMPLEX_INTERFACE;
+        bool (*smpl) SIMPLE_INTERFACE;
+        bool (*cmplx) COMPLEX_INTERFACE;
     } pf_handler;
 };
 typedef struct xml_elem_hnd xml_elem_hnd_t;
 
 /* prototypes */
-static vlc_bool_t parse_plist_node COMPLEX_INTERFACE;
-static vlc_bool_t skip_element COMPLEX_INTERFACE;
-static vlc_bool_t parse_dict COMPLEX_INTERFACE;
-static vlc_bool_t parse_plist_dict COMPLEX_INTERFACE;
-static vlc_bool_t parse_tracks_dict COMPLEX_INTERFACE;
-static vlc_bool_t parse_track_dict COMPLEX_INTERFACE;
-static vlc_bool_t save_data SIMPLE_INTERFACE;
-static vlc_bool_t add_meta( input_item_t*, track_elem_t* );
+static bool parse_plist_node COMPLEX_INTERFACE;
+static bool skip_element COMPLEX_INTERFACE;
+static bool parse_dict COMPLEX_INTERFACE;
+static bool parse_plist_dict COMPLEX_INTERFACE;
+static bool parse_tracks_dict COMPLEX_INTERFACE;
+static bool parse_track_dict COMPLEX_INTERFACE;
+static bool save_data SIMPLE_INTERFACE;
+static bool add_meta( input_item_t*, track_elem_t* );
 static track_elem_t *new_track( void );
 static void free_track( track_elem_t* );