diff --git a/ChangeLog b/ChangeLog index de42ad9be4..a11af7ec45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2005-07-20 Ronald S. Bultje + + * ext/ogg/gstoggmux.c: (gst_ogg_mux_get_headers), + (gst_ogg_mux_set_header_on_caps): + * ext/theora/theoraenc.c: (theora_set_header_on_caps): + * ext/vorbis/vorbisenc.c: (gst_vorbisenc_set_header_on_caps): + * ext/vorbis/vorbisparse.c: (vorbis_parse_set_header_on_caps): + * gst-libs/gst/audio/multichannel.c: + (gst_audio_set_channel_positions), + (gst_audio_set_structure_channel_positions_list): + * gst/playback/gstdecodebin.c: (dynamic_create): + * gst/playback/gstplaybasebin.c: (setup_source), (mute_group_type): + * gst/playback/gststreaminfo.c: (gst_stream_info_set_mute): + Fixes for API changes in core. + 2005-07-20 Ronald S. Bultje * gst/playback/gstplaybasebin.c: (fill_buffer): diff --git a/common b/common index 6f9b691adc..694de4dbf4 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 6f9b691adc2a0300598311671dd7c4d9d2035afa +Subproject commit 694de4dbf4827f372321f0634643a254d7edd986 diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c index 58791a2b6c..1d7d06558e 100644 --- a/ext/ogg/gstoggmux.c +++ b/ext/ogg/gstoggmux.c @@ -629,7 +629,7 @@ gst_ogg_mux_get_headers (GstOggPad * pad) streamheader = gst_structure_get_value (structure, "streamheader"); if (streamheader != NULL) { GST_LOG ("got header"); - if (G_VALUE_TYPE (streamheader) == GST_TYPE_FIXED_LIST) { + if (G_VALUE_TYPE (streamheader) == GST_TYPE_ARRAY) { GArray *bufarr = g_value_peek_pointer (streamheader); gint i; @@ -672,7 +672,7 @@ gst_ogg_mux_set_header_on_caps (GstCaps * caps, GList * buffers) structure = gst_caps_get_structure (caps, 0); /* put buffers in a fixed list */ - g_value_init (&list, GST_TYPE_FIXED_LIST); + g_value_init (&list, GST_TYPE_ARRAY); while (walk) { GstBuffer *buf = GST_BUFFER (walk->data); diff --git a/ext/theora/theoraenc.c b/ext/theora/theoraenc.c index 77ca12e76e..94d1792b17 100644 --- a/ext/theora/theoraenc.c +++ b/ext/theora/theoraenc.c @@ -438,7 +438,7 @@ theora_set_header_on_caps (GstCaps * caps, GstBuffer * buf1, GST_BUFFER_FLAG_SET (buf3, GST_BUFFER_FLAG_IN_CAPS); /* put buffers in a fixed list */ - g_value_init (&list, GST_TYPE_FIXED_LIST); + g_value_init (&list, GST_TYPE_ARRAY); g_value_init (&value, GST_TYPE_BUFFER); gst_value_set_buffer (&value, buf1); gst_value_list_append_value (&list, &value); diff --git a/ext/vorbis/vorbisenc.c b/ext/vorbis/vorbisenc.c index 9e27922316..471a82f0e5 100644 --- a/ext/vorbis/vorbisenc.c +++ b/ext/vorbis/vorbisenc.c @@ -799,7 +799,7 @@ gst_vorbisenc_set_header_on_caps (GstCaps * caps, GstBuffer * buf1, GST_BUFFER_FLAG_SET (buf3, GST_BUFFER_FLAG_IN_CAPS); /* put buffers in a fixed list */ - g_value_init (&list, GST_TYPE_FIXED_LIST); + g_value_init (&list, GST_TYPE_ARRAY); g_value_init (&value, GST_TYPE_BUFFER); gst_value_set_buffer (&value, buf1); gst_value_list_append_value (&list, &value); diff --git a/ext/vorbis/vorbisparse.c b/ext/vorbis/vorbisparse.c index a7eec8ce37..17d4b0768e 100644 --- a/ext/vorbis/vorbisparse.c +++ b/ext/vorbis/vorbisparse.c @@ -126,7 +126,7 @@ vorbis_parse_set_header_on_caps (GstVorbisParse * parse, GstCaps * caps) GST_BUFFER_FLAG_SET (buf3, GST_BUFFER_FLAG_IN_CAPS); /* put buffers in a fixed list */ - g_value_init (&list, GST_TYPE_FIXED_LIST); + g_value_init (&list, GST_TYPE_ARRAY); g_value_init (&value, GST_TYPE_BUFFER); g_value_set_boxed (&value, buf1); gst_value_list_append_value (&list, &value); diff --git a/gst-libs/gst/audio/multichannel.c b/gst-libs/gst/audio/multichannel.c index 67c055d9f0..6004cfb75a 100644 --- a/gst-libs/gst/audio/multichannel.c +++ b/gst-libs/gst/audio/multichannel.c @@ -220,7 +220,7 @@ gst_audio_set_channel_positions (GstStructure * str, /* build gvaluearray from positions */ g_value_init (&pos_val_entry, GST_TYPE_AUDIO_CHANNEL_POSITION); - g_value_init (&pos_val_arr, GST_TYPE_FIXED_LIST); + g_value_init (&pos_val_arr, GST_TYPE_ARRAY); for (n = 0; n < channels; n++) { g_value_set_enum (&pos_val_entry, pos[n]); gst_value_list_append_value (&pos_val_arr, &pos_val_entry); @@ -276,7 +276,7 @@ gst_audio_set_structure_channel_positions_list (GstStructure * str, return; /* create the array of lists */ - g_value_init (&pos_val_arr, GST_TYPE_FIXED_LIST); + g_value_init (&pos_val_arr, GST_TYPE_ARRAY); g_value_init (&pos_val_entry, GST_TYPE_AUDIO_CHANNEL_POSITION); for (n = 0; n < channels; n++) { g_value_init (&pos_val_list, GST_TYPE_LIST); diff --git a/gst/playback/gstdecodebin.c b/gst/playback/gstdecodebin.c index b78accf286..f22e76878d 100644 --- a/gst/playback/gstdecodebin.c +++ b/gst/playback/gstdecodebin.c @@ -364,7 +364,7 @@ dynamic_create (GstElement * element, GstDecodeBin * decode_bin) dyn = g_new0 (GstDynamic, 1); dyn->element = element; dyn->decode_bin = decode_bin; - dyn->np_sig_id = g_signal_connect (G_OBJECT (element), "new-pad", + dyn->np_sig_id = g_signal_connect (G_OBJECT (element), "pad-added", G_CALLBACK (new_pad), dyn); dyn->nmp_sig_id = g_signal_connect (G_OBJECT (element), "no-more-pads", G_CALLBACK (no_more_pads), dyn); diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c index d475a982d2..681c1fae43 100644 --- a/gst/playback/gstplaybasebin.c +++ b/gst/playback/gstplaybasebin.c @@ -1167,7 +1167,7 @@ setup_source (GstPlayBaseBin * play_base_bin, GST_STATE_SUCCESS) { GST_DEBUG ("waiting for first group..."); sig6 = g_signal_connect (G_OBJECT (subbin), - "state-change", G_CALLBACK (state_change), play_base_bin); + "state-changed", G_CALLBACK (state_change), play_base_bin); g_cond_wait (play_base_bin->group_cond, play_base_bin->group_lock); GST_DEBUG ("group done !"); } else { @@ -1433,7 +1433,7 @@ mute_group_type (GstPlayBaseGroup * group, GstStreamType type, gboolean mute) gst_object_unref (pad); if (mute) { - g_signal_connect (group->type[type - 1].preroll, "state-change", + g_signal_connect (group->type[type - 1].preroll, "state-changed", G_CALLBACK (muted_group_change_state), group); } else { g_signal_handlers_disconnect_by_func (group->type[type - 1].preroll, diff --git a/gst/playback/gststreaminfo.c b/gst/playback/gststreaminfo.c index 18442e461b..f3db83d1b2 100644 --- a/gst/playback/gststreaminfo.c +++ b/gst/playback/gststreaminfo.c @@ -302,7 +302,7 @@ gst_stream_info_set_mute (GstStreamInfo * stream_info, gboolean mute) GST_PAD_CAST (stream_info->object)); if (element) { if (mute) { - g_signal_connect (element, "state-change", + g_signal_connect (element, "state-changed", G_CALLBACK (stream_info_change_state), stream_info); } else { g_signal_handlers_disconnect_by_func (element,