From 7bc8bee1e14833573e0bcf6e8cc89c3cf2551e39 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 12 Oct 2005 12:25:31 +0000 Subject: [PATCH] Update for _get_state() API change. Original commit message from CVS: * check/pipelines/simple_launch_lines.c: (run_pipeline): * examples/seeking/Makefile.am: * examples/seeking/cdplayer.c: (play_cb), (pause_cb), (stop_cb): * examples/seeking/seek.c: (make_avi_msmpeg4v3_mp3_pipeline), (do_seek), (set_update_scale), (message_received), (main): * gst-libs/gst/audio/gstringbuffer.c: (gst_ring_buffer_commit), (gst_ring_buffer_read), (gst_ring_buffer_clear): Update for _get_state() API change. --- ChangeLog | 11 +++++++++++ check/pipelines/simple_launch_lines.c | 2 +- common | 2 +- examples/seeking/Makefile.am | 2 +- examples/seeking/cdplayer.c | 6 +++--- examples/seeking/seek.c | 6 ++---- tests/check/pipelines/simple-launch-lines.c | 2 +- tests/examples/seek/Makefile.am | 2 +- tests/examples/seek/seek.c | 6 ++---- tests/old/examples/seek/Makefile.am | 2 +- tests/old/examples/seek/cdplayer.c | 6 +++--- 11 files changed, 27 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e513edf50..269d5ce288 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2005-10-12 Wim Taymans + + * check/pipelines/simple_launch_lines.c: (run_pipeline): + * examples/seeking/Makefile.am: + * examples/seeking/cdplayer.c: (play_cb), (pause_cb), (stop_cb): + * examples/seeking/seek.c: (make_avi_msmpeg4v3_mp3_pipeline), + (do_seek), (set_update_scale), (message_received), (main): + * gst-libs/gst/audio/gstringbuffer.c: (gst_ring_buffer_commit), + (gst_ring_buffer_read), (gst_ring_buffer_clear): + Update for _get_state() API change. + 2005-10-11 Wim Taymans * gst-libs/gst/audio/gstbaseaudiosink.c: diff --git a/check/pipelines/simple_launch_lines.c b/check/pipelines/simple_launch_lines.c index 8e45705526..fc524fc24f 100644 --- a/check/pipelines/simple_launch_lines.c +++ b/check/pipelines/simple_launch_lines.c @@ -56,7 +56,7 @@ run_pipeline (GstElement * pipe, const gchar * descr, g_assert (bus); ret = gst_element_set_state (pipe, GST_STATE_PLAYING); - ret = gst_element_get_state (pipe, NULL, NULL, NULL); + ret = gst_element_get_state (pipe, NULL, NULL, GST_CLOCK_TIME_NONE); if (ret != GST_STATE_CHANGE_SUCCESS) { g_critical ("Couldn't set pipeline to PLAYING"); goto done; diff --git a/common b/common index 615cf4d450..2485a65b66 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 615cf4d4506ef1ffb1f600c434fced1fa26b0f44 +Subproject commit 2485a65b662de25fb7b71857e34411426c6f530c diff --git a/examples/seeking/Makefile.am b/examples/seeking/Makefile.am index 6c7e5c0110..b776c57e64 100644 --- a/examples/seeking/Makefile.am +++ b/examples/seeking/Makefile.am @@ -1,4 +1,4 @@ -examples = seek # cdplayer cdparanoia +examples = seek scrubby # cdplayer cdparanoia noinst_PROGRAMS = $(examples) diff --git a/examples/seeking/cdplayer.c b/examples/seeking/cdplayer.c index 7dd5ffed9e..539d99629b 100644 --- a/examples/seeking/cdplayer.c +++ b/examples/seeking/cdplayer.c @@ -191,7 +191,7 @@ play_cb (GtkButton * button, gpointer data) { GstState state; - gst_element_get_state (pipeline, &state, NULL, NULL); + gst_element_get_state (pipeline, &state, NULL, GST_CLOCK_TIME_NONE); if (state != GST_STATE_PLAYING) { gst_element_set_state (pipeline, GST_STATE_PLAYING); update_id = @@ -204,7 +204,7 @@ pause_cb (GtkButton * button, gpointer data) { GstState state; - gst_element_get_state (pipeline, &state, NULL, NULL); + gst_element_get_state (pipeline, &state, NULL, GST_CLOCK_TIME_NONE); if (state != GST_STATE_PAUSED) { gst_element_set_state (pipeline, GST_STATE_PAUSED); gtk_timeout_remove (update_id); @@ -216,7 +216,7 @@ stop_cb (GtkButton * button, gpointer data) { GstState state; - gst_element_get_state (pipeline, &state, NULL, NULL); + gst_element_get_state (pipeline, &state, NULL, GST_CLOCK_TIME_NONE); if (state != GST_STATE_READY) { gst_element_set_state (pipeline, GST_STATE_READY); gtk_timeout_remove (update_id); diff --git a/examples/seeking/seek.c b/examples/seeking/seek.c index 963c591e9e..952460b168 100644 --- a/examples/seeking/seek.c +++ b/examples/seeking/seek.c @@ -1018,11 +1018,9 @@ do_seek (GtkWidget * widget) } if (res) { - GTimeVal tv; - gst_pipeline_set_new_stream_time (GST_PIPELINE (pipeline), 0); - GST_TIME_TO_TIMEVAL (100 * GST_MSECOND, tv); - gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, &tv); + gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, + 100 * GST_MSECOND); } else g_print ("seek failed\n"); } diff --git a/tests/check/pipelines/simple-launch-lines.c b/tests/check/pipelines/simple-launch-lines.c index 8e45705526..fc524fc24f 100644 --- a/tests/check/pipelines/simple-launch-lines.c +++ b/tests/check/pipelines/simple-launch-lines.c @@ -56,7 +56,7 @@ run_pipeline (GstElement * pipe, const gchar * descr, g_assert (bus); ret = gst_element_set_state (pipe, GST_STATE_PLAYING); - ret = gst_element_get_state (pipe, NULL, NULL, NULL); + ret = gst_element_get_state (pipe, NULL, NULL, GST_CLOCK_TIME_NONE); if (ret != GST_STATE_CHANGE_SUCCESS) { g_critical ("Couldn't set pipeline to PLAYING"); goto done; diff --git a/tests/examples/seek/Makefile.am b/tests/examples/seek/Makefile.am index 6c7e5c0110..b776c57e64 100644 --- a/tests/examples/seek/Makefile.am +++ b/tests/examples/seek/Makefile.am @@ -1,4 +1,4 @@ -examples = seek # cdplayer cdparanoia +examples = seek scrubby # cdplayer cdparanoia noinst_PROGRAMS = $(examples) diff --git a/tests/examples/seek/seek.c b/tests/examples/seek/seek.c index 963c591e9e..952460b168 100644 --- a/tests/examples/seek/seek.c +++ b/tests/examples/seek/seek.c @@ -1018,11 +1018,9 @@ do_seek (GtkWidget * widget) } if (res) { - GTimeVal tv; - gst_pipeline_set_new_stream_time (GST_PIPELINE (pipeline), 0); - GST_TIME_TO_TIMEVAL (100 * GST_MSECOND, tv); - gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, &tv); + gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, + 100 * GST_MSECOND); } else g_print ("seek failed\n"); } diff --git a/tests/old/examples/seek/Makefile.am b/tests/old/examples/seek/Makefile.am index 6c7e5c0110..b776c57e64 100644 --- a/tests/old/examples/seek/Makefile.am +++ b/tests/old/examples/seek/Makefile.am @@ -1,4 +1,4 @@ -examples = seek # cdplayer cdparanoia +examples = seek scrubby # cdplayer cdparanoia noinst_PROGRAMS = $(examples) diff --git a/tests/old/examples/seek/cdplayer.c b/tests/old/examples/seek/cdplayer.c index 7dd5ffed9e..539d99629b 100644 --- a/tests/old/examples/seek/cdplayer.c +++ b/tests/old/examples/seek/cdplayer.c @@ -191,7 +191,7 @@ play_cb (GtkButton * button, gpointer data) { GstState state; - gst_element_get_state (pipeline, &state, NULL, NULL); + gst_element_get_state (pipeline, &state, NULL, GST_CLOCK_TIME_NONE); if (state != GST_STATE_PLAYING) { gst_element_set_state (pipeline, GST_STATE_PLAYING); update_id = @@ -204,7 +204,7 @@ pause_cb (GtkButton * button, gpointer data) { GstState state; - gst_element_get_state (pipeline, &state, NULL, NULL); + gst_element_get_state (pipeline, &state, NULL, GST_CLOCK_TIME_NONE); if (state != GST_STATE_PAUSED) { gst_element_set_state (pipeline, GST_STATE_PAUSED); gtk_timeout_remove (update_id); @@ -216,7 +216,7 @@ stop_cb (GtkButton * button, gpointer data) { GstState state; - gst_element_get_state (pipeline, &state, NULL, NULL); + gst_element_get_state (pipeline, &state, NULL, GST_CLOCK_TIME_NONE); if (state != GST_STATE_READY) { gst_element_set_state (pipeline, GST_STATE_READY); gtk_timeout_remove (update_id);