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 );
-
- var_Destroy( p_input_thread, "drawable-hwnd" );
- var_Destroy( p_input_thread, "drawable-xid" );
- var_Destroy( p_input_thread, "drawable-agl" );
+ 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 * );
* - When attempting to destroy the object the lock is also held.
**************************************************************************/
libvlc_media_player_t *
-libvlc_media_player_new( libvlc_instance_t *instance, libvlc_exception_t *e )
+libvlc_media_player_new( libvlc_instance_t *instance )
{
libvlc_media_player_t * mp;
return NULL;
}
vlc_object_attach (mp, mp->p_libvlc);
+
+ /* Input */
+ var_Create (mp, "rate", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT);
+
+ /* Video */
+ var_Create (mp, "vout", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
+ var_Create (mp, "window", VLC_VAR_STRING);
+ var_Create (mp, "vmem-lock", VLC_VAR_ADDRESS);
+ var_Create (mp, "vmem-unlock", VLC_VAR_ADDRESS);
+ var_Create (mp, "vmem-display", VLC_VAR_ADDRESS);
+ var_Create (mp, "vmem-data", VLC_VAR_ADDRESS);
+ var_Create (mp, "vmem-chroma", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
+ var_Create (mp, "vmem-width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "vmem-height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "vmem-pitch", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "drawable-xid", VLC_VAR_INTEGER);
+#ifdef WIN32
+ var_Create (mp, "drawable-hwnd", VLC_VAR_ADDRESS);
+#endif
+#ifdef __APPLE__
+ var_Create (mp, "drawable-agl", VLC_VAR_INTEGER);
+ var_Create (mp, "drawable-nsobject", VLC_VAR_ADDRESS);
+#endif
+
+ 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);
+
+ var_Create (mp, "contrast", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
+ var_Create (mp, "brightness", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
+ var_Create (mp, "hue", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+ var_Create (mp, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
+ var_Create (mp, "gamma", VLC_VAR_FLOAT | 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->drawable.agl = 0;
- mp->drawable.xid = 0;
- mp->drawable.hwnd = NULL;
- mp->drawable.nsobject = NULL;
- mp->keyboard_events = mp->mouse_events = 1;
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;
}
* Create a Media Instance object with a media descriptor.
**************************************************************************/
libvlc_media_player_t *
-libvlc_media_player_new_from_media(
- libvlc_media_t * p_md,
- libvlc_exception_t *p_e )
+libvlc_media_player_new_from_media( libvlc_media_t * p_md )
{
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 );
if( !p_mi )
return NULL;
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_Terminate( p_mi->input.p_resource );
+ input_resource_Release( 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 );
/**************************************************************************
* Tell media player to start playing.
**************************************************************************/
-void libvlc_media_player_play( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+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, p_e )) )
+ 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 );
- return;
+ unlock_input( p_mi );
+ return 0;
}
/* Ignore previous exception */
- libvlc_exception_clear( p_e );
-
lock(p_mi);
if( !p_mi->p_md )
{
unlock(p_mi);
- libvlc_exception_raise( p_e );
+ unlock_input( p_mi );
libvlc_printerr( "No associated media descriptor" );
- return;
+ 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 )
+ if( !p_mi->input.p_resource )
+ p_mi->input.p_resource = input_resource_New( VLC_OBJECT( p_mi ) );
+ 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);
- return;
+ 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;
-
- 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 )
- var_SetAddress( p_input_thread, "drawable-hwnd", p_mi->drawable.hwnd );
-
- var_Create( p_input_thread, "drawable-nsobject", VLC_VAR_ADDRESS );
- if( p_mi->drawable.nsobject != NULL )
- var_SetAddress( p_input_thread, "drawable-nsobject", p_mi->drawable.nsobject );
-
- var_Create( p_input_thread, "keyboard-events", VLC_VAR_BOOL );
- var_SetBool( p_input_thread, "keyboard-events", p_mi->keyboard_events );
- var_Create( p_input_thread, "mouse-events", VLC_VAR_BOOL );
- var_SetBool( p_input_thread, "mouse-events", p_mi->mouse_events );
-
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 ) )
{
+ 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;
}
-/**************************************************************************
- * Pause.
- **************************************************************************/
-void libvlc_media_player_pause( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+void libvlc_media_player_set_pause( libvlc_media_player_t *p_mi, int paused )
{
- input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, p_e );
+ 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 );
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 );
- else
- libvlc_media_player_stop( p_mi );
+ if( paused )
+ {
+ if( libvlc_media_player_can_pause( p_mi ) )
+ input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S );
+ else
+ libvlc_media_player_stop( p_mi );
+ }
}
else
- input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S );
+ {
+ if( !paused )
+ input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S );
+ }
vlc_object_release( p_input_thread );
}
+/**************************************************************************
+ * Toggle pause.
+ **************************************************************************/
+void libvlc_media_player_pause( libvlc_media_player_t *p_mi )
+{
+ libvlc_state_t state = libvlc_media_player_get_state( p_mi );
+ bool playing = (state == libvlc_Playing || state == libvlc_Buffering);
+
+ libvlc_media_player_set_pause( p_mi, playing );
+}
+
/**************************************************************************
* Tells whether the media player is currently playing.
*
{
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 );
}
+
+ if( p_mi->input.p_resource != NULL )
+ input_resource_TerminateVout( p_mi->input.p_resource );
+ unlock_input(p_mi);
+}
+
+
+void libvlc_video_set_callbacks( libvlc_media_player_t *mp,
+ void *(*lock_cb) (void *, void **),
+ void (*unlock_cb) (void *, void *, void *const *),
+ void (*display_cb) (void *, void *),
+ void *opaque )
+{
+ var_SetAddress( mp, "vmem-lock", lock_cb );
+ var_SetAddress( mp, "vmem-unlock", unlock_cb );
+ var_SetAddress( mp, "vmem-display", display_cb );
+ var_SetAddress( mp, "vmem-data", opaque );
+ var_SetString( mp, "vout", "vmem" );
+}
+
+void libvlc_video_set_format( libvlc_media_player_t *mp, const char *chroma,
+ unsigned width, unsigned height, unsigned pitch )
+{
+ var_SetString( mp, "vmem-chroma", chroma );
+ var_SetInteger( mp, "vmem-width", width );
+ var_SetInteger( mp, "vmem-height", height );
+ var_SetInteger( mp, "vmem-pitch", pitch );
}
/**************************************************************************
void libvlc_media_player_set_nsobject( libvlc_media_player_t *p_mi,
void * drawable )
{
- p_mi->drawable.nsobject = drawable;
+ assert (p_mi != NULL);
+#ifdef __APPLE__
+ var_SetAddress (p_mi, "drawable-nsobject", drawable);
+#else
+ (void) p_mi; (void)drawable;
+#endif
}
/**************************************************************************
**************************************************************************/
void * libvlc_media_player_get_nsobject( libvlc_media_player_t *p_mi )
{
- return p_mi->drawable.nsobject;
+ assert (p_mi != NULL);
+#ifdef __APPLE__
+ return var_GetAddress (p_mi, "drawable-nsobject");
+#else
+ return NULL;
+#endif
}
/**************************************************************************
void libvlc_media_player_set_agl( libvlc_media_player_t *p_mi,
uint32_t drawable )
{
- p_mi->drawable.agl = drawable;
+#ifdef __APPLE__
+ var_SetInteger (p_mi, "drawable-agl", drawable);
+#else
+ (void) p_mi; (void)drawable;
+#endif
}
/**************************************************************************
**************************************************************************/
uint32_t libvlc_media_player_get_agl( libvlc_media_player_t *p_mi )
{
- return p_mi->drawable.agl;
+ assert (p_mi != NULL);
+#ifdef __APPLE__
+ return var_GetInteger (p_mi, "drawable-agl");
+#else
+ return 0;
+#endif
}
/**************************************************************************
void libvlc_media_player_set_xwindow( libvlc_media_player_t *p_mi,
uint32_t drawable )
{
- p_mi->drawable.xid = drawable;
+ assert (p_mi != NULL);
+
+ var_SetString (p_mi, "vout", drawable ? "xid" : "any");
+ var_SetString (p_mi, "window", drawable ? "embed-xid,any" : "any");
+ var_SetInteger (p_mi, "drawable-xid", drawable);
}
/**************************************************************************
**************************************************************************/
uint32_t libvlc_media_player_get_xwindow( libvlc_media_player_t *p_mi )
{
- return p_mi->drawable.xid;
+ return var_GetInteger (p_mi, "drawable-xid");
}
/**************************************************************************
void libvlc_media_player_set_hwnd( libvlc_media_player_t *p_mi,
void *drawable )
{
- p_mi->drawable.hwnd = drawable;
+ assert (p_mi != NULL);
+#ifdef WIN32
+ var_SetString (p_mi, "window",
+ (drawable != NULL) ? "embed-hwnd,any" : "");
+ var_SetAddress (p_mi, "drawable-hwnd", drawable);
+#else
+ (void) p_mi; (void) drawable;
+#endif
}
/**************************************************************************
**************************************************************************/
void *libvlc_media_player_get_hwnd( libvlc_media_player_t *p_mi )
{
- return p_mi->drawable.hwnd;
+ assert (p_mi != NULL);
+#ifdef WIN32
+ return var_GetAddress (p_mi, "drawable-hwnd");
+#else
+ return NULL;
+#endif
}
/**************************************************************************
* Getters for stream information
**************************************************************************/
libvlc_time_t libvlc_media_player_get_length(
- libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+ libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
libvlc_time_t i_time;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e);
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
return i_time;
}
-libvlc_time_t libvlc_media_player_get_time(
- libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+libvlc_time_t libvlc_media_player_get_time( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
libvlc_time_t i_time;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
return i_time;
}
-void libvlc_media_player_set_time(
- libvlc_media_player_t *p_mi,
- libvlc_time_t i_time,
- libvlc_exception_t *p_e )
+void libvlc_media_player_set_time( libvlc_media_player_t *p_mi,
+ libvlc_time_t i_time )
{
input_thread_t *p_input_thread;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return;
vlc_object_release( p_input_thread );
}
-void libvlc_media_player_set_position(
- libvlc_media_player_t *p_mi,
- float position,
- libvlc_exception_t *p_e )
+void libvlc_media_player_set_position( libvlc_media_player_t *p_mi,
+ float position )
{
input_thread_t *p_input_thread;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e);
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return;
vlc_object_release( p_input_thread );
}
-float libvlc_media_player_get_position(
- libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+float libvlc_media_player_get_position( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
float f_position;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1.0;
return f_position;
}
-void libvlc_media_player_set_chapter(
- libvlc_media_player_t *p_mi,
- int chapter,
- libvlc_exception_t *p_e )
+void libvlc_media_player_set_chapter( libvlc_media_player_t *p_mi,
+ int chapter )
{
input_thread_t *p_input_thread;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e);
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return;
vlc_object_release( p_input_thread );
}
-int libvlc_media_player_get_chapter(
- libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+int libvlc_media_player_get_chapter( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
int i_chapter;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
return i_chapter;
}
-int libvlc_media_player_get_chapter_count(
- libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+int libvlc_media_player_get_chapter_count( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
vlc_value_t val;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
int libvlc_media_player_get_chapter_count_for_title(
libvlc_media_player_t *p_mi,
- int i_title,
- libvlc_exception_t *p_e )
+ int i_title )
{
input_thread_t *p_input_thread;
vlc_value_t val;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
return val.i_int;
}
-void libvlc_media_player_set_title(
- libvlc_media_player_t *p_mi,
- int i_title,
- libvlc_exception_t *p_e )
+void libvlc_media_player_set_title( libvlc_media_player_t *p_mi,
+ int i_title )
{
input_thread_t *p_input_thread;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e);
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return;
libvlc_event_send( p_mi->p_event_manager, &event );
}
-int libvlc_media_player_get_title(
- libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+int libvlc_media_player_get_title( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
int i_title;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
return i_title;
}
-int libvlc_media_player_get_title_count(
- libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+int libvlc_media_player_get_title_count( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
vlc_value_t val;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return -1;
return val.i_int;
}
-void libvlc_media_player_next_chapter(
- libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+void libvlc_media_player_next_chapter( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e);
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return;
vlc_object_release( p_input_thread );
}
-void libvlc_media_player_previous_chapter(
- libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+void libvlc_media_player_previous_chapter( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e);
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if( !p_input_thread )
return;
vlc_object_release( p_input_thread );
}
-float libvlc_media_player_get_fps(
- libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e)
+float libvlc_media_player_get_fps( libvlc_media_player_t *p_mi )
{
- input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+ input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi );
double f_fps = 0.0;
if( p_input_thread )
return f_fps;
}
-int libvlc_media_player_will_play( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e)
+int libvlc_media_player_will_play( libvlc_media_player_t *p_mi )
{
bool b_will_play;
input_thread_t *p_input_thread =
- libvlc_get_input_thread ( p_mi, p_e);
+ libvlc_get_input_thread ( p_mi );
if ( !p_input_thread )
return false;
return b_will_play;
}
-void libvlc_media_player_set_rate(
- libvlc_media_player_t *p_mi,
- float rate,
- libvlc_exception_t *p_e )
+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, p_e );
- if( !p_input_thread )
- return;
-
- 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_exception_raise( p_e );
- libvlc_printerr( "Invalid playback rate" );
- return;
+ 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,
- libvlc_exception_t *p_e )
+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, p_e );
- 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 )
return state;
}
-int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
bool b_seekable;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if ( !p_input_thread )
- {
- /* We do return the right value, no need to throw an exception */
- clear_if_needed(p_e);
return false;
- }
b_seekable = var_GetBool( p_input_thread, "can-seek" );
vlc_object_release( p_input_thread );
/* internal function, used by audio, video */
libvlc_track_description_t *
libvlc_get_track_description( libvlc_media_player_t *p_mi,
- const char *psz_variable,
- libvlc_exception_t *p_e )
+ const char *psz_variable )
{
- input_thread_t *p_input = libvlc_get_input_thread( p_mi, p_e );
+ input_thread_t *p_input = libvlc_get_input_thread( p_mi );
libvlc_track_description_t *p_track_description = NULL,
*p_actual, *p_previous;
malloc( sizeof( libvlc_track_description_t ) );
if ( !p_track_description )
{
- libvlc_exception_raise( p_e );
libvlc_printerr( "Not enough memory" );
goto end;
}
if ( !p_actual )
{
libvlc_track_description_release( p_track_description );
- libvlc_exception_raise( p_e );
libvlc_printerr( "Not enough memory" );
goto end;
}
}
}
-int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
bool b_can_pause;
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+ p_input_thread = libvlc_get_input_thread ( p_mi );
if ( !p_input_thread )
- {
- /* We do return the right value, no need to throw an exception */
- clear_if_needed(p_e);
return false;
- }
b_can_pause = var_GetBool( p_input_thread, "can-pause" );
vlc_object_release( p_input_thread );
return b_can_pause;
}
-void libvlc_media_player_next_frame( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e )
+void libvlc_media_player_next_frame( libvlc_media_player_t *p_mi )
{
- input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+ input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi );
if( p_input_thread != NULL )
{
var_TriggerCallback( p_input_thread, "frame-next" );
vlc_object_release( p_input_thread );
}
- else
- {
- libvlc_exception_raise( p_e );
- libvlc_printerr( "No active input" );
- }
}
projects / vlc / blobdiff