From Leon Merten Lohse https://savannah.gnu.org/patch/?7532:
* discid field extraction * genre field extraction (experimental) * blocksize field extraction * read charcode from blocksize field * some unneeded comments removed * unneeded local variables removed * typos
This commit is contained in:
R. Bernstein
@@ -1,7 +1,5 @@
|
||||
/*
|
||||
$Id: cdtext_private.h,v 1.3 2008/04/22 15:29:11 karl Exp $
|
||||
|
||||
Copyright (C) 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
|
||||
Copyright (C) 2004, 2005, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -28,7 +26,7 @@
|
||||
to be helpful in debuggers where wants just to refer to the
|
||||
ISO_*_ names and get something.
|
||||
*/
|
||||
extern enum cdtext_enum1_s {
|
||||
extern const enum cdtext_enum1_s {
|
||||
CDIO_CDTEXT_MAX_PACK_DATA = 255,
|
||||
CDIO_CDTEXT_MAX_TEXT_DATA = 12,
|
||||
CDIO_CDTEXT_TITLE = 0x80,
|
||||
@@ -45,13 +43,91 @@ extern enum cdtext_enum1_s {
|
||||
CDIO_CDTEXT_BLOCKSIZE = 0x8F
|
||||
} cdtext_enums1;
|
||||
|
||||
|
||||
/*!
|
||||
* CD-Text Genre Codes
|
||||
*/
|
||||
extern const enum cdtext_genre_enum_s {
|
||||
CDIO_CDTEXT_GENRE_UNUSED = 0, /**< not used */
|
||||
CDIO_CDTEXT_GENRE_UNDEFINED = 1, /**< not defined */
|
||||
CDIO_CDTEXT_GENRE_ADULT_CONTEMP = 2, /**< Adult Contemporary */
|
||||
CDIO_CDTEXT_GENRE_ALT_ROCK = 3, /**< Alternative Rock */
|
||||
CDIO_CDTEXT_GENRE_CHILDRENS = 4, /**< Childrens Music */
|
||||
CDIO_CDTEXT_GENRE_CLASSIC = 5, /**< Classical */
|
||||
CDIO_CDTEXT_GENRE_CHRIST_CONTEMP = 6, /**< Contemporary Christian */
|
||||
CDIO_CDTEXT_GENRE_COUNTRY = 7, /**< Country */
|
||||
CDIO_CDTEXT_GENRE_DANCE = 8, /**< Dance */
|
||||
CDIO_CDTEXT_GENRE_EASY_LISTENING = 9, /**< Easy Listening */
|
||||
CDIO_CDTEXT_GENRE_EROTIC = 10, /**< Erotic */
|
||||
CDIO_CDTEXT_GENRE_FOLK = 11, /**< Folk */
|
||||
CDIO_CDTEXT_GENRE_GOSPEL = 12, /**< Gospel */
|
||||
CDIO_CDTEXT_GENRE_HIPHOP = 13, /**< Hip Hop */
|
||||
CDIO_CDTEXT_GENRE_JAZZ = 14, /**< Jazz */
|
||||
CDIO_CDTEXT_GENRE_LATIN = 15, /**< Latin */
|
||||
CDIO_CDTEXT_GENRE_MUSICAL = 16, /**< Musical */
|
||||
CDIO_CDTEXT_GENRE_NEWAGE = 17, /**< New Age */
|
||||
CDIO_CDTEXT_GENRE_OPERA = 18, /**< Opera */
|
||||
CDIO_CDTEXT_GENRE_OPERETTA = 19, /**< Operetta */
|
||||
CDIO_CDTEXT_GENRE_POP = 20, /**< Pop Music */
|
||||
CDIO_CDTEXT_GENRE_RAP = 21, /**< RAP */
|
||||
CDIO_CDTEXT_GENRE_REGGAE = 22, /**< Reggae */
|
||||
CDIO_CDTEXT_GENRE_ROCK = 23, /**< Rock Music */
|
||||
CDIO_CDTEXT_GENRE_RYTHMANDBLUES = 24, /**< Rhythm & Blues */
|
||||
CDIO_CDTEXT_GENRE_SOUNDEFFECTS = 25, /**< Sound Effects */
|
||||
CDIO_CDTEXT_GENRE_SOUNDTRACK = 26, /**< Soundtrack */
|
||||
CDIO_CDTEXT_GENRE_SPOKEN_WORD = 27, /**< Spoken Word */
|
||||
CDIO_CDTEXT_GENRE_WORLD_MUSIC = 28 /**< World Music */
|
||||
} cdtext_genre_enum;
|
||||
|
||||
/*!
|
||||
* CD-Text character codes
|
||||
*/
|
||||
extern const enum cdtext_charcode_enum_s {
|
||||
CDIO_CDTEXT_CHARCODE_ISO_8859_1 = 0x00, /**< ISO-8859-1 */
|
||||
CDIO_CDTEXT_CHARCODE_ASCII = 0x01, /**< ASCII - 7 bit */
|
||||
CDIO_CDTEXT_CHARCODE_KANJI = 0x80, /**< Music Shift-JIS Kanji -
|
||||
double byte */
|
||||
CDIO_CDTEXT_CHARCODE_KOREAN = 0x81, /**< Korean */
|
||||
CDIO_CDTEXT_CHARCODE_CHINESE = 0x82, /**< Mandarin Chinese */
|
||||
CDIO_CDTEXT_CHARCODE_UNDEFINED = 0xFF, /**< everything else */
|
||||
} cdtext_charcode_enum;
|
||||
|
||||
/*!
|
||||
* The language code is encoded as specified in ANNEX 1 to part 5 of EBU
|
||||
* Tech 32 58 -E (1991).
|
||||
*/
|
||||
extern const enum cdtext_lang_enum_s
|
||||
{
|
||||
CDIO_CDTEXT_LANG_CZECH = 0x06,
|
||||
CDIO_CDTEXT_LANG_DANISH = 0x07,
|
||||
CDIO_CDTEXT_LANG_GERMAN = 0x08,
|
||||
CDIO_CDTEXT_LANG_ENGLISH = 0x09,
|
||||
CDIO_CDTEXT_LANG_SPANISH = 0x0A,
|
||||
CDIO_CDTEXT_LANG_FRENCH = 0x0F,
|
||||
CDIO_CDTEXT_LANG_ITALIAN = 0x15,
|
||||
CDIO_CDTEXT_LANG_HUNGARIAN = 0x1b,
|
||||
CDIO_CDTEXT_LANG_DUTCH = 0x1d,
|
||||
CDIO_CDTEXT_LANG_NORWEGIAN = 0x1e,
|
||||
CDIO_CDTEXT_LANG_POLISH = 0x20,
|
||||
CDIO_CDTEXT_LANG_PORTUGUESE = 0x21,
|
||||
CDIO_CDTEXT_LANG_SLOVENE = 0x26,
|
||||
CDIO_CDTEXT_LANG_FINNISH = 0x27,
|
||||
CDIO_CDTEXT_LANG_SWEDISH = 0x28,
|
||||
CDIO_CDTEXT_LANG_RUSSIAN = 0x56,
|
||||
CDIO_CDTEXT_LANG_KOREAN = 0x65,
|
||||
CDIO_CDTEXT_LANG_JAPANESE = 0x69,
|
||||
CDIO_CDTEXT_LANG_GREEK = 0x70,
|
||||
CDIO_CDTEXT_LANG_CHINESE = 0x75,
|
||||
} cdtext_lang_enum;
|
||||
|
||||
|
||||
#define CDIO_CDTEXT_MAX_PACK_DATA 255
|
||||
#define CDIO_CDTEXT_MAX_TEXT_DATA 12
|
||||
|
||||
/* From table J.2 - Pack Type Indicator Definitions from
|
||||
Working Draft NCITS XXX T10/1364-D Revision 10G. November 12, 2001.
|
||||
*/
|
||||
/* Title of Alubm name (ID=0) or Track Titles (ID != 0) */
|
||||
/* Title of Album name (ID=0) or Track Titles (ID != 0) */
|
||||
#define CDIO_CDTEXT_TITLE 0x80
|
||||
|
||||
/* Name(s) of the performer(s) in ASCII */
|
||||
@@ -99,13 +175,13 @@ struct CDText_data
|
||||
track_t i_track;
|
||||
uint8_t seq;
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
uint8_t bDBC: 1; /* double byte character */
|
||||
uint8_t bDBC: 1; /* double byte character */
|
||||
uint8_t block: 3; /* block number 0..7 */
|
||||
uint8_t characterPosition:4; /* character position */
|
||||
#else
|
||||
uint8_t characterPosition:4; /* character position */
|
||||
uint8_t block :3; /* block number 0..7 */
|
||||
uint8_t bDBC :1; /* double byte character */
|
||||
uint8_t block :3; /* block number 0..7 */
|
||||
uint8_t bDBC :1; /* double byte character */
|
||||
#endif
|
||||
char text[CDIO_CDTEXT_MAX_TEXT_DATA];
|
||||
uint8_t crc[2];
|
||||
@@ -113,6 +189,25 @@ struct CDText_data
|
||||
|
||||
PRAGMA_END_PACKED
|
||||
|
||||
/*
|
||||
* content of BLOCKSIZE packs
|
||||
*/
|
||||
typedef struct CDText_blocksize
|
||||
{
|
||||
uint8_t charcode; /* character code */
|
||||
uint8_t i_firstTrack; /* first track number */
|
||||
uint8_t i_lastTrack; /* last track number */
|
||||
uint8_t copyright; /* cd-text information copyright byte */
|
||||
uint8_t packcount[16];/* number of packs of each type
|
||||
* 0 TITLE; 1 PERFORMER; 2 SONGWRITER; 3 COMPOSER;
|
||||
* 4 ARRANGER; 5 MESSAGE; 6 DISCID; 7 GENRE;
|
||||
* 8 TOC; 9 TOC2; 10-12 RESERVED; 13 CLOSED;
|
||||
* 14 UPC_ISRC; 15 BLOCKSIZE */
|
||||
uint8_t lastseq[8]; /* last sequence for block 0..7 */
|
||||
uint8_t langcode[8]; /* language code for block 0..7 */
|
||||
} CDText_blocksize_t;
|
||||
|
||||
|
||||
typedef struct CDText_data CDText_data_t;
|
||||
|
||||
typedef void (*set_cdtext_field_fn_t) (void *user_data, track_t i_track,
|
||||
|
||||
Reference in New Issue
Block a user