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

Add GST_TAG_LANGUAGE_CODE as we have in 0.8, and don't spew out a warning if a tag that is already registered is re-r...

Browse source 
Original commit message from CVS:
* docs/gst/gstreamer-sections.txt:
* gst/gsttag.c: (_gst_tag_initialize), (gst_tag_register):
* gst/gsttag.h:
Add GST_TAG_LANGUAGE_CODE as we have in 0.8, and don't
spew out a warning if a tag that is already registered
is re-registered, unless it is re-registered with a
different type (#308438).
This commit is contained in:
Tim-Philipp Müller 2005-08-13 10:33:22 +00:00
parent f40be99d4b
commit 680ddc0cea
6 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2005-08-13 Tim-Philipp Müller <tim at centricular dot net>
* docs/gst/gstreamer-sections.txt:
* gst/gsttag.c: (_gst_tag_initialize), (gst_tag_register):
* gst/gsttag.h:
Add GST_TAG_LANGUAGE_CODE as we have in 0.8, and don't
spew out a warning if a tag that is already registered
is re-registered, unless it is re-registered with a
different type (#308438).
2005-08-12 Tim-Philipp Müller <tim at centricular dot net> 2005-08-12 Tim-Philipp Müller <tim at centricular dot net>
* docs/pwg/appendix-porting.xml: * docs/pwg/appendix-porting.xml:

1
docs/gst/gstreamer-sections.txt
View file

@ -1319,6 +1319,7 @@ GST_TAG_TRACK_GAIN
GST_TAG_TRACK_PEAK GST_TAG_TRACK_PEAK
GST_TAG_ALBUM_GAIN GST_TAG_ALBUM_GAIN
GST_TAG_ALBUM_PEAK GST_TAG_ALBUM_PEAK
GST_TAG_LANGUAGE_CODE
<SUBSECTION Standard> <SUBSECTION Standard>
GST_TAG_LIST GST_TAG_LIST
GST_IS_TAG_LIST GST_IS_TAG_LIST

9
gst/gsttag.c
View file

@ -188,6 +188,9 @@ _gst_tag_initialize (void)
G_TYPE_DOUBLE, _("replaygain album gain"), _("album gain in db"), NULL); G_TYPE_DOUBLE, _("replaygain album gain"), _("album gain in db"), NULL);
gst_tag_register (GST_TAG_ALBUM_PEAK, GST_TAG_FLAG_META, gst_tag_register (GST_TAG_ALBUM_PEAK, GST_TAG_FLAG_META,
G_TYPE_DOUBLE, _("replaygain album peak"), _("peak of the album"), NULL); G_TYPE_DOUBLE, _("replaygain album peak"), _("peak of the album"), NULL);
gst_tag_register (GST_TAG_LANGUAGE_CODE, GST_TAG_FLAG_META, G_TYPE_STRING,
_("language code"),
_("language code for this stream, conforming to ISO-639-1"), NULL);
} }
/** /**
@ -277,7 +280,11 @@ gst_tag_register (const gchar * name, GstTagFlag flag, GType type,
key = g_quark_from_string (name); key = g_quark_from_string (name);
info = gst_tag_lookup (key); info = gst_tag_lookup (key);
g_return_if_fail (info == NULL);
if (info) {
g_return_if_fail (info->type == type);
return;
}
info = g_new (GstTagInfo, 1); info = g_new (GstTagInfo, 1);
info->flag = flag; info->flag = flag;

6
gst/gsttag.h
View file

@ -424,6 +424,12 @@ gboolean gst_tag_list_get_pointer_index (const GstTagList * list,
* peak of the album * peak of the album
*/ */
#define GST_TAG_ALBUM_PEAK "replaygain-album-peak" #define GST_TAG_ALBUM_PEAK "replaygain-album-peak"
/**
* GST_TAG_LANGUAGE_CODE:
*
* Language code (ISO-639-1)
*/
#define GST_TAG_LANGUAGE_CODE "language-code"
G_END_DECLS G_END_DECLS

9
gst/gsttaglist.c
View file

@ -188,6 +188,9 @@ _gst_tag_initialize (void)
G_TYPE_DOUBLE, _("replaygain album gain"), _("album gain in db"), NULL); G_TYPE_DOUBLE, _("replaygain album gain"), _("album gain in db"), NULL);
gst_tag_register (GST_TAG_ALBUM_PEAK, GST_TAG_FLAG_META, gst_tag_register (GST_TAG_ALBUM_PEAK, GST_TAG_FLAG_META,
G_TYPE_DOUBLE, _("replaygain album peak"), _("peak of the album"), NULL); G_TYPE_DOUBLE, _("replaygain album peak"), _("peak of the album"), NULL);
gst_tag_register (GST_TAG_LANGUAGE_CODE, GST_TAG_FLAG_META, G_TYPE_STRING,
_("language code"),
_("language code for this stream, conforming to ISO-639-1"), NULL);
} }
/** /**
@ -277,7 +280,11 @@ gst_tag_register (const gchar * name, GstTagFlag flag, GType type,
key = g_quark_from_string (name); key = g_quark_from_string (name);
info = gst_tag_lookup (key); info = gst_tag_lookup (key);
g_return_if_fail (info == NULL);
if (info) {
g_return_if_fail (info->type == type);
return;
}
info = g_new (GstTagInfo, 1); info = g_new (GstTagInfo, 1);
info->flag = flag; info->flag = flag;

6
gst/gsttaglist.h
View file

@ -424,6 +424,12 @@ gboolean gst_tag_list_get_pointer_index (const GstTagList * list,
* peak of the album * peak of the album
*/ */
#define GST_TAG_ALBUM_PEAK "replaygain-album-peak" #define GST_TAG_ALBUM_PEAK "replaygain-album-peak"
/**
* GST_TAG_LANGUAGE_CODE:
*
* Language code (ISO-639-1)
*/
#define GST_TAG_LANGUAGE_CODE "language-code"
G_END_DECLS G_END_DECLS