diff options
author | Dave Robillard <dave@drobilla.net> | 2009-06-19 21:01:54 -0400 |
---|---|---|
committer | Dave Robillard <dave@drobilla.net> | 2009-06-19 21:01:54 -0400 |
commit | 925e83ee60c5406b2e5f0f39b0da0f90370efc27 (patch) | |
tree | ce01d298ed0c5d31853fa43aedc2af0779417816 /ext/sdl/sdlvideosink.c | |
parent | 7f3bcd484b465d8216ac419754450adf07e9b0d2 (diff) | |
parent | c70dbe94b5ff9a0993d852605d40c21020c59552 (diff) | |
download | gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.tar.gz gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.tar.bz2 gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.zip |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'ext/sdl/sdlvideosink.c')
-rw-r--r-- | ext/sdl/sdlvideosink.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c index ef8147ea..85f26534 100644 --- a/ext/sdl/sdlvideosink.c +++ b/ext/sdl/sdlvideosink.c @@ -948,7 +948,7 @@ gst_sdlvideosink_navigation_send_event (GstNavigation * navigation, GstSDLVideoSink *sdlvideosink = GST_SDLVIDEOSINK (navigation); GstEvent *event; GstVideoRectangle src, dst, result; - double x, y; + double x, y, old_x, old_y; GstPad *pad = NULL; src.w = GST_VIDEO_SINK_WIDTH (sdlvideosink); @@ -962,8 +962,8 @@ gst_sdlvideosink_navigation_send_event (GstNavigation * navigation, /* Our coordinates can be wrong here if we centered the video */ /* Converting pointer coordinates to the non scaled geometry */ - if (gst_structure_get_double (structure, "pointer_x", &x)) { - double old_x = x; + if (gst_structure_get_double (structure, "pointer_x", &old_x)) { + x = old_x; if (x >= result.x && x <= (result.x + result.w)) { x -= result.x; @@ -976,8 +976,8 @@ gst_sdlvideosink_navigation_send_event (GstNavigation * navigation, "coordinate from %f to %f", old_x, x); gst_structure_set (structure, "pointer_x", G_TYPE_DOUBLE, x, NULL); } - if (gst_structure_get_double (structure, "pointer_y", &y)) { - double old_y = y; + if (gst_structure_get_double (structure, "pointer_y", &old_y)) { + y = old_y; if (y >= result.y && y <= (result.y + result.h)) { y -= result.y; |