Commit 0a64cb09 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Add a window variable to select the window provider

parent fa4ba3ac
...@@ -367,6 +367,7 @@ libvlc_media_player_new( libvlc_instance_t *instance ) ...@@ -367,6 +367,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_Create (mp, "rate", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT); var_Create (mp, "rate", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT);
/* Video */ /* Video */
var_Create (mp, "window", VLC_VAR_STRING);
var_Create (mp, "drawable-xid", VLC_VAR_INTEGER); var_Create (mp, "drawable-xid", VLC_VAR_INTEGER);
#ifdef WIN32 #ifdef WIN32
var_Create (mp, "drawable-hwnd", VLC_VAR_ADDRESS); var_Create (mp, "drawable-hwnd", VLC_VAR_ADDRESS);
......
...@@ -761,6 +761,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -761,6 +761,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
var_Create( p_libvlc, "snapshot-file", VLC_VAR_STRING ); var_Create( p_libvlc, "snapshot-file", VLC_VAR_STRING );
var_Create( p_libvlc, "record-file", VLC_VAR_STRING ); var_Create( p_libvlc, "record-file", VLC_VAR_STRING );
/* vout window provider */
var_Create( p_libvlc, "window", VLC_VAR_STRING );
/* Initialize playlist and get commandline files */ /* Initialize playlist and get commandline files */
p_playlist = playlist_Create( VLC_OBJECT(p_libvlc) ); p_playlist = playlist_Create( VLC_OBJECT(p_libvlc) );
if( !p_playlist ) if( !p_playlist )
......
...@@ -502,7 +502,7 @@ vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd, ...@@ -502,7 +502,7 @@ vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
vout->p->window.object = NULL; vout->p->window.object = NULL;
} }
vout_window_t *window = vout_window_New(VLC_OBJECT(vout), NULL, vout_window_t *window = vout_window_New(VLC_OBJECT(vout), "$window",
&cfg_override); &cfg_override);
if (!window) if (!window)
return NULL; return NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment