diff options
| author | Julien Moutte <julien@moutte.net> | 2004-02-15 17:41:28 +0000 |
|---|---|---|
| committer | Julien Moutte <julien@moutte.net> | 2004-02-15 17:41:28 +0000 |
| commit | 84721705b7b6271e787ca3af2a0c9bd4324a0ce3 (patch) | |
| tree | 3227ccfbda9c7ce9864e8c17db1ba110eab26386 /gst-libs/gst | |
| parent | 4d49d36fdabb948c08a5a3f5ca7abccf6343d74b (diff) | |
| download | gst-plugins-bad-84721705b7b6271e787ca3af2a0c9bd4324a0ce3.tar.gz gst-plugins-bad-84721705b7b6271e787ca3af2a0c9bd4324a0ce3.tar.bz2 gst-plugins-bad-84721705b7b6271e787ca3af2a0c9bd4324a0ce3.zip | |
examples/gstplay/player.c: Adding some output for debugging.
Original commit message from CVS:
2004-02-15 Julien MOUTTE <julien@moutte.net>
* examples/gstplay/player.c: (got_eos), (main): Adding some
output for debugging.
* gst-libs/gst/play/play.c: (gst_play_state_change): Stop our
timeouts if we go to any state different from PLAYING.
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_seek): Fix some
more EOS bugs in riff lib.
Diffstat (limited to 'gst-libs/gst')
| -rw-r--r-- | gst-libs/gst/play/play.c | 10 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-read.c | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/gst-libs/gst/play/play.c b/gst-libs/gst/play/play.c index 0fac17bf..dfa73fd9 100644 --- a/gst-libs/gst/play/play.c +++ b/gst-libs/gst/play/play.c @@ -457,6 +457,16 @@ gst_play_state_change (GstElement *element, GstElementState old, (GSourceFunc) gst_play_get_length_callback, play); } + else { + if (play->priv->tick_id) { + g_source_remove (play->priv->tick_id); + play->priv->tick_id = 0; + } + if (play->priv->length_id) { + g_source_remove (play->priv->length_id); + play->priv->length_id = 0; + } + } if (GST_ELEMENT_CLASS (parent_class)->state_change) GST_ELEMENT_CLASS (parent_class)->state_change (element, old, state); diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c index 19d69981..40fc4005 100644 --- a/gst-libs/gst/riff/riff-read.c +++ b/gst-libs/gst/riff/riff-read.c @@ -260,6 +260,8 @@ gst_riff_read_seek (GstRiffRead *riff, break; } else if (GST_EVENT_TYPE (event) != GST_EVENT_DISCONTINUOUS) { gst_pad_event_default (riff->sinkpad, event); + if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) + return NULL; event = NULL; } } |