Add a window variable to select the window provider

diff --git a/src/control/media_player.c b/src/control/media_player.c
index 158cf3d5515542adcfa43786469a3b0736530539..84f51b1f150043c0779823830c1e675d8f36901b 100644 (file)
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -367,6 +367,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
     var_Create (mp, "rate", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT);
 
     /* Video */
+    var_Create (mp, "window", VLC_VAR_STRING);
     var_Create (mp, "drawable-xid", VLC_VAR_INTEGER);
 #ifdef WIN32
     var_Create (mp, "drawable-hwnd", VLC_VAR_ADDRESS);

diff --git a/src/libvlc.c b/src/libvlc.c
index 96293ebb09de0b54462d1fbcc5c9dd49a80e20f0..2f4a6a9bc47361674daeedf609d4bf76badd5866 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -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, "record-file", VLC_VAR_STRING );
 
+    /* vout window provider */
+    var_Create( p_libvlc, "window", VLC_VAR_STRING );
+
     /* Initialize playlist and get commandline files */
     p_playlist = playlist_Create( VLC_OBJECT(p_libvlc) );
     if( !p_playlist )

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 01b8ee247457342aee1dfd95d6233795124f9060..31876cc38dffff90d5631c9af73b305bd2d84f38 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -502,7 +502,7 @@ vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
         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);
     if (!window)
         return NULL;