[vlc-commits] commit: Win32: drop drawable plugin priority to zero ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul  8 20:04:39 2010 +0300| [3778d63a32207df8e2dcc9a274fa9aa4f22ab9d8] | committer: Rémi Denis-Courmont 

Win32: drop drawable plugin priority to zero

We select it explicitly when a HWND is set for embedding.

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

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

diff --git a/modules/video_output/drawable.c b/modules/video_output/drawable.c
index a68d9db..1a887fc 100644
--- a/modules/video_output/drawable.c
+++ b/modules/video_output/drawable.c
@@ -42,8 +42,9 @@ vlc_module_begin ()
     set_description (N_("Embedded window video"))
     set_category (CAT_VIDEO)
     set_subcategory (SUBCAT_VIDEO_VOUT)
-    set_capability ("vout window hwnd", 70)
+    set_capability ("vout window hwnd", 0)
     set_callbacks (Open, Close)
+    add_shortcut ("embed-hwnd")
 vlc_module_end ()
 
 static int Control (vout_window_t *, int, va_list);
diff --git a/src/control/media_player.c b/src/control/media_player.c
index 84f51b1..7b73bf8 100644
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -845,6 +845,7 @@ void libvlc_media_player_set_hwnd( libvlc_media_player_t *p_mi,
 {
     assert (p_mi != NULL);
 #ifdef WIN32
+    var_SetString (p_mi, "window", "embed-hwnd,any");
     var_SetAddress (p_mi, "drawable-hwnd", drawable);
 #else
     (void) p_mi; (void) drawable;