mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-26 00:58:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

rename properly

Browse source 
Original commit message from CVS:
rename properly
This commit is contained in:
Thomas Vander Stichele 2004-07-29 14:08:11 +00:00
parent 6976f09876
commit 7144b47a83
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/playback/gstdecodebin.c
View file

@ -70,7 +70,7 @@ struct _GstDecodeBinClass
{ {
GstBinClass parent_class; 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); void (*unknown_type) (GstElement * element, GstCaps * caps);
}; };
@ -84,7 +84,7 @@ enum
/* signals */ /* signals */
enum enum
{ {
SIGNAL_NEW_STREAM, SIGNAL_NEW_DECODED_PAD,
SIGNAL_UNKNOWN_TYPE, SIGNAL_UNKNOWN_TYPE,
LAST_SIGNAL LAST_SIGNAL
}; };
@ -174,9 +174,10 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass)
g_param_spec_boolean ("threaded", "Threaded", "Use threads", g_param_spec_boolean ("threaded", "Threaded", "Use threads",
FALSE, G_PARAM_READWRITE)); FALSE, G_PARAM_READWRITE));
gst_decode_bin_signals[SIGNAL_NEW_STREAM] = gst_decode_bin_signals[SIGNAL_NEW_DECODED_PAD] =
g_signal_new ("new-stream", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("new-decoded-pad", G_TYPE_FROM_CLASS (klass),
G_STRUCT_OFFSET (GstDecodeBinClass, new_stream), NULL, NULL, 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, gst_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 2, G_TYPE_OBJECT,
G_TYPE_BOOLEAN); G_TYPE_BOOLEAN);
gst_decode_bin_signals[SIGNAL_UNKNOWN_TYPE] = 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 */ /* our own signal with an extra flag that this is the only pad */
g_signal_emit (G_OBJECT (decode_bin), 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); g_free (padname);
return; return;

6
gst/playback/gstplaybasebin.c
View file

@ -263,7 +263,7 @@ no_more_pads (GstElement * element, GstPlayBaseBin * play_base_bin)
} }
static void static void
new_stream (GstElement * element, GstPad * pad, gboolean last, new_decoded_pad (GstElement * element, GstPad * pad, gboolean last,
GstPlayBaseBin * play_base_bin) GstPlayBaseBin * play_base_bin)
{ {
GstStructure *structure; GstStructure *structure;
@ -274,7 +274,7 @@ new_stream (GstElement * element, GstPad * pad, gboolean last,
GstStreamType type; GstStreamType type;
GstPad *srcpad; GstPad *srcpad;
GST_DEBUG ("play base: new stream"); GST_DEBUG ("play base: new decoded pad");
caps = gst_pad_get_caps (pad); caps = gst_pad_get_caps (pad);
@ -372,7 +372,7 @@ setup_source (GstPlayBaseBin * play_base_bin)
return FALSE; return FALSE;
} }
sig1 = g_signal_connect (G_OBJECT (play_base_bin->decoder), 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", sig2 = g_signal_connect (G_OBJECT (play_base_bin->decoder), "no-more-pads",
G_CALLBACK (no_more_pads), play_base_bin); G_CALLBACK (no_more_pads), play_base_bin);
sig3 = g_signal_connect (G_OBJECT (play_base_bin->decoder), "unknown-type", sig3 = g_signal_connect (G_OBJECT (play_base_bin->decoder), "unknown-type",