Use var_Inherit* instead of var_CreateGet*.

[vlc] / modules / video_output / drawable.c

diff --git a/modules/video_output/drawable.c b/modules/video_output/drawable.c
index 54f689cb8913da1b813066c05cd1aef38e23d720..1a887fc6d3e2328a097ace79c71cd803c0851afe 100644 (file)
--- a/modules/video_output/drawable.c
+++ b/modules/video_output/drawable.c
@@ -42,10 +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_integer ("drawable-hwnd", 0, NULL, HWN_TEXT, HWND_LONGTEXT, true) /* How to ? */
-    //    change_unsaveable ()
+    add_shortcut ("embed-hwnd")
 vlc_module_end ()
 
 static int Control (vout_window_t *, int, va_list);
@@ -66,13 +65,12 @@ static int Open (vlc_object_t *obj)
         return VLC_ENOMEM;
 
     val = var_GetAddress (obj, "drawable-hwnd");
-    var_Destroy (obj, "drawable-hwn");
+    var_Destroy (obj, "drawable-hwnd");
 
     /* Keep a list of busy drawables, so we don't overlap videos if there are
      * more than one video track in the stream. */
     vlc_mutex_lock (&serializer);
-    /* TODO: per-type list of busy drawables */
-    used = var_GetAddress (obj->p_libvlc, "drawables-in-use");
+    used = var_GetAddress (obj->p_libvlc, "hwnd-in-use");
     if (used != NULL)
     {
         while (used[n] != NULL)
@@ -101,7 +99,7 @@ skip:
     if (val == NULL)
         return VLC_EGENERIC;
 
-    wnd->hwnd = val;
+    wnd->handle.hwnd = val;
     wnd->control = Control;
     wnd->sys = val;
     return VLC_SUCCESS;