mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-12 09:15:29 +00:00
gst-libs/gst/xoverlay/xoverlay.*: replace XID with unsigned long to get rid of the xlibs dependency in
Original commit message from CVS: * gst-libs/gst/xoverlay/xoverlay.c: (gst_x_overlay_set_xwindow_id), (gst_x_overlay_got_xwindow_id): * gst-libs/gst/xoverlay/xoverlay.h: replace XID with unsigned long to get rid of the xlibs dependency in XOverlay (fixes #137004)
This commit is contained in:
parent
fd3f013132
commit
be9994c745
3 changed files with 14 additions and 7 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
2004-03-12 Benjamin Otte <otte@gnome.org>
|
||||||
|
|
||||||
|
* gst-libs/gst/xoverlay/xoverlay.c: (gst_x_overlay_set_xwindow_id),
|
||||||
|
(gst_x_overlay_got_xwindow_id):
|
||||||
|
* gst-libs/gst/xoverlay/xoverlay.h:
|
||||||
|
replace XID with unsigned long to get rid of the xlibs dependency in
|
||||||
|
XOverlay (fixes #137004)
|
||||||
|
|
||||||
2004-03-13 Jan Schmidt <thaytan@mad.scientist.com>
|
2004-03-13 Jan Schmidt <thaytan@mad.scientist.com>
|
||||||
* gst/effectv/gstaging.c: (gst_agingtv_base_init),
|
* gst/effectv/gstaging.c: (gst_agingtv_base_init),
|
||||||
(gst_agingtv_setup):
|
(gst_agingtv_setup):
|
||||||
|
|
|
@ -107,7 +107,7 @@ gst_x_overlay_base_init (gpointer g_class)
|
||||||
* stop using that window and create an internal one.
|
* stop using that window and create an internal one.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
gst_x_overlay_set_xwindow_id (GstXOverlay *overlay, XID xwindow_id)
|
gst_x_overlay_set_xwindow_id (GstXOverlay *overlay, gulong xwindow_id)
|
||||||
{
|
{
|
||||||
GstXOverlayClass *klass = GST_X_OVERLAY_GET_CLASS (overlay);
|
GstXOverlayClass *klass = GST_X_OVERLAY_GET_CLASS (overlay);
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ gst_x_overlay_set_xwindow_id (GstXOverlay *overlay, XID xwindow_id)
|
||||||
* This function should be used by video overlay developpers.
|
* This function should be used by video overlay developpers.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
gst_x_overlay_got_xwindow_id (GstXOverlay *overlay, XID xwindow_id)
|
gst_x_overlay_got_xwindow_id (GstXOverlay *overlay, gulong xwindow_id)
|
||||||
{
|
{
|
||||||
g_return_if_fail (overlay != NULL);
|
g_return_if_fail (overlay != NULL);
|
||||||
g_return_if_fail (GST_IS_X_OVERLAY (overlay));
|
g_return_if_fail (GST_IS_X_OVERLAY (overlay));
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
#define __GST_X_OVERLAY_H__
|
#define __GST_X_OVERLAY_H__
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
#include <X11/Xlib.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
|
@ -49,7 +48,7 @@ typedef struct _GstXOverlayClass {
|
||||||
|
|
||||||
/* virtual functions */
|
/* virtual functions */
|
||||||
void (* set_xwindow_id) (GstXOverlay *overlay,
|
void (* set_xwindow_id) (GstXOverlay *overlay,
|
||||||
XID xwindow_id);
|
gulong xwindow_id);
|
||||||
/* optional virtual functions */
|
/* optional virtual functions */
|
||||||
void (* get_desired_size) (GstXOverlay *overlay,
|
void (* get_desired_size) (GstXOverlay *overlay,
|
||||||
guint *width,
|
guint *width,
|
||||||
|
@ -58,7 +57,7 @@ typedef struct _GstXOverlayClass {
|
||||||
|
|
||||||
/* signals */
|
/* signals */
|
||||||
void (*have_xwindow_id) (GstXOverlay *overlay,
|
void (*have_xwindow_id) (GstXOverlay *overlay,
|
||||||
XID xwindow_id);
|
gulong xwindow_id);
|
||||||
void (* desired_size) (GstXOverlay *overlay,
|
void (* desired_size) (GstXOverlay *overlay,
|
||||||
guint width,
|
guint width,
|
||||||
guint height);
|
guint height);
|
||||||
|
@ -69,12 +68,12 @@ typedef struct _GstXOverlayClass {
|
||||||
GType gst_x_overlay_get_type (void);
|
GType gst_x_overlay_get_type (void);
|
||||||
|
|
||||||
/* virtual class function wrappers */
|
/* virtual class function wrappers */
|
||||||
void gst_x_overlay_set_xwindow_id (GstXOverlay *overlay, XID xwindow_id);
|
void gst_x_overlay_set_xwindow_id (GstXOverlay *overlay, gulong xwindow_id);
|
||||||
void gst_x_overlay_get_desired_size (GstXOverlay *overlay, guint *width, guint *height);
|
void gst_x_overlay_get_desired_size (GstXOverlay *overlay, guint *width, guint *height);
|
||||||
void gst_x_overlay_expose (GstXOverlay *overlay);
|
void gst_x_overlay_expose (GstXOverlay *overlay);
|
||||||
|
|
||||||
/* public methods to fire signals */
|
/* public methods to fire signals */
|
||||||
void gst_x_overlay_got_xwindow_id (GstXOverlay *overlay, XID xwindow_id);
|
void gst_x_overlay_got_xwindow_id (GstXOverlay *overlay, gulong xwindow_id);
|
||||||
void gst_x_overlay_got_desired_size (GstXOverlay *overlay, guint width, guint height);
|
void gst_x_overlay_got_desired_size (GstXOverlay *overlay, guint width, guint height);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
Loading…
Reference in a new issue