/*****************************************************************************
* 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 <zorglub@videolan.org>
p_input_thread = p_mi->p_input_thread;
- /* No one is tracking this input_thread apart from 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 );
-
- /* We owned this one */
- input_StopThread( p_input_thread, b_input_abort );
- vlc_thread_join( p_input_thread );
-
- var_Destroy( p_input_thread, "drawable-hwnd" );
- var_Destroy( p_input_thread, "drawable-xid" );
- }
+ 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_Stop( p_input_thread, b_input_abort );
+ vlc_thread_join( p_input_thread );
+
+ 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 );
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 */
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 );
+ }
return VLC_SUCCESS;
}
+static void libvlc_media_player_destroy( libvlc_media_player_t * );
/**************************************************************************
* Create a Media Instance object.
return NULL;
}
p_mi->p_md = NULL;
+ 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;
p_mi->i_refcount = 1;
- p_mi->b_own_its_input_thread = true;
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;
}
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 );
/* 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
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;
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. 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 */
+ /* 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 );
}
**************************************************************************/
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, true );
-
- 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 );
}
/**************************************************************************
**************************************************************************/
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 );
}
/**************************************************************************
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 )
{
p_input_thread = p_mi->p_input_thread;
+ 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_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 );
}
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 );
int libvlc_media_player_is_playing( 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 0;
-
libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e );
-
- vlc_object_release( p_input_thread );
-
- if( state == libvlc_Playing )
- {
- return 1;
- }
- return 0;
+ return (libvlc_Playing == state) || (libvlc_Buffering == state);
}
-
/**************************************************************************
* Stop playing.
**************************************************************************/
{
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 if 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 */
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, true ); /* 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, true );
- 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;
}
/**************************************************************************
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
}
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
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 );
}
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 );
}
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 );
}
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
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 );
}
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 );
}
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 );
}
var_Get( p_input_thread, "state", &val );
state = vlc_to_libvlc_state(val.i_int);
- if( state == PLAYING_S )
+ if( state == libvlc_Playing )
{
float caching;
caching = var_GetFloat( p_input_thread, "cache" );
- if( caching > 0.0 && caching < 100.0 )
+ if( caching > 0.0 && caching < 1.0 )
state = libvlc_Buffering;
}
vlc_object_release( p_input_thread );
var_Change( p_input, psz_variable, VLC_VAR_GETLIST, &val_list, &text_list);
if( val_list.p_list->i_count <= 0 ) /* no tracks */
+ {
+ var_FreeList( &val_list, &text_list);
+ vlc_object_release( p_input );
return NULL;
+ }
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);
+ var_FreeList( &val_list, &text_list);
vlc_object_release( p_input );
libvlc_exception_raise( p_e, "no enough memory" );
return NULL;
if ( !p_actual )
{
libvlc_track_description_release( p_track_description );
- var_Change( p_input, psz_variable, VLC_VAR_FREELIST,
- &val_list, &text_list);
+ var_FreeList( &val_list, &text_list);
vlc_object_release( p_input );
libvlc_exception_raise( p_e, "no enough memory" );
return NULL;
p_previous = p_actual;
p_actual = NULL;
}
- var_Change( p_input, psz_variable, VLC_VAR_FREELIST, &val_list, &text_list);
+ var_FreeList( &val_list, &text_list);
vlc_object_release( p_input );
return p_track_description;
projects / vlc / blobdiff