Make drawable-xid a config item, so VLC can be embedded from the CLI

diff --git a/modules/video_output/drawable.c b/modules/video_output/drawable.c
index 25ef4942081bb70f25f5dcee1508bf4b943e5550..b041adaf3dda284cc67626bd2a03abba9adaaa59 100644 (file)
--- a/modules/video_output/drawable.c
+++ b/modules/video_output/drawable.c
@@ -36,6 +36,11 @@ static int  OpenXID (vlc_object_t *);
 static int  OpenHWND (vlc_object_t *);
 static void Close (vlc_object_t *);
 
+#define XID_TEXT N_("ID of the video output X window")
+#define XID_LONGTEXT N_( \
+    "VLC can embed its video output in an existing X11 window. " \
+    "This is the X identifier of that window (0 means none).")
+
 /*
  * Module descriptor
  */
@@ -46,6 +51,9 @@ vlc_module_begin ()
     set_subcategory (SUBCAT_VIDEO_VOUT)
     set_capability ("xwindow", 70)
     set_callbacks (OpenXID, Close)
+    add_integer ("drawable-xid", 0, NULL, XID_TEXT, XID_LONGTEXT, true)
+        change_unsaveable ()
+        /*change_integer_range (0, 0xffffffff)*/
 
     add_submodule ()
         set_description (N_("Embedded Windows video"))

diff --git a/src/libvlc.c b/src/libvlc.c
index 7b394e741de3d9e84e01a276576d01873f28daeb..d40a0a7e1e4bcc5050b293704c429d05f86d4a43 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -986,7 +986,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     /*
      * FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin
      */
-    var_Create( p_libvlc, "drawable-xid", VLC_VAR_INTEGER );
+    var_Create( p_libvlc, "drawable-xid", VLC_VAR_DOINHERIT|VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_ADDRESS );
     var_Create( p_libvlc, "drawable-agl", VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-gl", VLC_VAR_INTEGER );