gst-libs/gst/play/gstplay.c: seek on video sink element first.

Original commit message from CVS:
2004-01-28  Julien MOUTTE  <julien@moutte.net>

* gst-libs/gst/play/gstplay.c: (gst_play_seek_to_time): seek on video
sink element first.
* gst/videoscale/gstvideoscale.c:
(gst_videoscale_handle_src_event): Fixing src event handler.

diff --git a/ChangeLog b/ChangeLog
index fbb86c6b34c43c6f7ab919fb9192b8878e000430..2e6ca9e3d735c615b648716b6fa51175bbdf65d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-28  Julien MOUTTE  <julien@moutte.net>
+
+       * gst-libs/gst/play/gstplay.c: (gst_play_seek_to_time): seek on video
+       sink element first.
+       * gst/videoscale/gstvideoscale.c:
+       (gst_videoscale_handle_src_event): Fixing src event handler.
+
 2004-01-28  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
        * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_class_init), (gst_v4lsrc_init),

diff --git a/common b/common
index 0bcde342015b96d9a6ba3b9d9102e2a543399d96..5da247bb6f217c5c32e5ebab0d3a2014dfa452c3 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 0bcde342015b96d9a6ba3b9d9102e2a543399d96
+Subproject commit 5da247bb6f217c5c32e5ebab0d3a2014dfa452c3

diff --git a/gst-libs/gst/play/gstplay.c b/gst-libs/gst/play/gstplay.c
index d8658e49da62f0950937eaa008983663dcb5ed27..f9389ea16915cbd40b0cf9476934dee68726ce73 100644 (file)
--- a/gst-libs/gst/play/gstplay.c
+++ b/gst-libs/gst/play/gstplay.c
@@ -641,11 +641,11 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos)
       GST_IS_ELEMENT (video_sink_element)) {
     gboolean s = FALSE;
    
-    s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME |
+    s = gst_element_seek (video_sink_element, GST_FORMAT_TIME |
                           GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
                           time_nanos);
     if (!s) {
-      s = gst_element_seek (video_sink_element, GST_FORMAT_TIME |
+      s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME |
                             GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
                             time_nanos);
     }

diff --git a/gst-libs/gst/play/play.c b/gst-libs/gst/play/play.c
index d8658e49da62f0950937eaa008983663dcb5ed27..f9389ea16915cbd40b0cf9476934dee68726ce73 100644 (file)
--- a/gst-libs/gst/play/play.c
+++ b/gst-libs/gst/play/play.c
@@ -641,11 +641,11 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos)
       GST_IS_ELEMENT (video_sink_element)) {
     gboolean s = FALSE;
    
-    s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME |
+    s = gst_element_seek (video_sink_element, GST_FORMAT_TIME |
                           GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
                           time_nanos);
     if (!s) {
-      s = gst_element_seek (video_sink_element, GST_FORMAT_TIME |
+      s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME |
                             GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
                             time_nanos);
     }

diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c
index bc045bf3088a724d9d11b1c6829d5e04a2736745..ca556562f07d280112407e214a458feca6286628 100644 (file)
--- a/gst/videoscale/gstvideoscale.c
+++ b/gst/videoscale/gstvideoscale.c
@@ -321,14 +321,15 @@ gst_videoscale_handle_src_event (GstPad *pad, GstEvent *event)
         gst_structure_set (structure, "pointer_y", G_TYPE_DOUBLE,
             a*videoscale->from_height/videoscale->to_height, NULL);
       }
+      gst_event_unref (event);
       new_event = gst_event_new (GST_EVENT_NAVIGATION);
       new_event->event_data.structure.structure = structure;
-      gst_pad_send_event (gst_pad_get_peer (videoscale->sinkpad), new_event);
+      return gst_pad_event_default (pad, new_event);
       break;
     default:
+      return gst_pad_event_default (pad, event);
       break;
   }
-  return TRUE;
 }
 
 static void