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 bdca15b45c20600a6ce963a53eb47c1ffa3c33a1..1a887fc6d3e2328a097ace79c71cd803c0851afe 100644 (file)
--- a/modules/video_output/drawable.c
+++ b/modules/video_output/drawable.c
@@ -7,7 +7,7 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2.0
+ * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ -15,7 +15,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  ****************************************************************************/
@@ -42,21 +42,13 @@ 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);
 
-/* TODO: move to vlc_variables.h */
-static inline void *var_GetAddress (vlc_object_t *o, const char *name)
-{
-    vlc_value_t val;
-    return var_Get (o, name, &val) ? NULL : val.p_address;
-}
-
 static vlc_mutex_t serializer = VLC_STATIC_MUTEX;
 
 /**
@@ -73,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 (VLC_OBJECT (obj->p_libvlc), "drawables-in-use");
+    used = var_GetAddress (obj->p_libvlc, "hwnd-in-use");
     if (used != NULL)
     {
         while (used[n] != NULL)
@@ -125,7 +116,7 @@ static void Close (vlc_object_t *obj)
 
     /* Remove this drawable from the list of busy ones */
     vlc_mutex_lock (&serializer);
-    used = var_GetAddress (VLC_OBJECT (obj->p_libvlc), "hwnd-in-use");
+    used = var_GetAddress (obj->p_libvlc, "hwnd-in-use");
     assert (used);
     while (used[n] != val)
     {
@@ -154,7 +145,7 @@ static int Control (vout_window_t *wnd, int query, va_list ap)
     switch (query)
     {
         case VOUT_WINDOW_SET_SIZE:   /* not allowed */
-        case VOUT_WINDOW_SET_ON_TOP: /* not allowed either, would be ugly */
+        case VOUT_WINDOW_SET_STATE: /* not allowed either, would be ugly */
             return VLC_EGENERIC;
         default:
             msg_Warn (wnd, "unsupported control query %d", query);