summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Schwerin <maximilian.schwerin@buelowssiege.de>2008-11-07 13:58:41 +0000
committerMaximilian Schwerin <maximilian.schwerin@buelowssiege.de>2008-11-07 13:58:41 +0000
commit0b674723578edf84ba9823927c89034b0630a7f8 (patch)
treebf096c6785310827203cfe1d1604b4cf71b6ba99
parentb0d9d49638c1b738ed36afb6713ba6a1ff63e172 (diff)
downloadxine-lib-0b674723578edf84ba9823927c89034b0630a7f8.tar.gz
xine-lib-0b674723578edf84ba9823927c89034b0630a7f8.tar.bz2
Composer meta-tag
Date: Sat, 28 Jun 2008 17:29:59 +0200 This patch adds this to the FLAC demuxer.
-rw-r--r--ChangeLog1
-rw-r--r--include/xine.h.in1
-rw-r--r--src/demuxers/demux_flac.c3
3 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0840bd594..dcae92a54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ xine-lib (1.1.16) 2008-??-??
* Support H.264 and AAC streams within FLV.
* Fix timing issues (broken audio) on mingw.
* Add ID3 tag TDRC to replace/complement the deprecated tag TYER.
+ * Add a new meta-tag, "Composer", and use it in the FLAC demuxer.
xine-lib (1.1.15) 2008-08-14
* Security fixes:
diff --git a/include/xine.h.in b/include/xine.h.in
index 62cfa8747..33844a0e2 100644
--- a/include/xine.h.in
+++ b/include/xine.h.in
@@ -993,6 +993,7 @@ const char *xine_get_meta_info (xine_stream_t *stream, int info) XINE_PROTECTE
#define XINE_META_INFO_INPUT_PLUGIN 9
#define XINE_META_INFO_CDINDEX_DISCID 10
#define XINE_META_INFO_TRACK_NUMBER 11
+#define XINE_META_INFO_COMPOSER 12
/*********************************************************************
diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c
index e6d6f6376..0cc2fc6b6 100644
--- a/src/demuxers/demux_flac.c
+++ b/src/demuxers/demux_flac.c
@@ -232,6 +232,9 @@ static int open_flac_file(demux_flac_t *flac) {
} else if ((strncasecmp ("ARTIST=", comment, 7) == 0)
&& (length - 7 > 0)) {
_x_meta_info_set_utf8 (flac->stream, XINE_META_INFO_ARTIST, comment + 7);
+ } else if ((strncasecmp ("COMPOSER=", comment, 9) == 0)
+ && (length - 9 > 0)) {
+ _x_meta_info_set_utf8 (flac->stream, XINE_META_INFO_COMPOSER, comment + 9);
} else if ((strncasecmp ("ALBUM=", comment, 6) == 0)
&& (length - 6 > 0)) {
_x_meta_info_set_utf8 (flac->stream, XINE_META_INFO_ALBUM, comment + 6);