diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-12-12 03:05:33 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-12-12 03:05:33 +0000 |
| commit | 8bd8e600bf475426cbcd5b8f8f89fb2d6e53ec29 (patch) | |
| tree | 96f97a7a8bc898ff7036c3a0c8ec366530c059b2 /include | |
| parent | 258ff7f5eef3a0813f04c4c78f28f50fb601bef7 (diff) | |
| parent | d6e3f2809541eb3b0753222a582d30bc13c31b55 (diff) | |
| download | xine-lib-8bd8e600bf475426cbcd5b8f8f89fb2d6e53ec29.tar.gz xine-lib-8bd8e600bf475426cbcd5b8f8f89fb2d6e53ec29.tar.bz2 | |
Merge from 1.1.
--HG--
rename : include/xine.h.in => include/xine.h
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/libspuhdmv/xine_hdmv_decoder.c => src/spu_dec/spuhdmv_decoder.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/xine.h b/include/xine.h index c82b9a4fd..b57a6d8e5 100644 --- a/include/xine.h +++ b/include/xine.h @@ -939,7 +939,7 @@ const char *xine_get_meta_info (xine_stream_t *stream, int info) XINE_PROTECTE #define XINE_META_INFO_ARTIST 2 #define XINE_META_INFO_GENRE 3 #define XINE_META_INFO_ALBUM 4 -#define XINE_META_INFO_YEAR 5 +#define XINE_META_INFO_YEAR 5 /* may be full date */ #define XINE_META_INFO_VIDEOCODEC 6 #define XINE_META_INFO_AUDIOCODEC 7 #define XINE_META_INFO_SYSTEMLAYER 8 @@ -947,6 +947,20 @@ const char *xine_get_meta_info (xine_stream_t *stream, int info) XINE_PROTECTE #define XINE_META_INFO_CDINDEX_DISCID 10 #define XINE_META_INFO_TRACK_NUMBER 11 #define XINE_META_INFO_COMPOSER 12 +/* post-1.1.17; taken from the list at http://age.hobba.nl/audio/mirroredpages/ogg-tagging.html on 2009-12-11 */ +#define XINE_META_INFO_PUBLISHER 13 +#define XINE_META_INFO_COPYRIGHT 14 +#define XINE_META_INFO_LICENSE 15 +#define XINE_META_INFO_ARRANGER 16 +#define XINE_META_INFO_LYRICIST 17 +#define XINE_META_INFO_AUTHOR 18 +#define XINE_META_INFO_CONDUCTOR 19 +#define XINE_META_INFO_PERFORMER 20 +#define XINE_META_INFO_ENSEMBLE 21 +#define XINE_META_INFO_OPUS 22 +#define XINE_META_INFO_PART 23 +#define XINE_META_INFO_PARTNUMBER 24 +#define XINE_META_INFO_LOCATION 25 /********************************************************************* |