diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/flac/gstflacenc.c | 4 | ||||
| -rw-r--r-- | ext/flac/gstflactag.c | 4 | ||||
| -rw-r--r-- | ext/shout2/gstshout2.c | 7 | ||||
| -rw-r--r-- | ext/speex/gstspeexenc.c | 6 | ||||
| -rw-r--r-- | gst/avi/gstavimux.c | 2 |
6 files changed, 16 insertions, 11 deletions
@@ -1,5 +1,9 @@ 2005-11-22 Andy Wingo <wingo@pobox.com> + * Update for gst_tag_setter API changes. + +2005-11-22 Andy Wingo <wingo@pobox.com> + * ext/dv/gstdvdemux.c (gst_dvdemux_handle_sink_event) (gst_dvdemux_demux_frame) * ext/flac/gstflacdec.c (gst_flacdec_write) diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index e5a7baa6..f7edaabb 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -349,12 +349,12 @@ gst_flacenc_set_metadata (GstFlacEnc * flacenc) GstTagList *copy; g_return_if_fail (flacenc != NULL); - user_tags = gst_tag_setter_get_list (GST_TAG_SETTER (flacenc)); + user_tags = gst_tag_setter_get_tag_list (GST_TAG_SETTER (flacenc)); if ((flacenc->tags == NULL) && (user_tags == NULL)) { return; } copy = gst_tag_list_merge (user_tags, flacenc->tags, - gst_tag_setter_get_merge_mode (GST_TAG_SETTER (flacenc))); + gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (flacenc))); flacenc->meta = g_malloc (sizeof (FLAC__StreamMetadata **)); flacenc->meta[0] = diff --git a/ext/flac/gstflactag.c b/ext/flac/gstflactag.c index 05a3f038..ffb435d2 100644 --- a/ext/flac/gstflactag.c +++ b/ext/flac/gstflactag.c @@ -475,9 +475,9 @@ gst_flac_tag_chain (GstPad * pad, GstData * data) g_assert (tag->only_output_tags == FALSE); - user_tags = gst_tag_setter_get_list (GST_TAG_SETTER (tag)); + user_tags = gst_tag_setter_get_tag_list (GST_TAG_SETTER (tag)); merged_tags = gst_tag_list_merge (tag->tags, user_tags, - gst_tag_setter_get_merge_mode (GST_TAG_SETTER (tag))); + gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (tag))); if (merged_tags == NULL) { /* If we get a NULL list of tags, we must generate a padding block diff --git a/ext/shout2/gstshout2.c b/ext/shout2/gstshout2.c index 07790218..d488b9ac 100644 --- a/ext/shout2/gstshout2.c +++ b/ext/shout2/gstshout2.c @@ -291,13 +291,13 @@ gst_shout2send_set_metadata (GstShout2send * shout2send) shout_metadata_t *pmetadata; g_return_if_fail (shout2send != NULL); - user_tags = gst_tag_setter_get_list (GST_TAG_SETTER (shout2send)); + user_tags = gst_tag_setter_get_tag_list (GST_TAG_SETTER (shout2send)); if ((shout2send->tags == NULL) && (user_tags == NULL)) { return; } copy = gst_tag_list_merge (user_tags, shout2send->tags, - gst_tag_setter_get_merge_mode (GST_TAG_SETTER (shout2send))); + gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (shout2send))); /* lets get the artist and song tags */ tempmetadata = NULL; @@ -334,7 +334,8 @@ gst_shout2send_event (GstBaseSink * sink, GstEvent * event) gst_event_parse_tag (event, &list); gst_tag_list_insert (shout2send->tags, - list, gst_tag_setter_get_merge_mode (GST_TAG_SETTER (shout2send))); + list, + gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (shout2send))); /* lets get the artist and song tags */ tempmetadata = NULL; gst_tag_list_foreach ((GstTagList *) shout2send->tags, diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c index b9e12b6f..9b602237 100644 --- a/ext/speex/gstspeexenc.c +++ b/ext/speex/gstspeexenc.c @@ -652,7 +652,7 @@ gst_speexenc_set_metadata (GstSpeexEnc * speexenc) GstTagList *copy; const GstTagList *user_tags; - user_tags = gst_tag_setter_get_list (GST_TAG_SETTER (speexenc)); + user_tags = gst_tag_setter_get_tag_list (GST_TAG_SETTER (speexenc)); if (!(speexenc->tags || user_tags)) return; @@ -660,7 +660,7 @@ gst_speexenc_set_metadata (GstSpeexEnc * speexenc) "Encoded with GStreamer Speexenc"); copy = gst_tag_list_merge (user_tags, speexenc->tags, - gst_tag_setter_get_merge_mode (GST_TAG_SETTER (speexenc))); + gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (speexenc))); gst_tag_list_foreach (copy, gst_speexenc_metadata_set1, speexenc); gst_tag_list_free (copy); } @@ -874,7 +874,7 @@ gst_speexenc_sinkevent (GstPad * pad, GstEvent * event) gst_event_parse_tag (event, &list); if (speexenc->tags) { gst_tag_list_insert (speexenc->tags, list, - gst_tag_setter_get_merge_mode (GST_TAG_SETTER (speexenc))); + gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (speexenc))); } else { g_assert_not_reached (); } diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index b621d21a..084d0e28 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -639,7 +639,7 @@ gst_avimux_riff_get_avi_header (GstAviMux * avimux) size += 12; /* avi data header */ /* tags */ - iface_tags = gst_tag_setter_get_list (GST_TAG_SETTER (avimux)); + iface_tags = gst_tag_setter_get_tag_list (GST_TAG_SETTER (avimux)); if (iface_tags || avimux->tags) { size += 1024; if (iface_tags && avimux->tags) { |