From 9b5de88561b8952b789b7f81def94aaaae15259a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 14 Jun 2001 20:39:52 +0000 Subject: [PATCH] Fixed some minor compiler warnings. Original commit message from CVS: Fixed some minor compiler warnings. --- gst/autoplug/gstautoplugcache.c | 8 +++++--- gst/autoplug/gstautoplugger.c | 22 +++++++++++----------- gst/autoplug/gststaticautoplug.c | 9 ++++++--- gst/autoplug/gststaticautoplugrender.c | 4 ++-- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/gst/autoplug/gstautoplugcache.c b/gst/autoplug/gstautoplugcache.c index a129330351..a6e8556f8e 100644 --- a/gst/autoplug/gstautoplugcache.c +++ b/gst/autoplug/gstautoplugcache.c @@ -85,8 +85,10 @@ enum { static void gst_autoplugcache_class_init (GstAutoplugCacheClass *klass); static void gst_autoplugcache_init (GstAutoplugCache *cache); -static void gst_autoplugcache_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); -static void gst_autoplugcache_get_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); +static void gst_autoplugcache_set_property (GObject *object, guint prop_id, + const GValue *value, GParamSpec *pspec); +static void gst_autoplugcache_get_property (GObject *object, guint prop_id, + GValue *value, GParamSpec *pspec); static void gst_autoplugcache_loop (GstElement *element); @@ -333,7 +335,7 @@ GST_DEBUG(0,"caps_proxy is %d\n",cache->caps_proxy); } static void -gst_autoplugcache_get_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) +gst_autoplugcache_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { GstAutoplugCache *cache; diff --git a/gst/autoplug/gstautoplugger.c b/gst/autoplug/gstautoplugger.c index bacf0c5e74..24e25439f5 100644 --- a/gst/autoplug/gstautoplugger.c +++ b/gst/autoplug/gstautoplugger.c @@ -85,7 +85,7 @@ static void gst_autoplugger_class_init (GstAutopluggerClass *klass); static void gst_autoplugger_init (GstAutoplugger *queue); static void gst_autoplugger_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); -static void gst_autoplugger_get_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); +static void gst_autoplugger_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); //static GstElementStateReturn gst_autoplugger_change_state (GstElement *element); @@ -168,11 +168,11 @@ gst_autoplugger_init (GstAutoplugger *autoplugger) g_return_if_fail (autoplugger->cache != NULL); GST_DEBUG(GST_CAT_AUTOPLUG, "turning on caps nego proxying in cache\n"); - gtk_object_set(G_OBJECT(autoplugger->cache),"caps_proxy",TRUE,NULL); + g_object_set(G_OBJECT(autoplugger->cache),"caps_proxy",TRUE,NULL); // attach signals to the cache g_signal_connectc (G_OBJECT (autoplugger->cache), "first_buffer", - gst_autoplugger_cache_first_buffer, autoplugger, FALSE); + G_CALLBACK (gst_autoplugger_cache_first_buffer), autoplugger, FALSE); // add the cache to self gst_bin_add (GST_BIN(autoplugger), autoplugger->cache); @@ -183,13 +183,13 @@ gst_autoplugger_init (GstAutoplugger *autoplugger) // attach handlers to the typefind pads g_signal_connectc (G_OBJECT (autoplugger->cache_sinkpad), "caps_changed", - gst_autoplugger_external_sink_caps_changed, autoplugger,FALSE); + G_CALLBACK (gst_autoplugger_external_sink_caps_changed), autoplugger,FALSE); g_signal_connectc (G_OBJECT (autoplugger->cache_srcpad), "caps_changed", - gst_autoplugger_external_src_caps_changed, autoplugger,FALSE); + G_CALLBACK (gst_autoplugger_external_src_caps_changed), autoplugger,FALSE); g_signal_connectc (G_OBJECT (autoplugger->cache_sinkpad), "caps_nego_failed", - gst_autoplugger_external_sink_caps_nego_failed, autoplugger,FALSE); + G_CALLBACK (gst_autoplugger_external_sink_caps_nego_failed), autoplugger,FALSE); g_signal_connectc (G_OBJECT (autoplugger->cache_srcpad), "caps_nego_failed", - gst_autoplugger_external_src_caps_nego_failed, autoplugger,FALSE); + G_CALLBACK (gst_autoplugger_external_src_caps_nego_failed), autoplugger,FALSE); // g_signal_connectc (G_OBJECT (autoplugger->cache_sinkpad), "connected", // gst_autoplugger_external_sink_connected, autoplugger,FALSE); // g_signal_connectc (G_OBJECT (autoplugger->cache_srcpad), "connected", @@ -484,12 +484,12 @@ gst_schedule_show(GST_ELEMENT_SCHED(autoplugger)); // now reset the autoplugcache GST_DEBUG(GST_CAT_AUTOPLUG, "resetting the cache to send first buffer(s) again\n"); - gtk_object_set(G_OBJECT(autoplugger->cache),"reset",TRUE,NULL); + g_object_set(G_OBJECT(autoplugger->cache),"reset",TRUE,NULL); // attach the cache_empty handler // FIXME this is the wrong place, it shouldn't be done until we get successful caps nego! g_signal_connectc (G_OBJECT(autoplugger->cache),"cache_empty", - gst_autoplugger_cache_empty,autoplugger,FALSE); + G_CALLBACK (gst_autoplugger_cache_empty), autoplugger, FALSE); autoplugger->paused--; if (autoplugger->paused == 0) @@ -533,7 +533,7 @@ gst_schedule_show(GST_ELEMENT_SCHED(autoplugger)); autoplugger->typefind = gst_elementfactory_make("typefind","unnamed_typefind"); autoplugger->typefind_sinkpad = gst_element_get_pad(autoplugger->typefind,"sink"); g_signal_connectc (G_OBJECT(autoplugger->typefind),"have_type", - gst_autoplugger_typefind_have_type, autoplugger, FALSE); + G_CALLBACK (gst_autoplugger_typefind_have_type), autoplugger, FALSE); } // add it to self and attach it GST_DEBUG(GST_CAT_AUTOPLUG, "adding typefind to self and connecting to cache\n"); @@ -572,7 +572,7 @@ gst_autoplugger_set_property (GObject *object, guint prop_id, const GValue *valu } static void -gst_autoplugger_get_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) +gst_autoplugger_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { GstAutoplugger *autoplugger; diff --git a/gst/autoplug/gststaticautoplug.c b/gst/autoplug/gststaticautoplug.c index 51cda33fd8..d1becd2d3d 100644 --- a/gst/autoplug/gststaticautoplug.c +++ b/gst/autoplug/gststaticautoplug.c @@ -226,7 +226,8 @@ gst_autoplug_pads_autoplug (GstElement *src, GstElement *sink) if (!connected) { GST_DEBUG (0,"gstpipeline: delaying pad connections for \"%s\" to \"%s\"\n", GST_ELEMENT_NAME(src), GST_ELEMENT_NAME(sink)); - g_signal_connectc (G_OBJECT(src),"new_pad", gst_autoplug_pads_autoplug_func, sink, FALSE); + g_signal_connectc (G_OBJECT(src), "new_pad", + G_CALLBACK (gst_autoplug_pads_autoplug_func), sink, FALSE); } } @@ -459,8 +460,10 @@ differ: data->i = i; GST_DEBUG (0,"delaying the creation of a ghostpad for %s\n", GST_ELEMENT_NAME (thesrcelement)); - g_signal_connectc (G_OBJECT (thesrcelement), "new_pad", autoplug_dynamic_pad, data, FALSE); - g_signal_connectc (G_OBJECT (thesrcelement), "new_ghost_pad", autoplug_dynamic_pad, data, FALSE); + g_signal_connectc (G_OBJECT (thesrcelement), "new_pad", + G_CALLBACK (autoplug_dynamic_pad), data, FALSE); + g_signal_connectc (G_OBJECT (thesrcelement), "new_ghost_pad", + G_CALLBACK (autoplug_dynamic_pad), data, FALSE); } } } diff --git a/gst/autoplug/gststaticautoplugrender.c b/gst/autoplug/gststaticautoplugrender.c index 0c11efeed3..483c3df742 100644 --- a/gst/autoplug/gststaticautoplugrender.c +++ b/gst/autoplug/gststaticautoplugrender.c @@ -204,9 +204,9 @@ gst_autoplug_pads_autoplug (GstElement *src, GstElement *sink) GST_DEBUG (0,"gstpipeline: delaying pad connections for \"%s\" to \"%s\"\n", GST_ELEMENT_NAME(src), GST_ELEMENT_NAME(sink)); g_signal_connectc (G_OBJECT(src),"new_pad", - gst_autoplug_pads_autoplug_func, sink, FALSE); + G_CALLBACK (gst_autoplug_pads_autoplug_func), sink, FALSE); g_signal_connectc (G_OBJECT(src),"new_ghost_pad", - gst_autoplug_pads_autoplug_func, sink, FALSE); + G_CALLBACK (gst_autoplug_pads_autoplug_func), sink, FALSE); } }