From b3308676fdeb863a982f19cba7cb70ad09753423 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 20 Jun 2012 12:31:19 +0200 Subject: [PATCH] update for bus api changes --- gst-libs/gst/video/videocontext.c | 2 +- gst/hls/gsturidownloader.c | 6 +++--- tests/examples/camerabin2/gst-camera2.c | 2 +- tests/examples/camerabin2/gst-camerabin2-test.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gst-libs/gst/video/videocontext.c b/gst-libs/gst/video/videocontext.c index e84aa21..0c97682 100644 --- a/gst-libs/gst/video/videocontext.c +++ b/gst-libs/gst/video/videocontext.c @@ -162,7 +162,7 @@ * * #if CLUTTER_WINDOWING_X11 * gst_bus_set_sync_handler (priv->bus, on_sync_message, - * clutter_x11_get_default_display ()); + * clutter_x11_get_default_display (), NULL); * #endif * * gst_object_unref (GST_OBJECT (priv->bus)); diff --git a/gst/hls/gsturidownloader.c b/gst/hls/gsturidownloader.c index 68eefad..12ddfed 100644 --- a/gst/hls/gsturidownloader.c +++ b/gst/hls/gsturidownloader.c @@ -202,7 +202,7 @@ gst_uri_downloader_bus_handler (GstBus * bus, g_free (dbg_info); /* remove the sync handler to avoid duplicated messages */ - gst_bus_set_sync_handler (downloader->priv->bus, NULL, NULL); + gst_bus_set_sync_handler (downloader->priv->bus, NULL, NULL, NULL); gst_uri_downloader_cancel (downloader); } @@ -248,7 +248,7 @@ gst_uri_downloader_stop (GstUriDownloader * downloader) GST_DEBUG_OBJECT (downloader, "Stopping source element"); /* remove the bus' sync handler */ - gst_bus_set_sync_handler (downloader->priv->bus, NULL, NULL); + gst_bus_set_sync_handler (downloader->priv->bus, NULL, NULL, NULL); /* unlink the source element from the internal pad */ pad = gst_pad_get_peer (downloader->priv->pad); if (pad) { @@ -296,7 +296,7 @@ gst_uri_downloader_set_uri (GstUriDownloader * downloader, const gchar * uri) gst_element_set_bus (GST_ELEMENT (downloader->priv->urisrc), downloader->priv->bus); gst_bus_set_sync_handler (downloader->priv->bus, - gst_uri_downloader_bus_handler, downloader); + gst_uri_downloader_bus_handler, downloader, NULL); pad = gst_element_get_static_pad (downloader->priv->urisrc, "src"); if (!pad) diff --git a/tests/examples/camerabin2/gst-camera2.c b/tests/examples/camerabin2/gst-camera2.c index fe913ee..b262063 100644 --- a/tests/examples/camerabin2/gst-camera2.c +++ b/tests/examples/camerabin2/gst-camera2.c @@ -301,7 +301,7 @@ main (int argc, char *argv[]) camera = gst_element_factory_make ("camerabin", "camera"); bus = gst_pipeline_get_bus (GST_PIPELINE (camera)); gst_bus_add_watch (bus, bus_callback, NULL); - gst_bus_set_sync_handler (bus, bus_sync_callback, NULL); + gst_bus_set_sync_handler (bus, bus_sync_callback, NULL, NULL); gst_object_unref (bus); if (!init_gtkwidgets_data ()) { diff --git a/tests/examples/camerabin2/gst-camerabin2-test.c b/tests/examples/camerabin2/gst-camerabin2-test.c index e6c299c..f72467d 100644 --- a/tests/examples/camerabin2/gst-camerabin2-test.c +++ b/tests/examples/camerabin2/gst-camerabin2-test.c @@ -672,7 +672,7 @@ setup_pipeline (void) bus = gst_pipeline_get_bus (GST_PIPELINE (camerabin)); /* Add sync handler for time critical messages that need to be handled fast */ - gst_bus_set_sync_handler (bus, sync_bus_callback, NULL); + gst_bus_set_sync_handler (bus, sync_bus_callback, NULL, NULL); /* Handle normal messages asynchronously */ gst_bus_add_watch (bus, bus_callback, NULL); gst_object_unref (bus); -- 2.7.4