Disable crashy FS controller by default

[vlc] / include / vlc_input.h

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 0cec28cb91519e2426214c2f2e2142986c05ca9b..900c3f353e7c4a2dbbe0d4edff6b684eb5b3573b 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;
 
@@ -78,6 +78,8 @@ struct input_item_t
     input_stats_t *p_stats;          /**< Statistics */
     int           i_nb_played;       /**< Number of times played */
 
+    bool          b_error_when_reading;       /**< Error When Reading */
+
     vlc_meta_t *p_meta;
 
     vlc_event_manager_t event_manager;
@@ -157,6 +159,12 @@ int input_ItemAddOption (input_item_t *item, const char *str)
     return input_ItemAddOpt (item, str, VLC_INPUT_OPTION_TRUSTED);
 }
 
+static inline
+int input_ItemHasErrorWhenReading (input_item_t *item)
+{
+    return item->b_error_when_reading;
+}
+
 
 VLC_EXPORT( void, input_item_SetMeta, ( input_item_t *p_i, vlc_meta_type_t meta_type, const char *psz_val ));
 
@@ -169,7 +177,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;
@@ -525,18 +533,21 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a )
  *****************************************************************************/
 
 /* "state" value */
-enum input_state_e
+/* NOTE: you need to update ppsz_input_state in the RC interface
+ * if you modify this list. */
+typedef enum input_state_e
 {
     INIT_S = 0,
     OPENING_S,
     BUFFERING_S,
     PLAYING_S,
     PAUSE_S,
-    END_S,
+    STOP_S,
     FORWARD_S,
     BACKWARD_S,
-    ERROR_S
-};
+    END_S,
+    ERROR_S,
+} input_state_e;
 
 /* "rate" default, min/max
  * A rate below 1000 plays the movie faster,
@@ -661,6 +672,12 @@ enum input_query_e
 VLC_EXPORT( int, input_vaControl,( input_thread_t *, int i_query, va_list  ) );
 VLC_EXPORT( int, input_Control,  ( input_thread_t *, int i_query, ...  ) );
 
+static inline input_state_e input_GetState( input_thread_t * p_input )
+{
+    input_state_e state = INIT_S;
+    input_Control( p_input, INPUT_GET_STATE, &state );
+    return state;
+}
 VLC_EXPORT( decoder_t *, input_DecoderNew, ( input_thread_t *, es_format_t *, bool b_force_decoder ) );
 VLC_EXPORT( void, input_DecoderDelete, ( decoder_t * ) );
 VLC_EXPORT( void, input_DecoderDecode,( decoder_t *, block_t * ) );