If LibVLC is closing, any interface should close, not just the main one

[vlc] / src / input / input_internal.h

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index bd1adf7ace3c7a5b7f5047482d87aa533778ec28..6cf6fd568f0572a188c2c05a22f4e3f8c13c6080 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -215,6 +215,7 @@ typedef struct playlist_album_t
 {
     char *psz_artist;
     char *psz_album;
+    char *psz_arturl;
     vlc_bool_t b_found;
 } playlist_album_t;
 
@@ -309,9 +310,7 @@ void MRLSplit( vlc_object_t *, char *, const char **, const char **, char ** );
 
 static inline void input_ChangeState( input_thread_t *p_input, int state )
 {
-    vlc_value_t val;
-    val.i_int = p_input->i_state = state;
-    var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+    var_SetInteger( p_input, "state", p_input->i_state = state );
 }
 
 /* Access */
@@ -353,7 +352,7 @@ static inline int demux2_Control( demux_t *p_demux, int i_query, ... )
 }
 
 #if defined(__PLUGIN__) || defined(__BUILTIN__)
-# warning CAN'T YOU SEE THIS IS AN INTERNAL HEADER?! '
+# warning This is an internal header, something is wrong if you see this message.
 #else
 /* Stream */
 /**
@@ -363,9 +362,9 @@ struct stream_t
 {
     VLC_COMMON_MEMBERS
 
-    block_t *(*pf_block)  ( stream_t *, int i_size );
+    /*block_t *(*pf_block)  ( stream_t *, int i_size );*/
     int      (*pf_read)   ( stream_t *, void *p_read, int i_read );
-    int      (*pf_peek)   ( stream_t *, uint8_t **pp_peek, int i_peek );
+    int      (*pf_peek)   ( stream_t *, const uint8_t **pp_peek, int i_peek );
     int      (*pf_control)( stream_t *, int i_query, va_list );
     void     (*pf_destroy)( stream_t *);