* $Id $
*
* Authors: Filippo Carone <filippo@carone.org>
+ * Pierre d'Herbemont <pdherbemont # videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "libvlc_internal.h"
#include <vlc/libvlc.h>
+#include <vlc_playlist.h>
/*
* Private functions
*/
+/**************************************************************************
+ * handle_event (private)
+ *
+ * Callback from the vlc variables
+ **************************************************************************/
static int handle_event( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
* facility for p_data */
struct libvlc_callback_entry_t *entry = p_data;
libvlc_event_t event;
- event.type = entry->i_event_type;
- switch ( event.type )
+
+ event.type = entry->i_event_type;
+
+ if (event.type == libvlc_VolumeChanged)
{
- case VOLUME_CHANGED:
- event.value_type = BOOLEAN_EVENT;
- break;
- case INPUT_POSITION_CHANGED:
- break;
- default:
- break;
+ if(!strcmp(psz_cmd, "intf-change"))
+ {
+ input_thread_t * p_input = (input_thread_t *)p_this;
+ vlc_value_t val;
+ var_Get( p_input, "time", &val );
+
+ /* Only send event at a reasonable time precision (500ms) */
+ /* (FIXME: this should be configurable) */
+ if ((val.i_time % I64C(500000)) != 0)
+ {
+ /* Don't send this event */
+ return VLC_SUCCESS;
+ }
+
+ event.u.input_position_changed.new_position = val.i_time;
+ }
+ else
+ event.u.input_position_changed.new_position = newval.i_time;
+
+ event.u.input_position_changed.new_position *= 1000LL;
+ }
+ else if (event.type == libvlc_InputPositionChanged)
+ {
+ event.u.volume_changed.new_volume = newval.i_int;
}
- event.old_value = oldval;
- event.new_value = newval;
/* Call the client entry */
entry->f_callback( entry->p_instance, &event, entry->p_user_data );
return VLC_SUCCESS;
}
+/**************************************************************************
+ * get_input (private) :
+ *
+ * Utility function, Object should be released by vlc_object_release
+ * afterwards
+ **************************************************************************/
+static input_thread_t * get_input(libvlc_instance_t * p_instance)
+{
+ libvlc_media_instance_t * p_mi;
+ input_thread_t * p_input;
+
+ p_mi = libvlc_playlist_get_media_instance( p_instance, NULL );
+
+ if( !p_mi )
+ return NULL;
+
+ p_input = libvlc_get_input_thread( p_mi, NULL );
+
+ libvlc_media_instance_release( p_mi );
+
+ return p_input;
+}
+
+/**************************************************************************
+ * install_input_event (private) :
+ *
+ * vlc variables callback, used to install input event.
+ * Can be called manually though.
+ **************************************************************************/
+static int install_input_event( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval,
+ void *p_data )
+{
+ libvlc_instance_t * p_instance = p_data;
+ struct libvlc_callback_entry_list_t *p_listitem;
+ input_thread_t * p_input = get_input( p_instance );
+
+ if( !p_input )
+ return;
+
+ vlc_mutex_lock( &p_instance->instance_lock );
+
+ p_listitem = p_instance->p_callback_list;
+
+ for( ; p_listitem ; p_listitem = p_listitem->next )
+ {
+ if (p_listitem->elmt->i_event_type == libvlc_InputPositionChanged)
+ {
+ /* FIXME: here we shouldn't listen on intf-change, we have to provide
+ * in vlc core a more accurate callback */
+ var_AddCallback( p_input, "intf-change", handle_event, p_listitem->elmt );
+ var_AddCallback( p_input, "time", handle_event, p_listitem->elmt );
+ }
+ }
+
+ vlc_mutex_unlock( &p_instance->instance_lock );
+ vlc_object_release( p_input );
+ return VLC_SUCCESS;
+}
+
+/**************************************************************************
+ * add_callback_to_list (private) :
+ *
+ * callback list utility function.
+ **************************************************************************/
static inline void add_callback_to_list( struct libvlc_callback_entry_t *entry,
struct libvlc_callback_entry_list_t **list )
{
*list = new_listitem;
}
+/**************************************************************************
+ * remove_variable_callback (private) :
+ *
+ * Delete the appropriate vlc variables callback for an event.
+ **************************************************************************/
static int remove_variable_callback( libvlc_instance_t *p_instance,
struct libvlc_callback_entry_t * p_entry )
{
- const char * callback_name = NULL;
-
+ input_thread_t * p_input = get_input( p_instance );
+ int res = VLC_SUCCESS;
+
/* Note: Appropriate lock should be held by the caller */
switch ( p_entry->i_event_type )
{
- case VOLUME_CHANGED:
- callback_name = "volume-change";
+ case libvlc_VolumeChanged:
+ res = var_DelCallback( p_instance->p_libvlc_int, "volume-change",
+ handle_event, p_entry );
break;
- case INPUT_POSITION_CHANGED:
+ case libvlc_InputPositionChanged:
+ /* We may not be deleting the right p_input callback, in this case this
+ * will be a no-op */
+ var_DelCallback( p_input, "intf-change", handle_event, p_entry );
+ var_DelCallback( p_input, "position", handle_event, p_entry );
break;
}
+
+ if (p_input)
+ vlc_object_release( p_input );
+
+ return res;
+}
+
+/*
+ * Internal libvlc functions
+ */
+
+/**************************************************************************
+ * libvlc_event_init (internal) :
+ *
+ * initialization function.
+ **************************************************************************/
+void libvlc_event_init( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
+{
+ playlist_t *p_playlist = p_instance->p_libvlc_int->p_playlist;
- if (!callback_name)
- return VLC_EGENERIC;
+ if( !p_playlist )
+ RAISEVOID ("Can't listen to input event");
- return var_DelCallback( p_instance->p_libvlc_int,
- callback_name, handle_event,
- p_entry );
+ /* Install a Callback for input changes, so
+ * so we can track input event */
+ var_AddCallback( p_playlist, "playlist-current",
+ install_input_event, p_instance );
+}
+
+/**************************************************************************
+ * libvlc_event_fini (internal) :
+ *
+ * finalization function.
+ **************************************************************************/
+void libvlc_event_fini( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
+{
+ playlist_t *p_playlist = p_instance->p_libvlc_int->p_playlist;
+ libvlc_exception_t p_e_unused;
+
+ libvlc_event_remove_all_callbacks( p_instance, &p_e_unused );
+
+ if( !p_playlist )
+ RAISEVOID ("Can't unregister input events");
+
+ var_DelCallback( p_playlist, "playlist-current",
+ install_input_event, p_instance );
}
/*
* Public libvlc functions
*/
+/**************************************************************************
+ * libvlc_event_add_callback (public) :
+ *
+ * Add a callback for an event.
+ **************************************************************************/
void libvlc_event_add_callback( libvlc_instance_t *p_instance,
libvlc_event_type_t i_event_type,
libvlc_callback_t f_callback,
libvlc_exception_t *p_e )
{
struct libvlc_callback_entry_t *entry;
- const char * callback_name = NULL;
- int res;
+ vlc_value_t unused1, unused2;
+ int res = VLC_SUCCESS;
if ( !f_callback )
RAISEVOID (" Callback function is null ");
switch ( i_event_type )
{
- case VOLUME_CHANGED:
- callback_name = "volume-change";
+ case libvlc_VolumeChanged:
+ res = var_AddCallback( p_instance->p_libvlc_int, "volume-change",
+ handle_event, entry );
break;
- case INPUT_POSITION_CHANGED:
+ case libvlc_InputPositionChanged:
+ install_input_event( NULL, NULL, unused1, unused2, p_instance);
break;
default:
free( entry );
RAISEVOID( "Unsupported event." );
}
- res = var_AddCallback( p_instance->p_libvlc_int,
- callback_name,
- handle_event,
- entry );
-
if (res != VLC_SUCCESS)
{
free ( entry );
return;
}
-void libvlc_event_remove_all_callbacks( libvlc_instance_t *p_instance,
- libvlc_exception_t *p_e )
-{
- struct libvlc_callback_entry_list_t *p_listitem;
-
- vlc_mutex_lock( &p_instance->instance_lock );
-
- p_listitem = p_instance->p_callback_list;
-
- while( p_listitem )
- {
- remove_variable_callback( p_instance, p_listitem->elmt ); /* FIXME: We could warn on error */
- p_listitem = p_listitem->next;
-
- }
- p_instance->p_callback_list = NULL;
-
- vlc_mutex_unlock( &p_instance->instance_lock );
-}
-
+/**************************************************************************
+ * libvlc_event_remove_callback (public) :
+ *
+ * Remove a callback for an event.
+ **************************************************************************/
void libvlc_event_remove_callback( libvlc_instance_t *p_instance,
libvlc_event_type_t i_event_type,
libvlc_callback_t f_callback,
}
vlc_mutex_unlock( &p_instance->instance_lock );
}
+
+/**************************************************************************
+ * libvlc_event_remove_all_callbacks (public) :
+ *
+ * Remove all callbacks for all events.
+ **************************************************************************/
+void libvlc_event_remove_all_callbacks( libvlc_instance_t *p_instance,
+ libvlc_exception_t *p_e )
+{
+ struct libvlc_callback_entry_list_t *p_listitem;
+
+ vlc_mutex_lock( &p_instance->instance_lock );
+
+ p_listitem = p_instance->p_callback_list;
+
+ while( p_listitem )
+ {
+ remove_variable_callback( p_instance, p_listitem->elmt ); /* FIXME: We could warn on error */
+ p_listitem = p_listitem->next;
+
+ }
+ p_instance->p_callback_list = NULL;
+
+ vlc_mutex_unlock( &p_instance->instance_lock );
+}
projects / vlc / blobdiff