mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-19 23:06:49 +00:00
I'm too lazy to comment this
Original commit message from CVS: *** empty log message ***
This commit is contained in:
parent
3e99a8feb0
commit
bed312e6a2
2 changed files with 6 additions and 5 deletions
|
@ -1,9 +1,11 @@
|
||||||
|
|
||||||
|
OTHER_LIBS = -lX11 -lXext
|
||||||
|
|
||||||
plugin_LTLIBRARIES = libgstximagesink.la
|
plugin_LTLIBRARIES = libgstximagesink.la
|
||||||
|
|
||||||
libgstximagesink_la_SOURCES = ximagesink.c
|
libgstximagesink_la_SOURCES = ximagesink.c
|
||||||
libgstximagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS)
|
libgstximagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS)
|
||||||
libgstximagesink_la_LIBADD = $(X_LIBS)
|
libgstximagesink_la_LIBADD = $(X_LIBS) $(OTHER_LIBS)
|
||||||
libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \
|
libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \
|
||||||
$(top_builddir)/gst-libs/gst/navigation/libgstnavigation.la \
|
$(top_builddir)/gst-libs/gst/navigation/libgstnavigation.la \
|
||||||
$(top_builddir)/gst-libs/gst/xoverlay/libgstxoverlay.la
|
$(top_builddir)/gst-libs/gst/xoverlay/libgstxoverlay.la
|
||||||
|
|
|
@ -625,18 +625,17 @@ gst_ximagesink_chain (GstPad *pad, GstData *_data)
|
||||||
switch (e.type)
|
switch (e.type)
|
||||||
{
|
{
|
||||||
case ConfigureNotify:
|
case ConfigureNotify:
|
||||||
|
|
||||||
/* Window got resized or moved. We do caps negotiation
|
/* Window got resized or moved. We do caps negotiation
|
||||||
again to get video scaler to fit that new size */
|
again to get video scaler to fit that new size */
|
||||||
GST_DEBUG ("ximagesink window is at %d, %d with geometry : %d,%d",
|
GST_DEBUG ("ximagesink window is at %d, %d with geometry : %d,%d",
|
||||||
e.xconfigure.x, e.xconfigure.y,
|
e.xconfigure.x, e.xconfigure.y,
|
||||||
e.xconfigure.width, e.xconfigure.height);
|
e.xconfigure.width, e.xconfigure.height);
|
||||||
event = gst_event_new (GST_EVENT_RENEGOTIATE);
|
gst_pad_try_set_caps (ximagesink->sinkpad, GST_CAPS_NEW (
|
||||||
event->src = GST_OBJECT (ximagesink);
|
|
||||||
event->event_data.caps.caps = GST_CAPS_NEW (
|
|
||||||
"ximagesink_videoscaling",
|
"ximagesink_videoscaling",
|
||||||
"video/x-raw-rgb",
|
"video/x-raw-rgb",
|
||||||
"width", GST_PROPS_INT (e.xconfigure.width),
|
"width", GST_PROPS_INT (e.xconfigure.width),
|
||||||
"height", GST_PROPS_INT (e.xconfigure.height));
|
"height", GST_PROPS_INT (e.xconfigure.height)));
|
||||||
break;
|
break;
|
||||||
case MotionNotify:
|
case MotionNotify:
|
||||||
/* Mouse pointer moved over our window. We send upstream
|
/* Mouse pointer moved over our window. We send upstream
|
||||||
|
|
Loading…
Reference in a new issue