From a1b25e880782761bd651ae9154f03d3e5a0b69a8 Mon Sep 17 00:00:00 2001
From: gb <gb@5584edef-b1fe-4b99-b61b-dd2bab72e969>
Date: Tue, 23 Mar 2010 06:40:27 +0000
Subject: [PATCH] Add GST_VAAPI_WINDOW_XWINDOW() helper macro.

---
 docs/reference/libs/libs-sections.txt   | 3 ++-
 gst-libs/gst/vaapi/gstvaapiwindow_x11.h | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/reference/libs/libs-sections.txt b/docs/reference/libs/libs-sections.txt
index f12019b0c1..9178ba7c97 100644
--- a/docs/reference/libs/libs-sections.txt
+++ b/docs/reference/libs/libs-sections.txt
@@ -48,10 +48,10 @@ gst_vaapi_video_sink_get_type
 
 <SECTION>
 <FILE>gstvaapidisplay_x11</FILE>
-GST_VAAPI_DISPLAY_XDISPLAY
 <TITLE>GstVaapiDisplayX11</TITLE>
 GstVaapiDisplayX11
 GstVaapiDisplayX11Class
+GST_VAAPI_DISPLAY_XDISPLAY
 gst_vaapi_display_x11_new
 gst_vaapi_display_x11_new_with_display
 gst_vaapi_display_x11_get_display
@@ -70,6 +70,7 @@ GST_VAAPI_DISPLAY_X11_GET_CLASS
 <TITLE>GstVaapiWindowX11</TITLE>
 GstVaapiWindowX11
 GstVaapiWindowX11Class
+GST_VAAPI_WINDOW_XWINDOW
 gst_vaapi_window_x11_new
 gst_vaapi_window_x11_new_with_xid
 gst_vaapi_window_x11_get_xid
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_x11.h b/gst-libs/gst/vaapi/gstvaapiwindow_x11.h
index d46b996291..59fe14088d 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow_x11.h
+++ b/gst-libs/gst/vaapi/gstvaapiwindow_x11.h
@@ -51,6 +51,15 @@ G_BEGIN_DECLS
                                GST_VAAPI_TYPE_WINDOW_X11,       \
                                GstVaapiWindowX11Class))
 
+/**
+ * GST_VAAPI_WINDOW_XWINDOW:
+ * @window: a #GstVaapiWindow
+ *
+ * Macro that evaluates to the underlying X11 #Window of @window
+ */
+#define GST_VAAPI_WINDOW_XWINDOW(window) \
+    gst_vaapi_window_x11_get_xid(GST_VAAPI_WINDOW_X11(window))
+
 typedef struct _GstVaapiWindowX11               GstVaapiWindowX11;
 typedef struct _GstVaapiWindowX11Private        GstVaapiWindowX11Private;
 typedef struct _GstVaapiWindowX11Class          GstVaapiWindowX11Class;