[vlc-devel] commit: VLM add input events ( Sébastien Escudier )
git version control
git at videolan.org
Mon Jul 6 21:43:37 CEST 2009
vlc | branch: master | Sébastien Escudier <sebastien-devel at celeos.eu> | Mon Jul 6 09:11:49 2009 +0200| [31b1e9090bf4fd386aaca681835b4d4332943c72] | committer: Laurent Aimar
VLM add input events
Signed-off-by: Laurent Aimar <fenrir at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=31b1e9090bf4fd386aaca681835b4d4332943c72
---
include/vlc_vlm.h | 9 ++++++---
src/input/vlm.c | 48 +++++++++++++++++++++++++++++++++++++++---------
src/input/vlm_event.c | 19 +++++++++++++++++++
src/input/vlm_event.h | 2 +-
4 files changed, 65 insertions(+), 13 deletions(-)
diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h
index 0f16f4d..e0c3aa5 100644
--- a/include/vlc_vlm.h
+++ b/include/vlc_vlm.h
@@ -102,13 +102,16 @@ enum vlm_event_type_e
/* */
VLM_EVENT_MEDIA_INSTANCE_STARTED = 0x200,
VLM_EVENT_MEDIA_INSTANCE_STOPPED,
+ VLM_EVENT_MEDIA_INSTANCE_STATE,
};
typedef struct
{
- int i_type; /* a vlm_event_type_e value */
- int64_t id; /* Media ID */
- const char *psz_name; /* Media name */
+ int i_type; /* a vlm_event_type_e value */
+ int64_t id; /* Media ID */
+ const char *psz_name; /* Media name */
+ const char *psz_instance_name; /* Instance name or NULL */
+ input_state_e input_state; /* input instance event type */
} vlm_event_t;
/** VLM control query */
diff --git a/src/input/vlm.c b/src/input/vlm.c
index c7cf269..5e56ea6 100644
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -69,6 +69,30 @@ static void vlm_Destructor( vlm_t *p_vlm );
static void* Manage( void * );
static int vlm_MediaVodControl( void *, vod_media_t *, const char *, int, va_list );
+static int InputEvent( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval,
+ void *p_data )
+{
+ input_thread_t *p_input = (input_thread_t *)p_this;
+ vlm_t *p_vlm = libvlc_priv( p_input->p_libvlc )->p_vlm;
+ vlm_media_sys_t *p_media = p_data;
+ const char *psz_instance_name = NULL;
+
+ if( newval.i_int == INPUT_EVENT_STATE )
+ {
+ for( int i = 0; i < p_media->i_instance; i++ )
+ {
+ if( p_media->instance[i]->p_input == p_input )
+ {
+ psz_instance_name = p_media->instance[i]->psz_name;
+ break;
+ }
+ }
+ vlm_SendEventMediaInstanceState( p_vlm, p_media->cfg.id, p_media->cfg.psz_name, psz_instance_name, var_GetInteger( p_input, "state" ) );
+ }
+ return VLC_SUCCESS;
+}
+
/*****************************************************************************
* vlm_New:
*****************************************************************************/
@@ -168,14 +192,13 @@ void vlm_Delete( vlm_t *p_vlm )
*****************************************************************************/
static void vlm_Destructor( vlm_t *p_vlm )
{
- libvlc_priv (p_vlm->p_libvlc)->p_vlm = NULL;
-
vlm_ControlInternal( p_vlm, VLM_CLEAR_MEDIAS );
TAB_CLEAN( p_vlm->i_media, p_vlm->media );
vlm_ControlInternal( p_vlm, VLM_CLEAR_SCHEDULES );
TAB_CLEAN( p_vlm->schedule, p_vlm->schedule );
+ libvlc_priv(p_vlm->p_libvlc)->p_vlm = NULL;
vlc_object_kill( p_vlm );
/*vlc_cancel( p_vlm->thread ); */
vlc_join( p_vlm->thread, NULL );
@@ -771,7 +794,7 @@ static vlm_media_instance_sys_t *vlm_MediaInstanceNew( vlm_t *p_vlm, const char
return p_instance;
}
-static void vlm_MediaInstanceDelete( vlm_t *p_vlm, int64_t id, vlm_media_instance_sys_t *p_instance, const char *psz_name )
+static void vlm_MediaInstanceDelete( vlm_t *p_vlm, int64_t id, vlm_media_instance_sys_t *p_instance, vlm_media_sys_t *p_media )
{
input_thread_t *p_input = p_instance->p_input;
if( p_input )
@@ -780,13 +803,14 @@ static void vlm_MediaInstanceDelete( vlm_t *p_vlm, int64_t id, vlm_media_instanc
input_Stop( p_input, true );
vlc_thread_join( p_input );
+ var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
p_resource = input_DetachResource( p_input );
input_resource_Delete( p_resource );
vlc_object_release( p_input );
- vlm_SendEventMediaInstanceStopped( p_vlm, id, psz_name );
+ vlm_SendEventMediaInstanceStopped( p_vlm, id, p_media->cfg.psz_name );
}
if( p_instance->p_input_resource )
input_resource_Delete( p_instance->p_input_resource );
@@ -863,6 +887,7 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
input_Stop( p_input, !p_input->b_eof && !p_input->b_error );
vlc_thread_join( p_input );
+ var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
p_instance->p_input_resource = input_DetachResource( p_input );
@@ -883,17 +908,22 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
{
p_instance->p_input = input_Create( p_vlm->p_libvlc, p_instance->p_item,
psz_log, p_instance->p_input_resource );
- if( p_instance->p_input && input_Start( p_instance->p_input ) )
+ if( p_instance->p_input )
{
- vlc_object_release( p_instance->p_input );
- p_instance->p_input = NULL;
+ var_AddCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
+ if( input_Start( p_instance->p_input ) != VLC_SUCCESS )
+ {
+ var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
+ vlc_object_release( p_instance->p_input );
+ p_instance->p_input = NULL;
+ }
}
p_instance->p_input_resource = NULL;
if( !p_instance->p_input )
{
TAB_REMOVE( p_media->i_instance, p_media->instance, p_instance );
- vlm_MediaInstanceDelete( p_vlm, id, p_instance, p_media->cfg.psz_name );
+ vlm_MediaInstanceDelete( p_vlm, id, p_instance, p_media );
}
else
{
@@ -919,7 +949,7 @@ static int vlm_ControlMediaInstanceStop( vlm_t *p_vlm, int64_t id, const char *p
TAB_REMOVE( p_media->i_instance, p_media->instance, p_instance );
- vlm_MediaInstanceDelete( p_vlm, id, p_instance, p_media->cfg.psz_name );
+ vlm_MediaInstanceDelete( p_vlm, id, p_instance, p_media );
return VLC_SUCCESS;
}
diff --git a/src/input/vlm_event.c b/src/input/vlm_event.c
index 6898dcb..4777299 100644
--- a/src/input/vlm_event.c
+++ b/src/input/vlm_event.c
@@ -36,6 +36,7 @@
/* */
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 );
/*****************************************************************************
*
@@ -62,6 +63,11 @@ void vlm_SendEventMediaInstanceStopped( vlm_t *p_vlm, int64_t id, const char *ps
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 );
+}
+
/*****************************************************************************
*
*****************************************************************************/
@@ -72,6 +78,19 @@ static void Trigger( vlm_t *p_vlm, int i_type, int64_t id, const char *psz_name
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 );
+}
diff --git a/src/input/vlm_event.h b/src/input/vlm_event.h
index 41e1311..2aa837f 100644
--- a/src/input/vlm_event.h
+++ b/src/input/vlm_event.h
@@ -39,7 +39,7 @@ void vlm_SendEventMediaChanged( vlm_t *, int64_t id, const char *psz_name );
void vlm_SendEventMediaInstanceStarted( vlm_t *, int64_t id, const char *psz_name );
void vlm_SendEventMediaInstanceStopped( vlm_t *, int64_t id, const char *psz_name );
-
+void vlm_SendEventMediaInstanceState( vlm_t *, int64_t id, const char *psz_name, const char *psz_instance_name, input_state_e state );
#endif
More information about the vlc-devel
mailing list