From e286db3ce61a8bf8807dd4898f8903ae653ed5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 8 Dec 2011 01:20:24 +0000 Subject: [PATCH] Revert "tests: fix audiocdsrc for changed preroll behaviour" This reverts commit 2c9d442d51dd681463ae090c3c57320a90a4f888. Behaviour changed again, so revert this. --- tests/check/libs/audiocdsrc.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/tests/check/libs/audiocdsrc.c b/tests/check/libs/audiocdsrc.c index 599745f5a6..d67399ec93 100644 --- a/tests/check/libs/audiocdsrc.c +++ b/tests/check/libs/audiocdsrc.c @@ -329,21 +329,10 @@ GST_START_TEST (test_discid_calculations) GST_CD_FOO_SRC (foosrc)->cur_disc = i; gst_element_set_state (pipeline, GST_STATE_PLAYING); - /* TAG messages are queued and only rendered after the preroll object has - * been prerolled (and ASYNC_DONE was posted), the TAG event got queued for - * processing/posting after that */ - GST_LOG ("waiting for ASYNC_DONE message on the bus"); - msg = - gst_bus_timed_pop_filtered (GST_ELEMENT_BUS (pipeline), - GST_CLOCK_TIME_NONE, GST_MESSAGE_ASYNC_DONE); - gst_message_unref (msg); - - GST_LOG ("waiting for TAG message on the bus"); msg = gst_bus_timed_pop_filtered (GST_ELEMENT_BUS (pipeline), GST_CLOCK_TIME_NONE, GST_MESSAGE_TAG); gst_message_parse_tag (msg, &tags); - GST_LOG ("got tags: %" GST_PTR_FORMAT, tags); fail_unless (tags != NULL); fail_unless (tag_list_has_tag (tags, "track-count", G_TYPE_UINT)); fail_unless (tag_list_has_tag (tags, "track-number", G_TYPE_UINT)); @@ -356,6 +345,11 @@ GST_START_TEST (test_discid_calculations) gst_tag_list_free (tags); gst_message_unref (msg); + msg = + gst_bus_timed_pop_filtered (GST_ELEMENT_BUS (pipeline), + GST_CLOCK_TIME_NONE, GST_MESSAGE_ASYNC_DONE); + gst_message_unref (msg); + gst_element_set_state (pipeline, GST_STATE_NULL); }