Clean up/Factorize.

[vlc] / src / input / input_internal.h

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 9683b2c702fbcd4bfa3607edb17a06cb144fe6ab..fe2fc010fba955448a1ca7e96fb69e2979c13497 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -59,6 +59,7 @@ typedef struct
     vlc_bool_t b_can_pace_control;
     vlc_bool_t b_can_pause;
     vlc_bool_t b_eof;   /* eof of demuxer */
+    double     f_fps;
 
     /* Clock average variation */
     int     i_cr_average;
@@ -215,6 +216,7 @@ typedef struct playlist_album_t
 {
     char *psz_artist;
     char *psz_album;
+    char *psz_arturl;
     vlc_bool_t b_found;
 } playlist_album_t;
 
@@ -262,9 +264,10 @@ vlc_bool_t input_DecoderEmpty( decoder_t * p_dec );
 es_out_t  *input_EsOutNew( input_thread_t * );
 void       input_EsOutDelete( es_out_t * );
 es_out_id_t *input_EsOutGetFromID( es_out_t *, int i_id );
-void       input_EsOutDiscontinuity( es_out_t *, vlc_bool_t b_flush, vlc_bool_t b_audio );
 void       input_EsOutSetDelay( es_out_t *, int i_cat, int64_t );
-void       input_EsOutSetRate( es_out_t * );
+void       input_EsOutChangeRate( es_out_t * );
+void       input_EsOutChangeState( es_out_t * );
+void       input_EsOutChangePosition( es_out_t * );
 vlc_bool_t input_EsOutDecodersEmpty( es_out_t * );
 
 /* clock.c */
@@ -309,9 +312,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 */