Moved "sub-margin" to vout.

[vlc] / src / input / vlm_event.c

diff --git a/src/input/vlm_event.c b/src/input/vlm_event.c
index 31f1ddd3d40cacac505659775be76c106d71b950..47772995359a924f088390f3b1f9de9e05ea66d7 100644 (file)
--- a/src/input/vlm_event.c
+++ b/src/input/vlm_event.c
@@ -35,42 +35,62 @@
 #include <assert.h>
 
 /* */
-static void Trigger( vlm_t *, int i_type, int64_t id );
+static void Trigger( vlm_t *, int i_type, int64_t id, const char *psz_name );
+static void TriggerInstanceState( vlm_t *, int i_type, int64_t id, const char *psz_name, const char *psz_instance_name, input_state_e input_state );
 
 /*****************************************************************************
  *
  *****************************************************************************/
-void vlm_SendEventMediaAdded( vlm_t *p_vlm, int64_t id )
+void vlm_SendEventMediaAdded( vlm_t *p_vlm, int64_t id, const char *psz_name )
 {
-    Trigger( p_vlm, VLM_EVENT_MEDIA_ADDED, id );
+    Trigger( p_vlm, VLM_EVENT_MEDIA_ADDED, id, psz_name );
 }
-void vlm_SendEventMediaRemoved( vlm_t *p_vlm, int64_t id )
+void vlm_SendEventMediaRemoved( vlm_t *p_vlm, int64_t id, const char *psz_name )
 {
-    Trigger( p_vlm, VLM_EVENT_MEDIA_REMOVED, id );
+    Trigger( p_vlm, VLM_EVENT_MEDIA_REMOVED, id, psz_name );
 }
-void vlm_SendEventMediaChanged( vlm_t *p_vlm, int64_t id )
+void vlm_SendEventMediaChanged( vlm_t *p_vlm, int64_t id, const char *psz_name )
 {
-    Trigger( p_vlm, VLM_EVENT_MEDIA_CHANGED, id );
+    Trigger( p_vlm, VLM_EVENT_MEDIA_CHANGED, id, psz_name );
 }
 
-void vlm_SendEventMediaInstanceStarted( vlm_t *p_vlm, int64_t id )
+void vlm_SendEventMediaInstanceStarted( vlm_t *p_vlm, int64_t id, const char *psz_name )
 {
-    Trigger( p_vlm, VLM_EVENT_MEDIA_INSTANCE_STARTED, id );
+    Trigger( p_vlm, VLM_EVENT_MEDIA_INSTANCE_STARTED, id, psz_name );
 }
-void vlm_SendEventMediaInstanceStopped( vlm_t *p_vlm, int64_t id )
+void vlm_SendEventMediaInstanceStopped( vlm_t *p_vlm, int64_t id, const char *psz_name )
 {
-    Trigger( p_vlm, VLM_EVENT_MEDIA_INSTANCE_STOPPED, id );
+    Trigger( p_vlm, VLM_EVENT_MEDIA_INSTANCE_STOPPED, id, psz_name );
+}
+
+void vlm_SendEventMediaInstanceState( vlm_t *p_vlm, int64_t id, const char *psz_name, const char *psz_instance_name, input_state_e state )
+{
+    TriggerInstanceState( p_vlm, VLM_EVENT_MEDIA_INSTANCE_STATE, id, psz_name, psz_instance_name, state );
 }
 
 /*****************************************************************************
  *
  *****************************************************************************/
-static void Trigger( vlm_t *p_vlm, int i_type, int64_t id )
+static void Trigger( vlm_t *p_vlm, int i_type, int64_t id, const char *psz_name )
 {
     vlm_event_t event;
 
     event.i_type = i_type;
     event.id = id;
+    event.psz_name = psz_name;
+    event.input_state = 0;
+    event.psz_instance_name = NULL;
     var_SetAddress( p_vlm, "intf-event", &event );
 }
 
+static void TriggerInstanceState( vlm_t *p_vlm, int i_type, int64_t id, const char *psz_name, const char *psz_instance_name, input_state_e input_state )
+{
+    vlm_event_t event;
+
+    event.i_type = i_type;
+    event.id = id;
+    event.psz_name = psz_name;
+    event.input_state = input_state;
+    event.psz_instance_name = psz_instance_name;
+    var_SetAddress( p_vlm, "intf-event", &event );
+}