#include <vlc/libvlc.h>
#include <vlc_playlist.h>
-
/*
* Private functions
*/
*/
/**************************************************************************
- * libvlc_event_init (internal) :
- *
- * initialization function.
- **************************************************************************/
-void libvlc_event_init( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
-{
- (void)p_instance;(void)p_e;
- /* Will certainly be used to install libvlc_instance event */
-}
-
-/**************************************************************************
- * libvlc_event_fini (internal) :
- *
- * finalization function.
- **************************************************************************/
-void libvlc_event_fini( libvlc_instance_t *p_instance )
-{
- (void)p_instance;
-}
-
-/**************************************************************************
- * libvlc_event_manager_init (internal) :
+ * libvlc_event_manager_new (internal) :
*
* Init an object's event manager.
**************************************************************************/
p_em->p_libvlc_instance = p_libvlc_inst;
libvlc_retain( p_libvlc_inst );
vlc_array_init( &p_em->listeners_groups );
- vlc_mutex_init( p_libvlc_inst->p_libvlc_int, &p_em->object_lock );
- vlc_mutex_init_recursive( p_libvlc_inst->p_libvlc_int, &p_em->event_sending_lock );
+ vlc_mutex_init( &p_em->object_lock );
+ vlc_mutex_init_recursive( &p_em->event_sending_lock );
return p_em;
}
p_lg = vlc_array_item_at_index( &p_em->listeners_groups, i );
for( j = 0; j < vlc_array_count(&p_lg->listeners); j++)
- free( vlc_array_item_at_index( &p_em->listeners_groups, i ) );
+ free( vlc_array_item_at_index( &p_lg->listeners, j ) );
vlc_array_clear( &p_lg->listeners );
free( p_lg );
array_listeners_cached = malloc(sizeof(libvlc_event_listener_t)*(i_cached_listeners));
if( !array_listeners_cached )
{
- printf( "Can't alloc memory in libvlc_event_send" );
- break;
+ fprintf(stderr, "Can't alloc memory in libvlc_event_send" );
+ return;
}
listener_cached = array_listeners_cached;
continue;
}
}
-
+
listener_cached->pf_callback( p_event, listener_cached->p_user_data );
listener_cached++;
}
*
* Get the char * name of an event type.
**************************************************************************/
-static const char * event_type_to_name[] =
+static const char event_type_to_name[][35] =
{
#define EVENT(a) [a]=#a
EVENT(libvlc_MediaMetaChanged),
EVENT(libvlc_MediaFreed),
EVENT(libvlc_MediaStateChanged),
- EVENT(libvlc_MediaPlayerPlayed),
+ EVENT(libvlc_MediaPlayerNothingSpecial),
+ EVENT(libvlc_MediaPlayerOpening),
+ EVENT(libvlc_MediaPlayerBuffering),
+ EVENT(libvlc_MediaPlayerPlaying),
EVENT(libvlc_MediaPlayerPaused),
- EVENT(libvlc_MediaPlayerEndReached),
EVENT(libvlc_MediaPlayerStopped),
+ EVENT(libvlc_MediaPlayerForward),
+ EVENT(libvlc_MediaPlayerBackward),
+ EVENT(libvlc_MediaPlayerEndReached),
EVENT(libvlc_MediaPlayerTimeChanged),
+ EVENT(libvlc_MediaPlayerTitleChanged),
EVENT(libvlc_MediaPlayerPositionChanged),
+ EVENT(libvlc_MediaPlayerSeekableChanged),
+ EVENT(libvlc_MediaPlayerPausableChanged),
EVENT(libvlc_MediaListItemAdded),
EVENT(libvlc_MediaListWillAddItem),
EVENT(libvlc_MediaDiscovererEnded)
#undef EVENT
};
-static const char * unkwown_event_name = "Unknown Event";
+
+static const char unkwown_event_name[] = "Unknown Event";
const char * libvlc_event_type_name( libvlc_event_type_t event_type )
{
libvlc_exception_raise( p_e, "No Memory left" );
return;
}
-
+
listener->event_type = event_type;
listener->p_user_data = p_user_data;
listener->pf_callback = pf_callback;
listener->p_user_data == p_user_data )
{
/* that's our listener */
-
+
/* Mark this group as edited so that libvlc_event_send
* will recheck what listener to call */
listeners_group->b_sublistener_removed = false;