]> git.sesse.net Git - vlc/commitdiff
Win32: drop drawable plugin priority to zero
authorRémi Denis-Courmont <remi@remlab.net>
Thu, 8 Jul 2010 17:04:39 +0000 (20:04 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Thu, 8 Jul 2010 17:08:36 +0000 (20:08 +0300)
We select it explicitly when a HWND is set for embedding.

modules/video_output/drawable.c
src/control/media_player.c

index a68d9dbd65822dbbe9edde561909450aaaab4e7a..1a887fc6d3e2328a097ace79c71cd803c0851afe 100644 (file)
@@ -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);
index 84f51b1f150043c0779823830c1e675d8f36901b..7b73bf8278ccd1e320a58ea5caebe740c5f06ac5 100644 (file)
@@ -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;