assert( p_input_thread->b_dead );
- /* Store the input resource for future use. */
- 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 );
}
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);
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);
release_input_thread(p_mi, true);
if( p_mi->input.p_resource )
{
- input_resource_Delete( p_mi->input.p_resource );
+ 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 );
return -1;
}
+ 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);
return -1;
}
- 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 );
var_AddCallback( p_input_thread, "intf-event", input_event_changed, p_mi );
return 0;
}
-/**************************************************************************
- * Pause.
- **************************************************************************/
-void libvlc_media_player_pause( libvlc_media_player_t *p_mi )
+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 );
if( !p_input_thread )
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 ) )
- 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.
*
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 );
+}
+
/**************************************************************************
* set_nsobject
**************************************************************************/
uint32_t 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);
}
{
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;