X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_player.c;h=1e053e23b4eabf4520c6c2330b82ca8319cb2337;hb=7b6ed91d95282a7479c3ba60a084f67c6c058373;hp=58e8350cf34a46d6e2c64f0f19a9ced082b926ef;hpb=9ba6c6d95101c96350755b8b28e1d653abd16bc6;p=vlc diff --git a/src/control/media_player.c b/src/control/media_player.c index 58e8350cf3..1e053e23b4 100644 --- a/src/control/media_player.c +++ b/src/control/media_player.c @@ -1,7 +1,7 @@ /***************************************************************************** * media_player.c: Libvlc API Media Instance management functions ***************************************************************************** - * Copyright (C) 2005 the VideoLAN team + * Copyright (C) 2005-2009 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -28,6 +28,7 @@ #include #include #include "libvlc.h" +#include static int input_seekable_changed( vlc_object_t * p_this, char const * psz_cmd, @@ -64,11 +65,11 @@ static inline libvlc_state_t vlc_to_libvlc_state( int vlc_state ) } /* - * Release the associated input thread + * Release the associated input thread. * * Object lock is NOT held. */ -static void release_input_thread( libvlc_media_player_t *p_mi ) +static void release_input_thread( libvlc_media_player_t *p_mi, bool b_input_abort ) { input_thread_t * p_input_thread; @@ -77,19 +78,20 @@ static void release_input_thread( libvlc_media_player_t *p_mi ) p_input_thread = p_mi->p_input_thread; - /* No one is tracking this input_thread appart us. Destroy it */ - if( p_mi->b_own_its_input_thread ) - { - var_DelCallback( p_input_thread, "can-seek", input_seekable_changed, p_mi ); - var_DelCallback( p_input_thread, "can-pause", input_pausable_changed, p_mi ); - var_DelCallback( p_input_thread, "intf-event", input_event_changed, p_mi ); + var_DelCallback( p_input_thread, "can-seek", + input_seekable_changed, p_mi ); + var_DelCallback( p_input_thread, "can-pause", + input_pausable_changed, p_mi ); + var_DelCallback( p_input_thread, "intf-event", + input_event_changed, p_mi ); - /* We owned this one */ - input_StopThread( p_input_thread ); - vlc_thread_join( p_input_thread ); + /* We owned this one */ + input_Stop( p_input_thread, b_input_abort ); + vlc_thread_join( p_input_thread ); - var_Destroy( p_input_thread, "drawable" ); - } + var_Destroy( p_input_thread, "drawable-hwnd" ); + var_Destroy( p_input_thread, "drawable-xid" ); + var_Destroy( p_input_thread, "drawable-agl" ); vlc_object_release( p_input_thread ); @@ -100,7 +102,7 @@ static void release_input_thread( libvlc_media_player_t *p_mi ) * Retrieve the input thread. Be sure to release the object * once you are done with it. (libvlc Internal) * - * Object lock is held. + * Function will lock the object. */ input_thread_t *libvlc_get_input_thread( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) @@ -210,22 +212,31 @@ input_event_changed( vlc_object_t * p_this, char const * psz_cmd, return VLC_SUCCESS; } - libvlc_media_set_state( p_mi->p_md, libvlc_state, NULL); + libvlc_media_set_state( p_mi->p_md, libvlc_state, NULL ); libvlc_event_send( p_mi->p_event_manager, &event ); } - else if( newval.i_int == INPUT_EVENT_TIMES ) + else if( newval.i_int == INPUT_EVENT_POSITION ) { if( var_GetInteger( p_input, "state" ) != PLAYING_S ) return VLC_SUCCESS; /* Don't send the position while stopped */ /* */ event.type = libvlc_MediaPlayerPositionChanged; - event.u.media_player_position_changed.new_position = var_GetFloat( p_input, "position" );; + event.u.media_player_position_changed.new_position = + var_GetFloat( p_input, "position" ); libvlc_event_send( p_mi->p_event_manager, &event ); /* */ event.type = libvlc_MediaPlayerTimeChanged; - event.u.media_player_time_changed.new_time = var_GetTime( p_input, "time" ); + event.u.media_player_time_changed.new_time = + var_GetTime( p_input, "time" ); + libvlc_event_send( p_mi->p_event_manager, &event ); + } + else if( newval.i_int == INPUT_EVENT_LENGTH ) + { + event.type = libvlc_MediaPlayerLengthChanged; + event.u.media_player_length_changed.new_length = + var_GetTime( p_input, "length" ); libvlc_event_send( p_mi->p_event_manager, &event ); } @@ -233,9 +244,21 @@ input_event_changed( vlc_object_t * p_this, char const * psz_cmd, } +static void libvlc_media_player_destroy( libvlc_media_player_t * ); /************************************************************************** - * Create a Media Instance object + * Create a Media Instance object. + * + * Refcount strategy: + * - All items created by _new start with a refcount set to 1. + * - Accessor _release decrease the refcount by 1, if after that + * operation the refcount is 0, the object is destroyed. + * - Accessor _retain increase the refcount by 1 (XXX: to implement) + * + * Object locking strategy: + * - No lock held while in constructor. + * - When accessing any member variable this lock is held. (XXX who locks?) + * - When attempting to destroy the object the lock is also held. **************************************************************************/ libvlc_media_player_t * libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance, @@ -256,25 +279,18 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance, return NULL; } p_mi->p_md = NULL; - p_mi->drawable = 0; + p_mi->drawable.agl = 0; + p_mi->drawable.xid = 0; + p_mi->drawable.hwnd = NULL; p_mi->p_libvlc_instance = p_libvlc_instance; p_mi->p_input_thread = NULL; - /* refcount strategy: - * - All items created by _new start with a refcount set to 1 - * - Accessor _release decrease the refcount by 1, if after that - * operation the refcount is 0, the object is destroyed. - * - Accessor _retain increase the refcount by 1 (XXX: to implement) */ p_mi->i_refcount = 1; - p_mi->b_own_its_input_thread = true; - /* object_lock strategy: - * - No lock held in constructor - * - Lock when accessing all variable this lock is held - * - Lock when attempting to destroy the object the lock is also held */ vlc_mutex_init( &p_mi->object_lock ); p_mi->p_event_manager = libvlc_event_manager_new( p_mi, p_libvlc_instance, p_e ); if( libvlc_exception_raised( p_e ) ) { + vlc_mutex_destroy( &p_mi->object_lock ); free( p_mi ); return NULL; } @@ -304,7 +320,9 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance, libvlc_MediaPlayerPositionChanged, p_e ); libvlc_event_manager_register_event_type( p_mi->p_event_manager, libvlc_MediaPlayerTimeChanged, p_e ); - libvlc_event_manager_register_event_type( p_mi->p_event_manager, + libvlc_event_manager_register_event_type( p_mi->p_event_manager, + libvlc_MediaPlayerLengthChanged, p_e ); + libvlc_event_manager_register_event_type( p_mi->p_event_manager, libvlc_MediaPlayerTitleChanged, p_e ); libvlc_event_manager_register_event_type( p_mi->p_event_manager, libvlc_MediaPlayerSeekableChanged, p_e ); @@ -314,18 +332,21 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance, /* Snapshot initialization */ libvlc_event_manager_register_event_type( p_mi->p_event_manager, libvlc_MediaPlayerSnapshotTaken, p_e ); + /* Attach a var callback to the global object to provide the glue between vout_thread that generates the event and media_player that re-emits it with its own event manager */ - var_Create( p_libvlc_instance->p_libvlc_int, "vout-snapshottaken", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_libvlc_instance->p_libvlc_int, "vout-snapshottaken", SnapshotTakenCallback, p_mi ); + var_Create( p_libvlc_instance->p_libvlc_int, "vout-snapshottaken", + VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); + var_AddCallback( p_libvlc_instance->p_libvlc_int, "vout-snapshottaken", + SnapshotTakenCallback, p_mi ); return p_mi; } /************************************************************************** - * Create a Media Instance object with a media descriptor + * Create a Media Instance object with a media descriptor. **************************************************************************/ libvlc_media_player_t * libvlc_media_player_new_from_media( @@ -333,8 +354,8 @@ libvlc_media_player_new_from_media( libvlc_exception_t *p_e ) { libvlc_media_player_t * p_mi; - p_mi = libvlc_media_player_new( p_md->p_libvlc_instance, p_e ); + p_mi = libvlc_media_player_new( p_md->p_libvlc_instance, p_e ); if( !p_mi ) return NULL; @@ -344,124 +365,73 @@ libvlc_media_player_new_from_media( return p_mi; } -/************************************************************************** - * Create a new media instance object from an input_thread (Libvlc Internal) - **************************************************************************/ -libvlc_media_player_t * libvlc_media_player_new_from_input_thread( - struct libvlc_instance_t *p_libvlc_instance, - input_thread_t *p_input, - libvlc_exception_t *p_e ) -{ - libvlc_media_player_t * p_mi; - - if( !p_input ) - { - libvlc_exception_raise( p_e, "invalid input thread" ); - return NULL; - } - - p_mi = libvlc_media_player_new( p_libvlc_instance, p_e ); - - if( !p_mi ) - return NULL; - - p_mi->p_md = libvlc_media_new_from_input_item( - p_libvlc_instance, - input_GetItem( p_input ), p_e ); - - if( !p_mi->p_md ) - { - libvlc_media_player_destroy( p_mi ); - return NULL; - } - - /* will be released in media_player_release() */ - vlc_object_hold( p_input ); - - p_mi->p_input_thread = p_input; - p_mi->b_own_its_input_thread = false; - - return p_mi; -} - /************************************************************************** * Destroy a Media Instance object (libvlc internal) * - * Warning: No lock held here, but hey, this is internal. + * Warning: No lock held here, but hey, this is internal. Caller must lock. **************************************************************************/ -void libvlc_media_player_destroy( libvlc_media_player_t *p_mi ) +static void libvlc_media_player_destroy( libvlc_media_player_t *p_mi ) { input_thread_t *p_input_thread; libvlc_exception_t p_e; - libvlc_exception_init( &p_e ); + assert( p_mi ); - if( !p_mi ) - return; - - /* Detach Callback from the main libvlc object */ - var_DelCallback( p_mi->p_libvlc_instance->p_libvlc_int, "vout-snapshottaken", SnapshotTakenCallback, p_mi ); + /* Detach Callback from the main libvlc object */ + var_DelCallback( p_mi->p_libvlc_instance->p_libvlc_int, + "vout-snapshottaken", SnapshotTakenCallback, p_mi ); + libvlc_exception_init( &p_e ); p_input_thread = libvlc_get_input_thread( p_mi, &p_e ); if( libvlc_exception_raised( &p_e ) ) - { - libvlc_event_manager_release( p_mi->p_event_manager ); + /* no need to worry about no input thread */ libvlc_exception_clear( &p_e ); - free( p_mi ); - return; /* no need to worry about no input thread */ - } - vlc_mutex_destroy( &p_mi->object_lock ); - - vlc_object_release( p_input_thread ); + else + release_input_thread( p_mi, true ); + libvlc_event_manager_release( p_mi->p_event_manager ); libvlc_media_release( p_mi->p_md ); - + vlc_mutex_destroy( &p_mi->object_lock ); free( p_mi ); } /************************************************************************** - * Release a Media Instance object + * Release a Media Instance object. + * + * Function does the locking. **************************************************************************/ void libvlc_media_player_release( libvlc_media_player_t *p_mi ) { - if( !p_mi ) - return; + bool destroy; + assert( p_mi ); vlc_mutex_lock( &p_mi->object_lock ); - - p_mi->i_refcount--; - - if( p_mi->i_refcount > 0 ) - { - vlc_mutex_unlock( &p_mi->object_lock ); - return; - } + destroy = !--p_mi->i_refcount; vlc_mutex_unlock( &p_mi->object_lock ); - vlc_mutex_destroy( &p_mi->object_lock ); - - release_input_thread( p_mi ); - libvlc_event_manager_release( p_mi->p_event_manager ); - - libvlc_media_release( p_mi->p_md ); - - free( p_mi ); + if( destroy ) + libvlc_media_player_destroy( p_mi ); } /************************************************************************** - * Retain a Media Instance object + * Retain a Media Instance object. + * + * Caller must hold the lock. **************************************************************************/ void libvlc_media_player_retain( libvlc_media_player_t *p_mi ) { - if( !p_mi ) - return; + assert( p_mi ); + vlc_mutex_lock( &p_mi->object_lock ); p_mi->i_refcount++; + vlc_mutex_unlock( &p_mi->object_lock ); } /************************************************************************** - * Set the Media descriptor associated with the instance + * Set the Media descriptor associated with the instance. + * + * Enter without lock -- function will lock the object. **************************************************************************/ void libvlc_media_player_set_media( libvlc_media_player_t *p_mi, @@ -475,7 +445,12 @@ void libvlc_media_player_set_media( vlc_mutex_lock( &p_mi->object_lock ); - release_input_thread( p_mi ); + /* FIXME I am not sure if it is a user request or on die(eof/error) + * request here */ + release_input_thread( p_mi, + p_mi->p_input_thread && + !p_mi->p_input_thread->b_eof && + !p_mi->p_input_thread->b_error ); if( p_mi->p_md ) libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, p_e ); @@ -500,7 +475,7 @@ void libvlc_media_player_set_media( } /************************************************************************** - * Get the Media descriptor associated with the instance + * Get the Media descriptor associated with the instance. **************************************************************************/ libvlc_media_t * libvlc_media_player_get_media( @@ -517,7 +492,7 @@ libvlc_media_player_get_media( } /************************************************************************** - * Get the event Manager + * Get the event Manager. **************************************************************************/ libvlc_event_manager_t * libvlc_media_player_event_manager( @@ -530,7 +505,7 @@ libvlc_media_player_event_manager( } /************************************************************************** - * Trigger a snapshot Taken Event + * Trigger a snapshot Taken Event. *************************************************************************/ static int SnapshotTakenCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) @@ -544,15 +519,16 @@ static int SnapshotTakenCallback( vlc_object_t *p_this, char const *psz_cmd, event.u.media_player_snapshot_taken.psz_filename = newval.psz_string ; /* Snapshot psz data is a vlc_variable owned by libvlc object . Its memmory management is taken care by the obj*/ - msg_Dbg( p_this, "about to emit libvlc_snapshot_taken.make psz_str=0x%x (%s)", - event.u.media_player_snapshot_taken.psz_filename ,event.u.media_player_snapshot_taken.psz_filename ); + msg_Dbg( p_this, "about to emit libvlc_snapshot_taken.make psz_str=0x%p" + " (%s)", event.u.media_player_snapshot_taken.psz_filename, + event.u.media_player_snapshot_taken.psz_filename ); libvlc_event_send( p_mi->p_event_manager, &event ); return VLC_SUCCESS; } /************************************************************************** - * Play + * Tell media player to start playing. **************************************************************************/ void libvlc_media_player_play( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) @@ -579,9 +555,8 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi, return; } - p_mi->p_input_thread = input_CreateThread( p_mi->p_libvlc_instance->p_libvlc_int, - p_mi->p_md->p_input_item ); - + p_mi->p_input_thread = input_Create( p_mi->p_libvlc_instance->p_libvlc_int, + p_mi->p_md->p_input_item, NULL, NULL ); if( !p_mi->p_input_thread ) { @@ -591,35 +566,53 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi, p_input_thread = p_mi->p_input_thread; - if( p_mi->drawable ) + var_Create( p_input_thread, "drawable-agl", VLC_VAR_INTEGER ); + if( p_mi->drawable.agl ) + var_SetInteger( p_input_thread, "drawable-agl", p_mi->drawable.agl ); + + var_Create( p_input_thread, "drawable-xid", VLC_VAR_INTEGER ); + if( p_mi->drawable.xid ) + var_SetInteger( p_input_thread, "drawable-xid", p_mi->drawable.xid ); + + var_Create( p_input_thread, "drawable-hwnd", VLC_VAR_ADDRESS ); + if( p_mi->drawable.hwnd != NULL ) { - vlc_value_t val; - val.i_int = p_mi->drawable; - var_Create( p_input_thread, "drawable", VLC_VAR_DOINHERIT ); - var_Set( p_input_thread, "drawable", val ); + vlc_value_t val = { .p_address = p_mi->drawable.hwnd }; + var_Set( p_input_thread, "drawable-hwnd", val ); } + var_Create( p_input_thread, "drawable-nsobject", VLC_VAR_ADDRESS ); + if( p_mi->drawable.nsobject != NULL ) + { + vlc_value_t val = { .p_address = p_mi->drawable.nsobject }; + var_Set( p_input_thread, "drawable-nsobject", val ); + } + var_AddCallback( p_input_thread, "can-seek", input_seekable_changed, p_mi ); var_AddCallback( p_input_thread, "can-pause", input_pausable_changed, p_mi ); var_AddCallback( p_input_thread, "intf-event", input_event_changed, p_mi ); + if( input_Start( p_input_thread ) ) + { + vlc_object_release( p_input_thread ); + p_mi->p_input_thread = NULL; + } + vlc_mutex_unlock( &p_mi->object_lock ); } /************************************************************************** - * Pause + * Pause. **************************************************************************/ void libvlc_media_player_pause( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) { input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, p_e ); - if( !p_input_thread ) return; libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e ); - - if( state == libvlc_Playing ) + if( state == libvlc_Playing || state == libvlc_Buffering ) { if( libvlc_media_player_can_pause( p_mi, p_e ) ) input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S ); @@ -633,16 +626,31 @@ void libvlc_media_player_pause( libvlc_media_player_t *p_mi, } /************************************************************************** - * Stop + * Tells whether the media player is currently playing. + * + * Enter with lock held. + **************************************************************************/ +int libvlc_media_player_is_playing( libvlc_media_player_t *p_mi, + libvlc_exception_t *p_e ) +{ + libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e ); + return (libvlc_Playing == state) || (libvlc_Buffering == state); +} + +/************************************************************************** + * Stop playing. **************************************************************************/ void libvlc_media_player_stop( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) { libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e ); - if( state == libvlc_Playing || state == libvlc_Paused ) + if( state == libvlc_Playing || + state == libvlc_Paused || + state == libvlc_Buffering ) { - /* Send a stop notification event only of we are in playing or paused states */ + /* Send a stop notification event only if we are in playing, + * buffering or paused states */ libvlc_media_set_state( p_mi->p_md, libvlc_Ended, p_e ); /* Construct and send the event */ @@ -651,22 +659,85 @@ void libvlc_media_player_stop( libvlc_media_player_t *p_mi, libvlc_event_send( p_mi->p_event_manager, &event ); } - if( p_mi->b_own_its_input_thread ) - { - vlc_mutex_lock( &p_mi->object_lock ); - release_input_thread( p_mi ); /* This will stop the input thread */ - vlc_mutex_unlock( &p_mi->object_lock ); - } - else - { - input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, p_e ); + vlc_mutex_lock( &p_mi->object_lock ); + release_input_thread( p_mi, true ); /* This will stop the input thread */ + vlc_mutex_unlock( &p_mi->object_lock ); +} - if( !p_input_thread ) - return; +/************************************************************************** + * set_nsobject + **************************************************************************/ +void libvlc_media_player_set_nsobject( libvlc_media_player_t *p_mi, + void * drawable, + libvlc_exception_t *p_e ) +{ + (void) p_e; + p_mi->drawable.nsobject = drawable; +} - input_StopThread( p_input_thread ); - vlc_object_release( p_input_thread ); - } +/************************************************************************** + * get_nsobject + **************************************************************************/ +uint32_t libvlc_media_player_get_nsobject( libvlc_media_player_t *p_mi ) +{ + return p_mi->drawable.nsobject; +} + +/************************************************************************** + * set_agl + **************************************************************************/ +void libvlc_media_player_set_agl( libvlc_media_player_t *p_mi, + uint32_t drawable, + libvlc_exception_t *p_e ) +{ + (void) p_e; + p_mi->drawable.agl = drawable; +} + +/************************************************************************** + * get_agl + **************************************************************************/ +uint32_t libvlc_media_player_get_agl( libvlc_media_player_t *p_mi ) +{ + return p_mi->drawable.agl; +} + +/************************************************************************** + * set_xwindow + **************************************************************************/ +void libvlc_media_player_set_xwindow( libvlc_media_player_t *p_mi, + uint32_t drawable, + libvlc_exception_t *p_e ) +{ + (void) p_e; + p_mi->drawable.xid = drawable; +} + +/************************************************************************** + * get_xwindow + **************************************************************************/ +uint32_t libvlc_media_player_get_xwindow( libvlc_media_player_t *p_mi ) +{ + return p_mi->drawable.xid; +} + +/************************************************************************** + * set_hwnd + **************************************************************************/ +void libvlc_media_player_set_hwnd( libvlc_media_player_t *p_mi, + void *drawable, + libvlc_exception_t *p_e ) +{ + (void) p_e; + p_mi->drawable.hwnd = drawable; +} + +/************************************************************************** + * get_hwnd + **************************************************************************/ +void *libvlc_media_player_get_hwnd( libvlc_media_player_t *p_mi ) +{ + return p_mi->drawable.hwnd; } /************************************************************************** @@ -676,39 +747,39 @@ void libvlc_media_player_set_drawable( libvlc_media_player_t *p_mi, libvlc_drawable_t drawable, libvlc_exception_t *p_e ) { - input_thread_t *p_input_thread; - vout_thread_t *p_vout = NULL; - - p_mi->drawable = drawable; - - /* Allow on the fly drawable changing. This is tricky has this may - * not be supported by every vout. We though can't disable it - * because of some creepy drawable type that are not flexible enough - * (Win32 HWND for instance) */ - p_input_thread = libvlc_get_input_thread( p_mi, p_e ); - if( !p_input_thread ) { - /* No input, nothing more to do, we are fine */ - libvlc_exception_clear( p_e ); - return; - } - - p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD ); - if( p_vout ) - { - vout_Control( p_vout , VOUT_REPARENT, drawable); - vlc_object_release( p_vout ); - } - vlc_object_release( p_input_thread ); +#ifdef WIN32 + if (sizeof (HWND) <= sizeof (libvlc_drawable_t)) + p_mi->drawable.hwnd = (HWND)drawable; + else + libvlc_exception_raise(p_e, "Operation not supported"); +#elif defined(__APPLE__) + p_mi->drawable.agl = drawable; + (void) p_e; +#else + p_mi->drawable.xid = drawable; + (void) p_e; +#endif } /************************************************************************** * Get Drawable **************************************************************************/ libvlc_drawable_t -libvlc_media_player_get_drawable ( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) +libvlc_media_player_get_drawable ( libvlc_media_player_t *p_mi, + libvlc_exception_t *p_e ) { VLC_UNUSED(p_e); - return p_mi->drawable; + +#ifdef WIN32 + if (sizeof (HWND) <= sizeof (libvlc_drawable_t)) + return (libvlc_drawable_t)p_mi->drawable.hwnd; + else + return 0; +#elif defined(__APPLE__) + return p_mi->drawable.agl; +#else + return p_mi->drawable.xid; +#endif } /************************************************************************** @@ -753,14 +824,12 @@ void libvlc_media_player_set_time( libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; - vlc_value_t value; p_input_thread = libvlc_get_input_thread ( p_mi, p_e ); if( !p_input_thread ) return; - value.i_time = time*1000LL; - var_Set( p_input_thread, "time", value ); + var_SetTime( p_input_thread, "time", time*1000LL ); vlc_object_release( p_input_thread ); } @@ -770,14 +839,12 @@ void libvlc_media_player_set_position( libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; - vlc_value_t val; - val.f_float = position; p_input_thread = libvlc_get_input_thread ( p_mi, p_e); if( !p_input_thread ) return; - var_Set( p_input_thread, "position", val ); + var_SetFloat( p_input_thread, "position", position ); vlc_object_release( p_input_thread ); } @@ -804,14 +871,12 @@ void libvlc_media_player_set_chapter( libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; - vlc_value_t val; - val.i_int = chapter; p_input_thread = libvlc_get_input_thread ( p_mi, p_e); if( !p_input_thread ) return; - var_Set( p_input_thread, "chapter", val ); + var_SetInteger( p_input_thread, "chapter", chapter ); vlc_object_release( p_input_thread ); } @@ -880,14 +945,12 @@ void libvlc_media_player_set_title( libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; - vlc_value_t val; - val.i_int = i_title; p_input_thread = libvlc_get_input_thread ( p_mi, p_e); if( !p_input_thread ) return; - var_Set( p_input_thread, "title", val ); + var_SetInteger( p_input_thread, "title", i_title ); vlc_object_release( p_input_thread ); //send event @@ -942,10 +1005,8 @@ void libvlc_media_player_next_chapter( return; int i_type = var_Type( p_input_thread, "next-chapter" ); - vlc_value_t val; - val.b_bool = true; - var_Set( p_input_thread, (i_type & VLC_VAR_TYPE) != 0 ? - "next-chapter":"next-title", val ); + var_SetBool( p_input_thread, (i_type & VLC_VAR_TYPE) != 0 ? + "next-chapter":"next-title", true ); vlc_object_release( p_input_thread ); } @@ -961,10 +1022,8 @@ void libvlc_media_player_previous_chapter( return; int i_type = var_Type( p_input_thread, "next-chapter" ); - vlc_value_t val; - val.b_bool = true; - var_Set( p_input_thread, (i_type & VLC_VAR_TYPE) != 0 ? - "prev-chapter":"prev-title", val ); + var_SetBool( p_input_thread, (i_type & VLC_VAR_TYPE) != 0 ? + "prev-chapter":"prev-title", true ); vlc_object_release( p_input_thread ); } @@ -1008,26 +1067,21 @@ void libvlc_media_player_set_rate( libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; - vlc_value_t val; bool b_can_rewind; - if( rate != 0 ) - RAISEVOID( "Rate value is invalid" ); - - p_input_thread = libvlc_get_input_thread ( p_mi, p_e); + p_input_thread = libvlc_get_input_thread ( p_mi, p_e ); if( !p_input_thread ) return; b_can_rewind = var_GetBool( p_input_thread, "can-rewind" ); - if( (rate < 0) && !b_can_rewind ) + if( (rate < 0.0) && !b_can_rewind ) { vlc_object_release( p_input_thread ); libvlc_exception_raise( p_e, "Rate value is invalid" ); return; } - val.i_int = 1000.0f/rate; - var_Set( p_input_thread, "rate", val ); + var_SetInteger( p_input_thread, "rate", 1000.0f/rate ); vlc_object_release( p_input_thread ); } @@ -1060,21 +1114,30 @@ libvlc_state_t libvlc_media_player_get_state( libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; + libvlc_state_t state = libvlc_Ended; vlc_value_t val; p_input_thread = libvlc_get_input_thread ( p_mi, p_e ); - if ( !p_input_thread ) + if( !p_input_thread ) { /* We do return the right value, no need to throw an exception */ if( libvlc_exception_raised( p_e ) ) libvlc_exception_clear( p_e ); - return libvlc_Ended; + return state; } var_Get( p_input_thread, "state", &val ); - vlc_object_release( p_input_thread ); + state = vlc_to_libvlc_state(val.i_int); - return vlc_to_libvlc_state(val.i_int); + if( state == libvlc_Playing ) + { + float caching; + caching = var_GetFloat( p_input_thread, "cache" ); + if( caching > 0.0 && caching < 1.0 ) + state = libvlc_Buffering; + } + vlc_object_release( p_input_thread ); + return state; } int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi, @@ -1104,6 +1167,8 @@ libvlc_track_description_t * libvlc_exception_t *p_e ) { input_thread_t *p_input = libvlc_get_input_thread( p_mi, p_e ); + libvlc_track_description_t *p_track_description = NULL, + *p_actual, *p_previous; if( !p_input ) return NULL; @@ -1111,18 +1176,16 @@ libvlc_track_description_t * vlc_value_t val_list, text_list; var_Change( p_input, psz_variable, VLC_VAR_GETLIST, &val_list, &text_list); - if( val_list.p_list->i_count <= 0 ) /* no tracks */ - return NULL; + /* no tracks */ + if( val_list.p_list->i_count <= 0 ) + goto end; - libvlc_track_description_t *p_track_description, *p_actual, *p_previous; p_track_description = ( libvlc_track_description_t * ) malloc( sizeof( libvlc_track_description_t ) ); if ( !p_track_description ) { - var_Change( p_input, psz_variable, VLC_VAR_FREELIST, &val_list, &text_list); - vlc_object_release( p_input ); libvlc_exception_raise( p_e, "no enough memory" ); - return NULL; + goto end; } p_actual = p_track_description; p_previous = NULL; @@ -1135,10 +1198,8 @@ libvlc_track_description_t * if ( !p_actual ) { libvlc_track_description_release( p_track_description ); - var_Change( p_input, psz_variable, VLC_VAR_FREELIST, &val_list, &text_list); - vlc_object_release( p_input ); libvlc_exception_raise( p_e, "no enough memory" ); - return NULL; + goto end; } } p_actual->i_id = val_list.p_list->p_values[i].i_int; @@ -1149,16 +1210,18 @@ libvlc_track_description_t * p_previous = p_actual; p_actual = NULL; } - var_Change( p_input, psz_variable, VLC_VAR_FREELIST, &val_list, &text_list); + +end: + var_FreeList( &val_list, &text_list ); vlc_object_release( p_input ); return p_track_description; } -void libvlc_track_description_release( libvlc_track_description_t *p_track_description ) +void libvlc_track_description_release( libvlc_track_description_t *p_td ) { libvlc_track_description_t *p_actual, *p_before; - p_actual = p_track_description; + p_actual = p_td; while ( p_actual ) {