mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-libs/gst/xoverlay/xoverlay.*: replace XID with unsigned long to get rid of the xlibs dependency in

Browse source 
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:
Benjamin Otte 2004-03-12 21:43:25 +00:00
parent a008df2d01
commit 19d221ba71
5 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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>
* gst/effectv/gstaging.c: (gst_agingtv_base_init),
(gst_agingtv_setup):

4
gst-libs/gst/interfaces/xoverlay.c
View file

@ -107,7 +107,7 @@ gst_x_overlay_base_init (gpointer g_class)
* stop using that window and create an internal one.
*/
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);
@ -126,7 +126,7 @@ gst_x_overlay_set_xwindow_id (GstXOverlay *overlay, XID xwindow_id)
* This function should be used by video overlay developpers.
*/
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 (GST_IS_X_OVERLAY (overlay));

9
gst-libs/gst/interfaces/xoverlay.h
View file

@ -24,7 +24,6 @@
#define __GST_X_OVERLAY_H__
#include <gst/gst.h>
#include <X11/Xlib.h>
G_BEGIN_DECLS
@ -49,7 +48,7 @@ typedef struct _GstXOverlayClass {
/* virtual functions */
void (* set_xwindow_id) (GstXOverlay *overlay,
XID xwindow_id);
gulong xwindow_id);
/* optional virtual functions */
void (* get_desired_size) (GstXOverlay *overlay,
guint *width,
@ -58,7 +57,7 @@ typedef struct _GstXOverlayClass {
/* signals */
void (*have_xwindow_id) (GstXOverlay *overlay,
XID xwindow_id);
gulong xwindow_id);
void (* desired_size) (GstXOverlay *overlay,
guint width,
guint height);
@ -69,12 +68,12 @@ typedef struct _GstXOverlayClass {
GType gst_x_overlay_get_type (void);
/* 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_expose (GstXOverlay *overlay);
/* 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);
G_END_DECLS

4
gst-libs/gst/xoverlay/xoverlay.c
View file

@ -107,7 +107,7 @@ gst_x_overlay_base_init (gpointer g_class)
* stop using that window and create an internal one.
*/
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);
@ -126,7 +126,7 @@ gst_x_overlay_set_xwindow_id (GstXOverlay *overlay, XID xwindow_id)
* This function should be used by video overlay developpers.
*/
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 (GST_IS_X_OVERLAY (overlay));

9
gst-libs/gst/xoverlay/xoverlay.h
View file

@ -24,7 +24,6 @@
#define __GST_X_OVERLAY_H__
#include <gst/gst.h>
#include <X11/Xlib.h>
G_BEGIN_DECLS
@ -49,7 +48,7 @@ typedef struct _GstXOverlayClass {
/* virtual functions */
void (* set_xwindow_id) (GstXOverlay *overlay,
XID xwindow_id);
gulong xwindow_id);
/* optional virtual functions */
void (* get_desired_size) (GstXOverlay *overlay,
guint *width,
@ -58,7 +57,7 @@ typedef struct _GstXOverlayClass {
/* signals */
void (*have_xwindow_id) (GstXOverlay *overlay,
XID xwindow_id);
gulong xwindow_id);
void (* desired_size) (GstXOverlay *overlay,
guint width,
guint height);
@ -69,12 +68,12 @@ typedef struct _GstXOverlayClass {
GType gst_x_overlay_get_type (void);
/* 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_expose (GstXOverlay *overlay);
/* 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);
G_END_DECLS