Segregate vout window types

diff --git a/include/vlc_window.h b/include/vlc_window.h
index a0fe0ece8e0829e005fb66eb7fa1935faffe322e..a002f3a23caab1c2ba72073e9582d4b0bc005d3c 100644 (file)
--- a/include/vlc_window.h
+++ b/include/vlc_window.h
@@ -51,8 +51,22 @@ struct vout_window_t
     int (*control) (struct vout_window_t *, int, va_list);
 };
 
-VLC_EXPORT( vout_window_t *, vout_RequestWindow, ( vout_thread_t *, int *, int *, unsigned int *, unsigned int * ) );
+VLC_EXPORT( vout_window_t *, vout_RequestWindow, ( vout_thread_t *, const char *, int *, int *, unsigned int *, unsigned int * ) );
 VLC_EXPORT( void,   vout_ReleaseWindow, ( vout_window_t * ) );
 VLC_EXPORT( int, vout_ControlWindow, ( vout_window_t *, int, va_list ) );
 
+static inline vout_window_t *
+vout_RequestXWindow (vout_thread_t *vout,
+                     int *x, int *y, unsigned *w, unsigned *h)
+{
+    return vout_RequestWindow (vout, "xwindow", x, y, w, h);
+}
+
+static inline vout_window_t *
+vout_RequestHWND (vout_thread_t *vout,
+                  int *x, int *y, unsigned *w, unsigned *h)
+{
+    return vout_RequestWindow (vout, "hwnd", x, y, w, h);
+}
+
 #endif /* !LIBVLCCORE_WINDOW_H */

diff --git a/modules/gui/maemo/maemo.c b/modules/gui/maemo/maemo.c
index 7ed5c39df21e4b316d9cb3f32172cb4aca014537..069006298db70711299c949f4e9821c5b8e572de 100644 (file)
--- a/modules/gui/maemo/maemo.c
+++ b/modules/gui/maemo/maemo.c
@@ -70,7 +70,7 @@ vlc_module_begin();
     add_shortcut( "maemo" );
 
     add_submodule();
-        set_capability( "vout_window", 50 );
+        set_capability( "xwindow", 50 );
         set_callbacks( OpenWindow, CloseWindow );
 vlc_module_end();
 

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 6ea352005ef4d09761124165c08baab0b154eb2d..816076a6bfb1e64af76ef944df83299d860ae319 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -231,9 +231,16 @@ vlc_module_begin ()
 
         set_callbacks( OpenDialogs, Close )
 
+#if defined (Q_WS_X11)
+# define WID_CAPABILITY "xwindow"
+#elif defined (WIN32)
+# define WID_CAPABILITY "hwnd"
+#endif
+#ifdef WID_CAPABILITY
     add_submodule ()
-        set_capability( "vout_window", 50 )
+        set_capability( WID_CAPABILITY, 50 )
         set_callbacks( WindowOpen, WindowClose )
+#endif
 
 vlc_module_end ()
 

diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 3e7a7a614ad82c59640ad5bc5194e126a8530ff9..221e4dd06a0ace106f83b1289c18f1cbeb58094d 100644 (file)
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -418,7 +418,7 @@ static int DirectXCreateWindow( vout_thread_t *p_vout )
 
     /* If an external window was specified, we'll draw in it. */
     p_vout->p_sys->parent_window =
-        vout_RequestWindow( p_vout, &p_vout->p_sys->i_window_x,
+        vout_RequestHWND( p_vout, &p_vout->p_sys->i_window_x,
                             &p_vout->p_sys->i_window_y,
                             &p_vout->p_sys->i_window_width,
                             &p_vout->p_sys->i_window_height );

diff --git a/modules/video_output/omapfb.c b/modules/video_output/omapfb.c
index f992700b32a9e680606745b7c5ac2e77fabceb43..df72a100713af7cb2d5599cf7e10155fd2f8ab27 100644 (file)
--- a/modules/video_output/omapfb.c
+++ b/modules/video_output/omapfb.c
@@ -669,7 +669,7 @@ static int InitWindow( vout_thread_t *p_vout )
 
         // Request window from interface
         p_sys->owner_window =
-            vout_RequestWindow( p_vout,
+            vout_RequestXWindow( p_vout,
                                 &p_sys->embedded_window.i_x,
                                 &p_sys->embedded_window.i_y,
                                 &p_sys->embedded_window.i_width,

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index 3d103ceccc8b726722104aeea7e980bca95886bb..e15dd6cea19ca93cd740c74ac0bc237ad57388eb 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -1619,7 +1619,7 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
 
     if( !p_vout->b_fullscreen )
     {
-        p_win->owner_window = vout_RequestWindow( p_vout, &p_win->i_x,
+        p_win->owner_window = vout_RequestXWindow( p_vout, &p_win->i_x,
                               &p_win->i_y, &p_win->i_width, &p_win->i_height );
         xsize_hints.base_width  = xsize_hints.width = p_win->i_width;
         xsize_hints.base_height = xsize_hints.height = p_win->i_height;

diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
index 0dac44f3e1acdaa7c5bb6e48a5eb23751be57131..f5289c7562e2a321ed7d799a79e8c9a507e60465 100644 (file)
--- a/modules/video_output/xcb/window.c
+++ b/modules/video_output/xcb/window.c
@@ -50,7 +50,7 @@ vlc_module_begin ()
     set_description (N_("(Experimental) XCB video window"))
     set_category (CAT_VIDEO)
     set_subcategory (SUBCAT_VIDEO_VOUT)
-    set_capability ("vout_window", 10)
+    set_capability ("xwindow", 10)
     set_callbacks (Open, Close)
 
     add_string ("x11-display", NULL, NULL,
@@ -114,7 +114,7 @@ static void Close (vlc_object_t *obj)
 {
     vout_window_t *wnd = (vout_window_t *)obj;
     xcb_connection_t *conn = wnd->p_sys;
-    xcb_window_t window = (uintptr_t)wnd->handle;
+    xcb_window_t window = wnd->handle.xid;
 
     xcb_unmap_window (conn, window);
     xcb_destroy_window (conn, window);

diff --git a/modules/video_output/xcb/xcb.c b/modules/video_output/xcb/xcb.c
index 035311a9efbea86ce9ee8f9cdd8bc795f0bf1c5d..e39257c4dd4f53d5aeaf14c5efcd0395bee91e0a 100644 (file)
--- a/modules/video_output/xcb/xcb.c
+++ b/modules/video_output/xcb/xcb.c
@@ -370,7 +370,7 @@ static int Init (vout_thread_t *vout)
     }
     else
     {
-        p_sys->embed = vout_RequestWindow (vout, &(int){ 0 }, &(int){ 0 },
+        p_sys->embed = vout_RequestXWindow (vout, &(int){ 0 }, &(int){ 0 },
                                             &width, &height);
         if (p_sys->embed == NULL)
         {

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 89cc5278778a6c74dd3343b8a8aee4352af05b0c..219d03008031ca65256a18faefa51f1e8c6f5da3 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -89,6 +89,7 @@ static int TitlePositionCallback( vlc_object_t *, char const *,
  * video within the resulting window, while in windowed mode.
  *
  * @param p_vout video output thread to create a window for
+ * @param psz_cap VLC module capability (window system type)
  * @param pi_x_hint pointer to store the recommended horizontal position [OUT]
  * @param pi_y_hint pointer to store the recommended vertical position [OUT]
  * @param pi_width_hint pointer to store the recommended width [OUT]
@@ -97,7 +98,7 @@ static int TitlePositionCallback( vlc_object_t *, char const *,
  * @return a vout_window_t object, or NULL in case of failure.
  * The window is released with vout_ReleaseWindow().
  */
-vout_window_t *vout_RequestWindow( vout_thread_t *p_vout,
+vout_window_t *vout_RequestWindow( vout_thread_t *p_vout, const char *psz_cap,
                           int *pi_x_hint, int *pi_y_hint,
                           unsigned int *pi_width_hint,
                           unsigned int *pi_height_hint )
@@ -125,10 +126,10 @@ vout_window_t *vout_RequestWindow( vout_thread_t *p_vout,
     wnd->pos_y = *pi_y_hint;
     vlc_object_attach (wnd, p_vout);
 
-    wnd->module = module_need (wnd, "vout_window", NULL, false);
+    wnd->module = module_need (wnd, psz_cap, NULL, false);
     if (wnd->module == NULL)
     {
-        msg_Dbg (wnd, "no window provider available");
+        msg_Dbg (wnd, "no \"%s\" window provider available", psz_cap);
         vlc_object_release (wnd);
         return NULL;
     }