Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / input / event.c

diff --git a/src/input/event.c b/src/input/event.c
index 6703dfed395c64a1bbc418aed0767fa061a65521..f0a420518d310a87ce24f9d8fd6d3075e4c25d12 100644 (file)
--- a/src/input/event.c
+++ b/src/input/event.c
@@ -78,7 +78,7 @@ void input_SendEventLength( input_thread_t *p_input, mtime_t i_length )
 {
     vlc_value_t val;
 
-       /* FIXME ugly + what about meta change event ? */
+    /* FIXME ugly + what about meta change event ? */
     if( var_GetTime( p_input, "length" ) == i_length )
         return;
 
@@ -95,29 +95,29 @@ void input_SendEventStatistics( input_thread_t *p_input )
 }
 void input_SendEventRate( input_thread_t *p_input, int i_rate )
 {
-       vlc_value_t val;
+    vlc_value_t val;
 
-       val.i_int = i_rate;
-       var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
+    val.f_float = (float)INPUT_RATE_DEFAULT / (float)i_rate;
+    var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
 
     Trigger( p_input, INPUT_EVENT_RATE );
 }
 void input_SendEventAudioDelay( input_thread_t *p_input, mtime_t i_delay )
 {
-       vlc_value_t val;
+    vlc_value_t val;
 
-       val.i_time = i_delay;
-       var_Change( p_input, "audio-delay", VLC_VAR_SETVALUE, &val, NULL );
+    val.i_time = i_delay;
+    var_Change( p_input, "audio-delay", VLC_VAR_SETVALUE, &val, NULL );
 
     Trigger( p_input, INPUT_EVENT_AUDIO_DELAY );
 }
 
 void input_SendEventSubtitleDelay( input_thread_t *p_input, mtime_t i_delay )
 {
-       vlc_value_t val;
+    vlc_value_t val;
 
-       val.i_time = i_delay;
-       var_Change( p_input, "spu-delay", VLC_VAR_SETVALUE, &val, NULL );
+    val.i_time = i_delay;
+    var_Change( p_input, "spu-delay", VLC_VAR_SETVALUE, &val, NULL );
 
     Trigger( p_input, INPUT_EVENT_SUBTITLE_DELAY );
 }
@@ -125,34 +125,40 @@ void input_SendEventSubtitleDelay( input_thread_t *p_input, mtime_t i_delay )
 /* TODO and file name ? */
 void input_SendEventRecord( input_thread_t *p_input, bool b_recording )
 {
-       vlc_value_t val;
+    vlc_value_t val;
 
-       val.b_bool = b_recording;
-       var_Change( p_input, "record", VLC_VAR_SETVALUE, &val, NULL );
+    val.b_bool = b_recording;
+    var_Change( p_input, "record", VLC_VAR_SETVALUE, &val, NULL );
 
     Trigger( p_input, INPUT_EVENT_RECORD );
 }
 
 void input_SendEventTitle( input_thread_t *p_input, int i_title )
 {
-       vlc_value_t val;
+    vlc_value_t val;
 
-       val.i_int = i_title;
-       var_Change( p_input, "title", VLC_VAR_SETVALUE, &val, NULL );
+    val.i_int = i_title;
+    var_Change( p_input, "title", VLC_VAR_SETVALUE, &val, NULL );
 
-       input_ControlVarTitle( p_input, i_title );
+    input_ControlVarTitle( p_input, i_title );
 
     Trigger( p_input, INPUT_EVENT_TITLE );
 }
 
 void input_SendEventSeekpoint( input_thread_t *p_input, int i_title, int i_seekpoint )
 {
-       vlc_value_t val;
+    vlc_value_t val;
 
-       VLC_UNUSED( i_title );
-       val.i_int = i_seekpoint;
-       var_Change( p_input, "chapter", VLC_VAR_SETVALUE, &val, NULL );
+    /* "chapter" */
+    val.i_int = i_seekpoint;
+    var_Change( p_input, "chapter", VLC_VAR_SETVALUE, &val, NULL );
 
+    /* "title %2i" */
+    char psz_title[10];
+    snprintf( psz_title, sizeof(psz_title), "title %2i", i_title );
+    var_Change( p_input, psz_title, VLC_VAR_SETVALUE, &val, NULL );
+
+    /* */
     Trigger( p_input, INPUT_EVENT_CHAPTER );
 }
 
@@ -161,10 +167,10 @@ void input_SendEventSignal( input_thread_t *p_input, double f_quality, double f_
     vlc_value_t val;
 
     val.f_float = f_quality;
-       var_Change( p_input, "signal-quality", VLC_VAR_SETVALUE, &val, NULL );
+    var_Change( p_input, "signal-quality", VLC_VAR_SETVALUE, &val, NULL );
 
     val.f_float = f_strength;
-       var_Change( p_input, "signal-strength", VLC_VAR_SETVALUE, &val, NULL );
+    var_Change( p_input, "signal-strength", VLC_VAR_SETVALUE, &val, NULL );
 
     Trigger( p_input, INPUT_EVENT_SIGNAL );
 }
@@ -184,7 +190,7 @@ void input_SendEventCache( input_thread_t *p_input, double f_level )
     vlc_value_t val;
 
     val.f_float = f_level;
-       var_Change( p_input, "cache", VLC_VAR_SETVALUE, &val, NULL );
+    var_Change( p_input, "cache", VLC_VAR_SETVALUE, &val, NULL );
 
     Trigger( p_input, INPUT_EVENT_CACHE );
 }
@@ -196,19 +202,19 @@ void input_SendEventMeta( input_thread_t *p_input )
 {
     Trigger( p_input, INPUT_EVENT_ITEM_META );
 
-       /* FIXME remove this ugliness ? */
-       vlc_event_t event;
+    /* FIXME remove this ugliness ? */
+    vlc_event_t event;
 
-       event.type = vlc_InputItemMetaChanged;
-       event.u.input_item_meta_changed.meta_type = vlc_meta_ArtworkURL;
-       vlc_event_send( &p_input->p->p_item->event_manager, &event );
+    event.type = vlc_InputItemMetaChanged;
+    event.u.input_item_meta_changed.meta_type = vlc_meta_ArtworkURL;
+    vlc_event_send( &p_input->p->p_item->event_manager, &event );
 }
 
 void input_SendEventMetaInfo( input_thread_t *p_input )
 {
     Trigger( p_input, INPUT_EVENT_ITEM_INFO );
 
-       /* FIXME remove this ugliness */
+    /* FIXME remove this ugliness */
     vlc_event_t event;
 
     event.type = vlc_InputItemInfoChanged;
@@ -219,7 +225,7 @@ void input_SendEventMetaName( input_thread_t *p_input, const char *psz_name )
 {
     Trigger( p_input, INPUT_EVENT_ITEM_NAME );
 
-       /* FIXME remove this ugliness */
+    /* FIXME remove this ugliness */
     vlc_event_t event;
 
     event.type = vlc_InputItemNameChanged;
@@ -227,6 +233,10 @@ void input_SendEventMetaName( input_thread_t *p_input, const char *psz_name )
     vlc_event_send( &p_input->p->p_item->event_manager, &event );
 }
 
+void input_SendEventMetaEpg( input_thread_t *p_input )
+{
+    Trigger( p_input, INPUT_EVENT_ITEM_EPG );
+}
 /*****************************************************************************
  * Event for es_out.c
  *****************************************************************************/