From 7144b47a83872caabbc552974903ef4880870806 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Thu, 29 Jul 2004 14:08:11 +0000 Subject: [PATCH] rename properly Original commit message from CVS: rename properly --- gst/playback/gstdecodebin.c | 13 +++++++------ gst/playback/gstplaybasebin.c | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gst/playback/gstdecodebin.c b/gst/playback/gstdecodebin.c index e5c0b3567d..dbb1f3b3bf 100644 --- a/gst/playback/gstdecodebin.c +++ b/gst/playback/gstdecodebin.c @@ -70,7 +70,7 @@ struct _GstDecodeBinClass { GstBinClass parent_class; - void (*new_stream) (GstElement * element, GstPad * pad, gboolean last); + void (*new_decoded_pad) (GstElement * element, GstPad * pad, gboolean last); void (*unknown_type) (GstElement * element, GstCaps * caps); }; @@ -84,7 +84,7 @@ enum /* signals */ enum { - SIGNAL_NEW_STREAM, + SIGNAL_NEW_DECODED_PAD, SIGNAL_UNKNOWN_TYPE, LAST_SIGNAL }; @@ -174,9 +174,10 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) g_param_spec_boolean ("threaded", "Threaded", "Use threads", FALSE, G_PARAM_READWRITE)); - gst_decode_bin_signals[SIGNAL_NEW_STREAM] = - g_signal_new ("new-stream", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstDecodeBinClass, new_stream), NULL, NULL, + gst_decode_bin_signals[SIGNAL_NEW_DECODED_PAD] = + g_signal_new ("new-decoded-pad", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GstDecodeBinClass, new_decoded_pad), NULL, NULL, gst_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_BOOLEAN); gst_decode_bin_signals[SIGNAL_UNKNOWN_TYPE] = @@ -356,7 +357,7 @@ close_pad_link (GstElement * element, GstPad * pad, GstCaps * caps, /* our own signal with an extra flag that this is the only pad */ g_signal_emit (G_OBJECT (decode_bin), - gst_decode_bin_signals[SIGNAL_NEW_STREAM], 0, ghost, !dynamic); + gst_decode_bin_signals[SIGNAL_NEW_DECODED_PAD], 0, ghost, !dynamic); g_free (padname); return; diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c index 10ceb607ce..2baadd5c73 100644 --- a/gst/playback/gstplaybasebin.c +++ b/gst/playback/gstplaybasebin.c @@ -263,7 +263,7 @@ no_more_pads (GstElement * element, GstPlayBaseBin * play_base_bin) } static void -new_stream (GstElement * element, GstPad * pad, gboolean last, +new_decoded_pad (GstElement * element, GstPad * pad, gboolean last, GstPlayBaseBin * play_base_bin) { GstStructure *structure; @@ -274,7 +274,7 @@ new_stream (GstElement * element, GstPad * pad, gboolean last, GstStreamType type; GstPad *srcpad; - GST_DEBUG ("play base: new stream"); + GST_DEBUG ("play base: new decoded pad"); caps = gst_pad_get_caps (pad); @@ -372,7 +372,7 @@ setup_source (GstPlayBaseBin * play_base_bin) return FALSE; } sig1 = g_signal_connect (G_OBJECT (play_base_bin->decoder), - "new-decoded-pad", G_CALLBACK (new_stream), play_base_bin); + "new-decoded-pad", G_CALLBACK (new_decoded_pad), play_base_bin); sig2 = g_signal_connect (G_OBJECT (play_base_bin->decoder), "no-more-pads", G_CALLBACK (no_more_pads), play_base_bin); sig3 = g_signal_connect (G_OBJECT (play_base_bin->decoder), "unknown-type",