diff options
| author | Benjamin Otte <otte@gnome.org> | 2004-01-14 16:08:47 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2004-01-14 16:08:47 +0000 |
| commit | a4a8359daa1fd0e0e7d9af8088c561a70abd506e (patch) | |
| tree | a08f317dcda9f599f2edc8ee5c8ba8da97acc81a /ext | |
| parent | 56749f529f3b001e07bd00bc0d00886f356be25e (diff) | |
ext/flac/gstflacenc.c: handle tags correctly
Original commit message from CVS:
2004-01-14 Benjamin Otte <in7y118@public.uni-hamburg.de>
* ext/flac/gstflacenc.c: (gst_flacenc_set_metadata),
(gst_flacenc_chain):
handle tags correctly
* gst/tags/gstid3tag.c: (gst_tag_list_new_from_id3v1):
extract ID3v1 tags correctly
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/flac/gstflacenc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index 8ecef642..4d5e19a5 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -503,9 +503,10 @@ gst_flacenc_set_metadata (FlacEnc *flacenc) flacenc->meta = g_malloc (sizeof (FLAC__StreamMetadata **)); flacenc->meta[0] = FLAC__metadata_object_new (FLAC__METADATA_TYPE_VORBIS_COMMENT); - gst_tag_list_foreach ((GstTagList*)copy, add_one_tag, flacenc); + gst_tag_list_foreach (copy, add_one_tag, flacenc); - FLAC__seekable_stream_encoder_set_metadata(flacenc->encoder, flacenc->meta, 1); + if (FLAC__seekable_stream_encoder_set_metadata(flacenc->encoder, flacenc->meta, 1) != true) + g_warning ("Dude, i'm already initialized!"); gst_tag_list_free (copy); } @@ -534,8 +535,8 @@ gst_flacenc_chain (GstPad *pad, GstData *_data) break; case GST_EVENT_TAG: if (flacenc->tags) { - gst_tag_list_merge (flacenc->tags, gst_event_tag_get_list (event), - gst_tag_setter_get_merge_mode (GST_TAG_SETTER (flacenc))); + gst_tag_list_insert (flacenc->tags, gst_event_tag_get_list (event), + GST_TAG_MERGE_REPLACE); } else { g_assert_not_reached (); } |