mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 12:11:13 +00:00
tests/examples/seek/seek.c: Don't let double and tripple clicks mess up our state.
Original commit message from CVS: * tests/examples/seek/seek.c: (end_scrub), (seek_cb), (start_seek), (stop_seek): Don't let double and tripple clicks mess up our state.
This commit is contained in:
parent
6eef85d9f7
commit
ac97d94384
2 changed files with 18 additions and 1 deletions
|
@ -1,3 +1,9 @@
|
|||
2006-03-29 Wim Taymans <wim@fluendo.com>
|
||||
|
||||
* tests/examples/seek/seek.c: (end_scrub), (seek_cb), (start_seek),
|
||||
(stop_seek):
|
||||
Don't let double and tripple clicks mess up our state.
|
||||
|
||||
2006-03-28 Tim-Philipp Müller <tim at centricular dot net>
|
||||
|
||||
* gst/playback/gstplaybin.c: (gen_video_element),
|
||||
|
|
|
@ -1004,6 +1004,7 @@ static void do_seek (GtkWidget * widget);
|
|||
static gboolean
|
||||
end_scrub (GtkWidget * widget)
|
||||
{
|
||||
GST_DEBUG ("end scrub, PAUSE");
|
||||
gst_element_set_state (pipeline, GST_STATE_PAUSED);
|
||||
seek_timeout_id = 0;
|
||||
|
||||
|
@ -1087,12 +1088,15 @@ seek_cb (GtkWidget * widget)
|
|||
{
|
||||
/* If the timer hasn't expired yet, then the pipeline is running */
|
||||
if (scrub && seek_timeout_id != 0) {
|
||||
GST_DEBUG ("do scrub seek, PAUSED");
|
||||
gst_element_set_state (pipeline, GST_STATE_PAUSED);
|
||||
}
|
||||
|
||||
GST_DEBUG ("do seek");
|
||||
do_seek (widget);
|
||||
|
||||
if (scrub) {
|
||||
GST_DEBUG ("do scrub seek, PLAYING");
|
||||
gst_element_set_state (pipeline, GST_STATE_PLAYING);
|
||||
|
||||
if (seek_timeout_id == 0) {
|
||||
|
@ -1121,8 +1125,13 @@ set_update_scale (gboolean active)
|
|||
static gboolean
|
||||
start_seek (GtkWidget * widget, GdkEventButton * event, gpointer user_data)
|
||||
{
|
||||
if (state == GST_STATE_PLAYING && flush_seek)
|
||||
if (event->type != GDK_BUTTON_PRESS)
|
||||
return FALSE;
|
||||
|
||||
if (state == GST_STATE_PLAYING && flush_seek) {
|
||||
GST_DEBUG ("start scrub seek, PAUSE");
|
||||
gst_element_set_state (pipeline, GST_STATE_PAUSED);
|
||||
}
|
||||
|
||||
set_update_scale (FALSE);
|
||||
|
||||
|
@ -1143,6 +1152,7 @@ stop_seek (GtkWidget * widget, gpointer user_data)
|
|||
}
|
||||
|
||||
if (!flush_seek) {
|
||||
GST_DEBUG ("do final seek");
|
||||
do_seek (widget);
|
||||
}
|
||||
|
||||
|
@ -1152,6 +1162,7 @@ stop_seek (GtkWidget * widget, gpointer user_data)
|
|||
/* Still scrubbing, so the pipeline is already playing */
|
||||
} else {
|
||||
if (state == GST_STATE_PLAYING) {
|
||||
GST_DEBUG ("stop scrub seek, PLAYING");
|
||||
gst_element_set_state (pipeline, GST_STATE_PLAYING);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue