From 6f673b825dbf72a34ecd112d400819758096435e Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 22 Feb 2004 15:14:24 +0000 Subject: [PATCH] configure.ac: export [_]*{gst,Gst,GST}.* symbols from plugins Original commit message from CVS: 2004-02-22 Benjamin Otte * configure.ac: export [_]*{gst,Gst,GST}.* symbols from plugins 2004-02-22 Christophe Fergeau reviewed by: Benjamin Otte * ext/lame/gstlame.c: (add_one_tag): * ext/mad/gstid3tag.c: (gst_mad_id3_to_tag_list): * ext/vorbis/vorbisenc.c: (gst_vorbisenc_get_tag_value), (gst_vorbisenc_metadata_set1): * gst/tags/gstid3tag.c: * gst/tags/gstvorbistag.c: (gst_vorbis_tag_add): apply fixes from bugs #135042 (lame can't write tags) and #133817 (add GST_ALBUM_VOLUME_{COUNT,NUMBER} tags) --- ChangeLog | 19 +++++++++++++++++++ configure.ac | 2 +- ext/lame/gstlame.c | 4 ++-- ext/mad/gstid3tag.c | 10 ++++++++++ 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d46dc6640..ead95afa78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,23 @@ +2004-02-22 Benjamin Otte + + * configure.ac: + export [_]*{gst,Gst,GST}.* symbols from plugins + +2004-02-22 Christophe Fergeau + + reviewed by: Benjamin Otte + + * ext/lame/gstlame.c: (add_one_tag): + * ext/mad/gstid3tag.c: (gst_mad_id3_to_tag_list): + * ext/vorbis/vorbisenc.c: (gst_vorbisenc_get_tag_value), + (gst_vorbisenc_metadata_set1): + * gst/tags/gstid3tag.c: + * gst/tags/gstvorbistag.c: (gst_vorbis_tag_add): + apply fixes from bugs #135042 (lame can't write tags) and #133817 + (add GST_ALBUM_VOLUME_{COUNT,NUMBER} tags) + 2004-02-22 Ramon Garcia + * configure.ac: Export only gst_plugin_desc from plugins. Note that this change only makes any effect with Linux using libtool 1.5.2 or higher. Otherwise it is silently ignored, but it would build diff --git a/configure.ac b/configure.ac index 1cc668fc5e..9c6910ebcf 100644 --- a/configure.ac +++ b/configure.ac @@ -326,7 +326,7 @@ dnl =========================================================================== plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR" AC_SUBST(plugindir) -GST_PLUGIN_LDFLAGS='-module -avoid-version -export-symbols-regex gst_plugin_desc' +GST_PLUGIN_LDFLAGS='-module -avoid-version -export-symbols-regex [_]*{gst_,Gst,GST_}.*' AC_SUBST(GST_PLUGIN_LDFLAGS) dnl these are all the gst plug-ins, compilable without additional libs diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c index c02057a6b0..0b32b4baa5 100644 --- a/ext/lame/gstlame.c +++ b/ext/lame/gstlame.c @@ -482,7 +482,7 @@ add_one_tag (const GstTagList *list, const gchar *tag, switch (gst_tag_get_type (tag)) { case G_TYPE_UINT: { guint ivalue; - if (gst_tag_list_get_uint (list, tag, &ivalue)) { + if (!gst_tag_list_get_uint (list, tag, &ivalue)) { GST_DEBUG ("Error reading \"%s\" tag value\n", tag); return; } @@ -490,7 +490,7 @@ add_one_tag (const GstTagList *list, const gchar *tag, break; } case G_TYPE_STRING: - if (gst_tag_list_get_string (list, tag, &value)) { + if (!gst_tag_list_get_string (list, tag, &value)) { GST_DEBUG ("Error reading \"%s\" tag value\n", tag); return; }; diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c index eb8faf81eb..5f152a272d 100644 --- a/ext/mad/gstid3tag.c +++ b/ext/mad/gstid3tag.c @@ -502,6 +502,16 @@ gst_mad_id3_to_tag_list(const struct id3_tag *tag) gst_tag_list_add (tag_list, GST_TAG_MERGE_APPEND, GST_TAG_TRACK_COUNT, total, NULL); } + } else if (strcmp(tag_name,GST_TAG_ALBUM_VOLUME_NUMBER) == 0) { + if (*check == '/') { + guint total; + + check++; + total = strtoul (check, &check, 10); + if (*check != '\0') break; + + gst_tag_list_add (tag_list, GST_TAG_MERGE_APPEND, GST_TAG_ALBUM_VOLUME_COUNT, total, NULL); + } } if (*check != '\0') break;