parsing is simpler.
libvlc_MediaMetaChanged=0,
libvlc_MediaSubItemAdded,
libvlc_MediaDurationChanged,
- libvlc_MediaPreparsedChanged,
+ libvlc_MediaParsedChanged,
libvlc_MediaFreed,
libvlc_MediaStateChanged,
struct
{
int new_status;
- } media_preparsed_changed;
+ } media_parsed_changed;
struct
{
libvlc_media_t * md;
* This fetches (local) meta data and tracks information.
* The method is the asynchronous of libvlc_media_parse_async().
*
- * To track when this is over you can listen to libvlc_MediaPreparsedChanged
- * event. However if the media was already preparsed you will not receive this
+ * To track when this is over you can listen to libvlc_MediaParsedChanged
+ * event. However if the media was already parsed you will not receive this
* event.
*
* \see libvlc_media_parse
- * \see libvlc_MediaPreparsedChanged
+ * \see libvlc_MediaParsedChanged
* \see libvlc_media_get_meta
* \see libvlc_media_get_tracks_info
*
libvlc_media_parse_async(libvlc_media_t *media);
/**
- * Get preparsed status for media descriptor object.
+ * Get Parsed status for media descriptor object.
+ *
+ * \see libvlc_MediaParsedChanged
*
* \param p_md media descriptor object
- * \return true if media object has been preparsed otherwise it returns false
+ * \return true if media object has been parsed otherwise it returns false
*/
VLC_PUBLIC_API int
- libvlc_media_is_preparsed( libvlc_media_t * p_md );
+ libvlc_media_is_parsed( libvlc_media_t * p_md );
/**
* Sets media descriptor's user_data. user_data is specialized data
else
{
/* The listener wants to block the emitter during event callback */
-
+
listener_cached->pf_callback( p_event, listener_cached->p_user_data );
listener_cached++;
-
+
if( listeners_group->b_sublistener_removed )
{
/* If a callback was removed, this gets called */
listener_cached++;
continue;
}
- }
+ }
}
}
vlc_mutex_unlock( &p_em->event_sending_lock );
DEF(MediaMetaChanged)
DEF(MediaSubItemAdded)
DEF(MediaDurationChanged)
- DEF(MediaPreparsedChanged)
+ DEF(MediaParsedChanged)
DEF(MediaFreed)
DEF(MediaStateChanged)
libvlc_event_listeners_group_t * listeners_group;
libvlc_event_listener_t * listener;
int i;
-
+
listener = malloc(sizeof(libvlc_event_listener_t));
if( unlikely(listener == NULL) )
return ENOMEM;
-
+
listener->event_type = event_type;
listener->p_user_data = p_user_data;
listener->pf_callback = pf_callback;
listener->is_asynchronous = is_asynchronous;
-
+
vlc_mutex_lock( &p_event_manager->object_lock );
for( i = 0; i < vlc_array_count(&p_event_manager->listeners_groups); i++ )
{
}
}
vlc_mutex_unlock( &p_event_manager->object_lock );
-
+
free(listener);
fprintf( stderr, "This object event manager doesn't know about '%s' events",
libvlc_event_type_name(event_type) );
libvlc_event_listener_t * listener;
int i, j;
bool found = false;
-
+
vlc_mutex_lock( &p_event_manager->event_sending_lock );
vlc_mutex_lock( &p_event_manager->object_lock );
for( i = 0; i < vlc_array_count(&p_event_manager->listeners_groups); i++)
/* Construct the event */
- event.type = libvlc_MediaPreparsedChanged;
- event.u.media_preparsed_changed.new_status =
+ event.type = libvlc_MediaParsedChanged;
+ event.u.media_parsed_changed.new_status =
p_event->u.input_item_preparsed_changed.new_status;
/* Send the event */
free(p_md);
return NULL;
}
- libvlc_event_manager_register_event_type( p_md->p_event_manager,
- libvlc_MediaMetaChanged );
- libvlc_event_manager_register_event_type( p_md->p_event_manager,
- libvlc_MediaSubItemAdded );
- libvlc_event_manager_register_event_type( p_md->p_event_manager,
- libvlc_MediaFreed );
- libvlc_event_manager_register_event_type( p_md->p_event_manager,
- libvlc_MediaDurationChanged );
- libvlc_event_manager_register_event_type( p_md->p_event_manager,
- libvlc_MediaStateChanged );
- libvlc_event_manager_register_event_type( p_md->p_event_manager,
- libvlc_MediaPreparsedChanged );
+
+ libvlc_event_manager_t *em = p_md->p_event_manager;
+ libvlc_event_manager_register_event_type(em, libvlc_MediaMetaChanged);
+ libvlc_event_manager_register_event_type(em, libvlc_MediaSubItemAdded);
+ libvlc_event_manager_register_event_type(em, libvlc_MediaFreed);
+ libvlc_event_manager_register_event_type(em, libvlc_MediaDurationChanged);
+ libvlc_event_manager_register_event_type(em, libvlc_MediaStateChanged);
+ libvlc_event_manager_register_event_type(em, libvlc_MediaParsedChanged);
vlc_gc_incref( p_md->p_input_item );
}
/**************************************************************************
- * Get preparsed status for media object.
+ * Get parsed status for media object.
**************************************************************************/
int
-libvlc_media_is_preparsed( libvlc_media_t * p_md )
+libvlc_media_is_parsed( libvlc_media_t * p_md )
{
assert( p_md );
// Check to see if we are properly receiving the event.
libvlc_event_manager_t *em = libvlc_media_event_manager (media);
- libvlc_event_attach (em, libvlc_MediaPreparsedChanged, preparsed_changed, (void*)&received);
+ libvlc_event_attach (em, libvlc_MediaParsedChanged, preparsed_changed, (void*)&received);
// Parse the media. This is synchronous.
libvlc_media_parse(media);
// We are good, now check Elementary Stream info.
libvlc_media_track_info_t *tracks;
- int num = libvlc_media_get_es(media, &tracks);
+ int num = libvlc_media_get_tracks_info(media, &tracks);
assert(num > 0);
free(tracks);