libvlc_event_manager_register_event_type(mp->p_event_manager, type);
}
+/*
+ * The input lock protects the input and input resource pointer.
+ * It MUST NOT be used from callbacks.
+ *
+ * The object lock protects the reset, namely the media and the player state.
+ * It can, and usually needs to be taken from callbacks.
+ * The object lock can be acquired under the input lock... and consequently
+ * the opposite order is STRICTLY PROHIBITED.
+ */
static inline void lock(libvlc_media_player_t *mp)
{
vlc_mutex_lock(&mp->object_lock);
vlc_mutex_unlock(&mp->object_lock);
}
+static inline void lock_input(libvlc_media_player_t *mp)
+{
+ vlc_mutex_lock(&mp->input.lock);
+}
+
+static inline void unlock_input(libvlc_media_player_t *mp)
+{
+ vlc_mutex_unlock(&mp->input.lock);
+}
+
/*
* Release the associated input thread.
*
* Object lock is NOT held.
+ * Input lock is held or instance is being destroyed.
*/
static void release_input_thread( libvlc_media_player_t *p_mi, bool b_input_abort )
{
- input_thread_t * p_input_thread;
+ assert( p_mi );
- if( !p_mi || !p_mi->p_input_thread )
+ input_thread_t *p_input_thread = p_mi->input.p_thread;
+ if( !p_input_thread )
return;
- p_input_thread = p_mi->p_input_thread;
-
var_DelCallback( p_input_thread, "can-seek",
input_seekable_changed, p_mi );
var_DelCallback( p_input_thread, "can-pause",
vlc_thread_join( p_input_thread );
- assert( p_mi->p_input_resource == NULL );
assert( p_input_thread->b_dead );
+
/* Store the input resource for future use. */
- p_mi->p_input_resource = input_DetachResource( p_input_thread );
+ assert( p_mi->input.p_resource == NULL );
+ p_mi->input.p_resource = input_DetachResource( p_input_thread );
+ p_mi->input.p_thread = NULL;
vlc_object_release( p_input_thread );
-
- p_mi->p_input_thread = NULL;
}
/*
* Retrieve the input thread. Be sure to release the object
* once you are done with it. (libvlc Internal)
- *
- * Function will lock the object.
*/
-input_thread_t *libvlc_get_input_thread( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+input_thread_t *libvlc_get_input_thread( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
- if( !p_mi ) RAISENULL( "Media Instance is NULL" );
-
- lock(p_mi);
-
- if( !p_mi->p_input_thread )
- {
- unlock(p_mi);
- RAISENULL( "Input is NULL" );
- }
-
- p_input_thread = p_mi->p_input_thread;
- vlc_object_hold( p_input_thread );
+ assert( p_mi );
- unlock(p_mi);
+ lock_input(p_mi);
+ p_input_thread = p_mi->input.p_thread;
+ if( p_input_thread )
+ vlc_object_hold( p_input_thread );
+ else
+ libvlc_printerr( "No active input" );
+ unlock_input(p_mi);
return p_input_thread;
}
if(!b_locked)
lock(p_mi);
p_mi->state = state;
+
libvlc_media_t *media = p_mi->p_md;
if (media)
libvlc_media_retain(media);
+
if(!b_locked)
unlock(p_mi);
-
- if (media) {
+ if (media)
+ {
// Also set the state of the corresponding media
// This is strictly for convenience.
libvlc_media_set_state(media, state);
return VLC_SUCCESS;
}
+static input_thread_t *find_input (vlc_object_t *obj)
+{
+ libvlc_media_player_t *mp = (libvlc_media_player_t *)obj;
+
+ return libvlc_get_input_thread (mp);
+}
+/* */
static void libvlc_media_player_destroy( libvlc_media_player_t * );
}
vlc_object_attach (mp, mp->p_libvlc);
- /* Drawable */
+ /* Input */
+ var_Create (mp, "rate", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT);
+
+ /* Video */
var_Create (mp, "drawable-xid", VLC_VAR_INTEGER);
#ifdef WIN32
var_Create (mp, "drawable-hwnd", VLC_VAR_ADDRESS);
var_Create (mp, "drawable-nsobject", VLC_VAR_ADDRESS);
#endif
- /* Drawable input methods */
var_Create (mp, "keyboard-events", VLC_VAR_BOOL);
var_SetBool (mp, "keyboard-events", true);
var_Create (mp, "mouse-events", VLC_VAR_BOOL);
+ var_SetBool (mp, "mouse-events", true);
+
+ var_Create (mp, "fullscreen", VLC_VAR_BOOL);
+ var_Create (mp, "autoscale", VLC_VAR_BOOL);
+ var_SetBool (mp, "autoscale", true);
+ var_Create (mp, "scale", VLC_VAR_FLOAT);
+ var_SetFloat (mp, "scale", 1.);
+ var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
+ var_Create (mp, "crop", VLC_VAR_STRING);
+ var_Create (mp, "deinterlace", VLC_VAR_INTEGER);
+ var_Create (mp, "deinterlace-mode", VLC_VAR_STRING);
+
+ var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
+
+ var_Create (mp, "marq-marquee", VLC_VAR_STRING);
+ var_Create (mp, "marq-color", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "marq-opacity", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "marq-position", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "marq-refresh", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "marq-size", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "marq-timeout", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "marq-x", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "marq-y", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+
+ var_Create (mp, "logo-file", VLC_VAR_STRING);
+ var_Create (mp, "logo-x", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "logo-y", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "logo-delay", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "logo-repeat", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "logo-opacity", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "logo-position", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+
+ /* Audio */
+ var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
+ var_Create (mp, "volume-muted", VLC_VAR_BOOL);
+ var_Create (mp, "saved-volume", VLC_VAR_INTEGER);
+ var_Create (mp, "volume-change", VLC_VAR_VOID);
+ var_Create (mp, "find-input-callback", VLC_VAR_ADDRESS);
+ var_SetAddress (mp, "find-input-callback", find_input);
mp->p_md = NULL;
mp->state = libvlc_NothingSpecial;
mp->p_libvlc_instance = instance;
- mp->p_input_thread = NULL;
- mp->p_input_resource = NULL;
+ mp->input.p_thread = NULL;
+ mp->input.p_resource = NULL;
+ vlc_mutex_init (&mp->input.lock);
mp->i_refcount = 1;
mp->p_event_manager = libvlc_event_manager_new(mp, instance);
if (unlikely(mp->p_event_manager == NULL))
*/
var_AddCallback(mp->p_libvlc, "snapshot-file", snapshot_was_taken, mp);
+ libvlc_retain(instance);
return mp;
}
var_DelCallback( p_mi->p_libvlc,
"snapshot-file", snapshot_was_taken, p_mi );
- /* If the input thread hasn't been already deleted it means
- * that the owners didn't stop the thread before releasing it. */
- assert(!p_mi->p_input_thread);
-
- /* Fallback for those who don't use NDEBUG */
- if (p_mi->p_input_thread)
+ /* No need for lock_input() because no other threads knows us anymore */
+ if( p_mi->input.p_thread )
release_input_thread(p_mi, true);
-
- if( p_mi->p_input_resource )
+ if( p_mi->input.p_resource )
{
- input_resource_Delete( p_mi->p_input_resource );
- p_mi->p_input_resource = NULL;
+ input_resource_Delete( p_mi->input.p_resource );
+ p_mi->input.p_resource = NULL;
}
+ vlc_mutex_destroy( &p_mi->input.lock );
libvlc_event_manager_release( p_mi->p_event_manager );
libvlc_media_release( p_mi->p_md );
vlc_mutex_destroy( &p_mi->object_lock );
+
+ libvlc_instance_t *instance = p_mi->p_libvlc_instance;
vlc_object_release( p_mi );
+ libvlc_release(instance);
}
/**************************************************************************
libvlc_media_player_t *p_mi,
libvlc_media_t *p_md )
{
- lock(p_mi);
+ lock_input(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 );
+ p_mi->input.p_thread &&
+ !p_mi->input.p_thread->b_eof &&
+ !p_mi->input.p_thread->b_error );
+ lock( p_mi );
set_state( p_mi, libvlc_NothingSpecial, true );
+ unlock_input( p_mi );
libvlc_media_release( p_mi->p_md );
**************************************************************************/
int libvlc_media_player_play( libvlc_media_player_t *p_mi )
{
- input_thread_t * p_input_thread;
+ lock_input( p_mi );
- if( (p_input_thread = libvlc_get_input_thread( p_mi, NULL )) )
+ input_thread_t *p_input_thread = p_mi->input.p_thread;
+ if( p_input_thread )
{
/* A thread already exists, send it a play message */
input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S );
- vlc_object_release( p_input_thread );
+ unlock_input( p_mi );
return 0;
}
if( !p_mi->p_md )
{
unlock(p_mi);
+ unlock_input( p_mi );
libvlc_printerr( "No associated media descriptor" );
return -1;
}
- p_mi->p_input_thread = input_Create( p_mi,
- p_mi->p_md->p_input_item, NULL,
- p_mi->p_input_resource );
- if( !p_mi->p_input_thread )
+ p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL,
+ p_mi->input.p_resource );
+ unlock(p_mi);
+ if( !p_input_thread )
{
- unlock(p_mi);
+ unlock_input(p_mi);
libvlc_printerr( "Not enough memory" );
return -1;
}
- p_mi->p_input_resource = NULL;
- p_input_thread = p_mi->p_input_thread;
+ p_mi->input.p_resource = NULL;
var_AddCallback( p_input_thread, "can-seek", input_seekable_changed, p_mi );
var_AddCallback( p_input_thread, "can-pause", input_pausable_changed, p_mi );
if( input_Start( p_input_thread ) )
{
+ unlock_input(p_mi);
+ var_DelCallback( p_input_thread, "intf-event", input_event_changed, p_mi );
+ var_DelCallback( p_input_thread, "can-pause", input_pausable_changed, p_mi );
+ var_DelCallback( p_input_thread, "can-seek", input_seekable_changed, p_mi );
vlc_object_release( p_input_thread );
- p_mi->p_input_thread = NULL;
+ libvlc_printerr( "Input initialization failure" );
+ return -1;
}
-
- unlock(p_mi);
+ p_mi->input.p_thread = p_input_thread;
+ unlock_input(p_mi);
return 0;
}
**************************************************************************/
void libvlc_media_player_pause( libvlc_media_player_t *p_mi )
{
- input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, NULL );
+ input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi );
if( !p_input_thread )
return;
{
libvlc_state_t state = libvlc_media_player_get_state( p_mi );
- lock(p_mi);
+ lock_input(p_mi);
release_input_thread( p_mi, true ); /* This will stop the input thread */
- unlock(p_mi);
/* Force to go to stopped state, in case we were in Ended, or Error
* state. */
event.type = libvlc_MediaPlayerStopped;
libvlc_event_send( p_mi->p_event_manager, &event );
}
+ unlock_input(p_mi);
}
/**************************************************************************
input_thread_t *p_input_thread;
libvlc_time_t i_time;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
input_thread_t *p_input_thread;
libvlc_time_t i_time;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
{
input_thread_t *p_input_thread;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return;
{
input_thread_t *p_input_thread;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return;
input_thread_t *p_input_thread;
float f_position;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1.0;
{
input_thread_t *p_input_thread;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return;
input_thread_t *p_input_thread;
int i_chapter;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
input_thread_t *p_input_thread;
vlc_value_t val;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
input_thread_t *p_input_thread;
vlc_value_t val;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
{
input_thread_t *p_input_thread;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return;
input_thread_t *p_input_thread;
int i_title;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
input_thread_t *p_input_thread;
vlc_value_t val;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
{
input_thread_t *p_input_thread;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return;
{
input_thread_t *p_input_thread;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return;
float libvlc_media_player_get_fps( libvlc_media_player_t *p_mi )
{
- input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi );
double f_fps = 0.0;
if( p_input_thread )
{
bool b_will_play;
input_thread_t *p_input_thread =
- libvlc_get_input_thread ( p_mi, NULL );
+ libvlc_get_input_thread ( p_mi );
if ( !p_input_thread )
return false;
int libvlc_media_player_set_rate( libvlc_media_player_t *p_mi, float rate )
{
- input_thread_t *p_input_thread;
- bool b_can_rewind;
-
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
- if( !p_input_thread )
- return -1;
-
- b_can_rewind = var_GetBool( p_input_thread, "can-rewind" );
- if( (rate < 0.0) && !b_can_rewind )
+ if (rate < 0.)
{
- vlc_object_release( p_input_thread );
- libvlc_printerr( "Invalid playback rate" );
+ libvlc_printerr ("Playing backward not supported");
return -1;
}
+ var_SetFloat (p_mi, "rate", rate);
+
+ input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi );
+ if( !p_input_thread )
+ return 0;
var_SetFloat( p_input_thread, "rate", rate );
vlc_object_release( p_input_thread );
return 0;
float libvlc_media_player_get_rate( libvlc_media_player_t *p_mi )
{
- input_thread_t *p_input_thread;
- float f_rate;
- bool b_can_rewind;
-
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
- if( !p_input_thread )
- return 0.0; /* rate < 0 indicates rewind */
-
- f_rate = var_GetFloat( p_input_thread, "rate" );
- b_can_rewind = var_GetBool( p_input_thread, "can-rewind" );
- /* FIXME: why are negative values forbidden ?? (rewinding) */
- if( f_rate < 0 && !b_can_rewind )
- {
- vlc_object_release( p_input_thread );
- return 0.0;
- }
- vlc_object_release( p_input_thread );
-
- return f_rate;
+ return var_GetFloat (p_mi, "rate");
}
libvlc_state_t libvlc_media_player_get_state( libvlc_media_player_t *p_mi )
input_thread_t *p_input_thread;
bool b_seekable;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if ( !p_input_thread )
return false;
b_seekable = var_GetBool( p_input_thread, "can-seek" );
libvlc_get_track_description( libvlc_media_player_t *p_mi,
const char *psz_variable )
{
- input_thread_t *p_input = libvlc_get_input_thread( p_mi, NULL );
+ input_thread_t *p_input = libvlc_get_input_thread( p_mi );
libvlc_track_description_t *p_track_description = NULL,
*p_actual, *p_previous;
if ( !p_actual )
{
libvlc_track_description_release( p_track_description );
- libvlc_exception_raise( p_e );
libvlc_printerr( "Not enough memory" );
goto end;
}
input_thread_t *p_input_thread;
bool b_can_pause;
- p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if ( !p_input_thread )
return false;
b_can_pause = var_GetBool( p_input_thread, "can-pause" );
void libvlc_media_player_next_frame( libvlc_media_player_t *p_mi )
{
- input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
+ input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi );
if( p_input_thread != NULL )
{
var_TriggerCallback( p_input_thread, "frame-next" );
projects / vlc / blobdiff