From: David Schleef Date: Fri, 7 Nov 2003 22:21:37 +0000 (+0000) Subject: I'm too lazy to comment this X-Git-Tag: 1.19.3~511^2~15138 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bed312e6a26a1d5eda02a720dca4b35ef7c05328;p=platform%2Fupstream%2Fgstreamer.git I'm too lazy to comment this Original commit message from CVS: *** empty log message *** --- diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am index 8096bd3..1757e68 100644 --- a/sys/ximage/Makefile.am +++ b/sys/ximage/Makefile.am @@ -1,9 +1,11 @@ +OTHER_LIBS = -lX11 -lXext + plugin_LTLIBRARIES = libgstximagesink.la libgstximagesink_la_SOURCES = ximagesink.c 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) \ $(top_builddir)/gst-libs/gst/navigation/libgstnavigation.la \ $(top_builddir)/gst-libs/gst/xoverlay/libgstxoverlay.la diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c index eca0a64..6a33f7a 100644 --- a/sys/ximage/ximagesink.c +++ b/sys/ximage/ximagesink.c @@ -625,18 +625,17 @@ gst_ximagesink_chain (GstPad *pad, GstData *_data) switch (e.type) { case ConfigureNotify: + /* Window got resized or moved. We do caps negotiation again to get video scaler to fit that new size */ GST_DEBUG ("ximagesink window is at %d, %d with geometry : %d,%d", e.xconfigure.x, e.xconfigure.y, e.xconfigure.width, e.xconfigure.height); - event = gst_event_new (GST_EVENT_RENEGOTIATE); - event->src = GST_OBJECT (ximagesink); - event->event_data.caps.caps = GST_CAPS_NEW ( + gst_pad_try_set_caps (ximagesink->sinkpad, GST_CAPS_NEW ( "ximagesink_videoscaling", "video/x-raw-rgb", "width", GST_PROPS_INT (e.xconfigure.width), - "height", GST_PROPS_INT (e.xconfigure.height)); + "height", GST_PROPS_INT (e.xconfigure.height))); break; case MotionNotify: /* Mouse pointer moved over our window. We send upstream