vcdx: Fix memleaks.

[vlc] / include / vlc_input.h

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 998442207a18b2f6e11e869de94bc3a093060983..be2821265c6988220ae8b667f8ea47db0d95ae16 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -31,7 +31,7 @@
 #include <vlc_epg.h>
 #include <vlc_events.h>
 
-#include <string.h>                                     /* strstr() */
+#include <string.h>                                     /* strcasestr() */
 
 struct vlc_meta_t;
 
@@ -58,7 +58,7 @@ struct input_item_t
 
     char       *psz_name;            /**< text describing this item */
     char       *psz_uri;             /**< mrl of this item */
-    bool  b_fixed_name;        /**< Can the interface change the name ?*/
+    bool       b_fixed_name;        /**< Can the interface change the name ?*/
 
     int        i_options;            /**< Number of input options */
     char       **ppsz_options;       /**< Array of input options */
@@ -169,7 +169,7 @@ static inline bool input_item_MetaMatch( input_item_t *p_i, vlc_meta_type_t meta
         return false;
     }
     const char * meta = vlc_meta_Get( p_i->p_meta, meta_type );
-    bool ret = meta && strstr( meta, psz );
+    bool ret = meta && strcasestr( meta, psz );
     vlc_mutex_unlock( &p_i->lock );
 
     return ret;
@@ -403,7 +403,7 @@ typedef struct
 {
     char        *psz_name;
 
-    bool  b_menu;      /* Is it a menu or a normal entry */
+    bool        b_menu;      /* Is it a menu or a normal entry */
 
     int64_t     i_length;   /* Length(microsecond) if known, else 0 */
     int64_t     i_size;     /* Size (bytes) if known, else 0 */
@@ -467,6 +467,7 @@ static inline input_title_t *vlc_input_title_Duplicate( input_title_t *t )
 
     return dup;
 }
+
 /*****************************************************************************
  * Attachments
  *****************************************************************************/
@@ -479,6 +480,7 @@ struct input_attachment_t
     int  i_data;
     void *p_data;
 };
+
 static inline input_attachment_t *vlc_input_attachment_New( const char *psz_name,
                                                             const char *psz_mime,
                                                             const char *psz_description,
@@ -517,20 +519,26 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a )
     free( a->p_data );
     free( a );
 }
+
 /*****************************************************************************
  * input defines/constants.
  *****************************************************************************/
 
 /* "state" value */
+/* NOTE: you need to update ppsz_input_state in the RC interface
+ * if you modify this list. */
 enum input_state_e
 {
-    INIT_S,
+    INIT_S = 0,
     OPENING_S,
     BUFFERING_S,
     PLAYING_S,
     PAUSE_S,
+    STOP_S,
+    FORWARD_S,
+    BACKWARD_S,
     END_S,
-    ERROR_S
+    ERROR_S,
 };
 
 /* "rate" default, min/max
@@ -662,4 +670,6 @@ VLC_EXPORT( void, input_DecoderDecode,( decoder_t *, block_t * ) );
 
 VLC_EXPORT( bool, input_AddSubtitles, ( input_thread_t *, char *, bool ) );
 
+VLC_EXPORT( vlc_event_manager_t *, input_get_event_manager, ( input_thread_t * ) );
+
 #endif