mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 05:05:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

sys/: Reverting Ronald's changes as the issue is not coming from those elements. Moreover these elements should not k...

Browse source 
Original commit message from CVS:
2004-10-08  Julien MOUTTE  <julien@moutte.net>

* sys/ximage/ximagesink.c: (gst_ximagesink_sink_link),
(gst_ximagesink_set_xwindow_id), (gst_ximagesink_init):
* sys/ximage/ximagesink.h:
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_sink_link),
(gst_xvimagesink_set_xwindow_id), (gst_xvimagesink_init):
* sys/xvimage/xvimagesink.h: Reverting Ronald's changes as the issue is
not coming from those elements. Moreover these elements should not keep
the xid they have been given when in NULL state.
This commit is contained in:
Julien Moutte 2004-10-08 11:26:49 +00:00
parent b91e99d910
commit 18fff8755d
5 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2004-10-08 Julien MOUTTE <julien@moutte.net>
* sys/ximage/ximagesink.c: (gst_ximagesink_sink_link),
(gst_ximagesink_set_xwindow_id), (gst_ximagesink_init):
* sys/ximage/ximagesink.h:
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_sink_link),
(gst_xvimagesink_set_xwindow_id), (gst_xvimagesink_init):
* sys/xvimage/xvimagesink.h: Reverting Ronald's changes as the issue is
not coming from those elements. Moreover these elements should not keep
the xid they have been given when in NULL state.
2004-10-07 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* sys/ximage/ximagesink.c: (gst_ximagesink_sink_link),

10
sys/ximage/ximagesink.c
View file

@ -49,9 +49,6 @@ static void gst_ximagesink_buffer_free (GstBuffer * buffer);
static void gst_ximagesink_ximage_destroy (GstXImageSink * ximagesink,
GstXImage * ximage);
static void gst_ximagesink_set_xwindow_id (GstXOverlay * overlay,
XID xwindow_id);
/* ElementFactory information */
static GstElementDetails gst_ximagesink_details =
GST_ELEMENT_DETAILS ("Video sink",
@ -991,8 +988,8 @@ gst_ximagesink_sink_link (GstPad * pad, const GstCaps * caps)
g_assert (GST_VIDEOSINK_WIDTH (ximagesink) > 0);
g_assert (GST_VIDEOSINK_HEIGHT (ximagesink) > 0);
if (!ximagesink->xwindow) {
gst_ximagesink_set_xwindow_id (GST_X_OVERLAY (ximagesink),
ximagesink->parent);
ximagesink->xwindow = gst_ximagesink_xwindow_new (ximagesink,
GST_VIDEOSINK_WIDTH (ximagesink), GST_VIDEOSINK_HEIGHT (ximagesink));
} else {
if (ximagesink->xwindow->internal) {
gst_ximagesink_xwindow_resize (ximagesink, ximagesink->xwindow,
@ -1383,8 +1380,6 @@ gst_ximagesink_set_xwindow_id (GstXOverlay * overlay, XID xwindow_id)
if (xwindow)
ximagesink->xwindow = xwindow;
ximagesink->parent = xwindow_id;
}
static void
@ -1539,7 +1534,6 @@ gst_ximagesink_init (GstXImageSink * ximagesink)
gst_ximagesink_buffer_alloc);
ximagesink->display_name = NULL;
ximagesink->parent = 0;
ximagesink->xcontext = NULL;
ximagesink->xwindow = NULL;
ximagesink->ximage = NULL;

1
sys/ximage/ximagesink.h
View file

@ -112,7 +112,6 @@ struct _GstXImageSink {
char *display_name;
Drawable parent;
GstXContext *xcontext;
GstXWindow *xwindow;
GstXImage *ximage;

8
sys/xvimage/xvimagesink.c
View file

@ -50,8 +50,6 @@ static void gst_xvimagesink_buffer_free (GstBuffer * buffer);
static void gst_xvimagesink_xvimage_destroy (GstXvImageSink * xvimagesink,
GstXvImage * xvimage);
static void gst_xvimagesink_set_xwindow_id (GstXOverlay * overlay,
XID xwindow_id);
/* ElementFactory information */
static GstElementDetails gst_xvimagesink_details =
@ -1280,8 +1278,8 @@ gst_xvimagesink_sink_link (GstPad * pad, const GstCaps * caps)
g_assert (GST_VIDEOSINK_WIDTH (xvimagesink) > 0);
g_assert (GST_VIDEOSINK_HEIGHT (xvimagesink) > 0);
if (!xvimagesink->xwindow)
gst_xvimagesink_set_xwindow_id (GST_X_OVERLAY (xvimagesink),
xvimagesink->parent);
xvimagesink->xwindow = gst_xvimagesink_xwindow_new (xvimagesink,
GST_VIDEOSINK_WIDTH (xvimagesink), GST_VIDEOSINK_HEIGHT (xvimagesink));
else {
if (xvimagesink->xwindow->internal)
gst_xvimagesink_xwindow_resize (xvimagesink, xvimagesink->xwindow,
@ -1644,7 +1642,6 @@ gst_xvimagesink_set_xwindow_id (GstXOverlay * overlay, XID xwindow_id)
if (xwindow)
xvimagesink->xwindow = xwindow;
xvimagesink->parent = xwindow_id;
}
static void
@ -1918,7 +1915,6 @@ gst_xvimagesink_init (GstXvImageSink * xvimagesink)
gst_xvimagesink_buffer_alloc);
xvimagesink->display_name = NULL;
xvimagesink->parent = 0;
xvimagesink->xcontext = NULL;
xvimagesink->xwindow = NULL;
xvimagesink->xvimage = NULL;

1
sys/xvimage/xvimagesink.h
View file

@ -128,7 +128,6 @@ struct _GstXvImageSink {
char *display_name;
Drawable parent;
GstXContext *xcontext;
GstXWindow *xwindow;
GstXvImage *xvimage;