[vlc-commits] commit: Add a window variable to select the window provider ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul  8 19:52:30 2010 +0300| [0a64cb093bdd6aff27193b12a97599b1cc8ce2d3] | committer: Rémi Denis-Courmont 

Add a window variable to select the window provider

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0a64cb093bdd6aff27193b12a97599b1cc8ce2d3
---

 src/control/media_player.c      |    1 +
 src/libvlc.c                    |    3 +++
 src/video_output/video_output.c |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/control/media_player.c b/src/control/media_player.c
index 158cf3d..84f51b1 100644
--- 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 96293eb..2f4a6a9 100644
--- 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 01b8ee2..31876cc 100644
--- 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;