claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'greenleon' of git.sv.gnu.org:/srv/git/libcdio

Browse Source 
Conflicts:
	lib/driver/image/bincue.c
This commit is contained in:
R. Bernstein
2012-03-10 16:13:58 -05:00
parent 8023341b0b 0c7c1104fd
commit 892ff0522e
32 changed files with 1672 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/cdda.right
View File

@@ -11,7 +11,8 @@ audio status: not implemented
__________________________________
CD Analysis Report
Language 0 'English':
CD-TEXT for Disc:
PERFORMER: Richard Stallman
TITLE: Join us now we have the software
PERFORMER: Richard Stallman
CD-TEXT for Track 1:

92
test/cdtext.right
View File

@@ -13,37 +13,69 @@ audio status: not implemented
__________________________________
CD Analysis Report
Language 0 'English':
CD-TEXT for Disc:
ARRANGER: The Gnu Community
COMPOSER: Another Gnu
DISC_ID: 0815 42
GENRE: Animal Soundz
MESSAGE: Gnu lives!
PERFORMER: A Gnu
SONGWRITER: A Gnu, too
TITLE: The Voice of the Gnu
UPC_EAN: 0123456789876
TITLE: Joyful Nights
PERFORMER: United Cat Orchestra
SONGWRITER: Various Songwriters
COMPOSER: Various Composers
MESSAGE: For all our fans
ARRANGER: Tom Cat
UPC_EAN: 1234567890123
GENRE: Feline classic music
DISC_ID: 1234567890
CD-TEXT for Track 1:
ARRANGER: His Brother
COMPOSER: His Brother
MESSAGE: Free the Gnu!
ISRC: DE-GNU-11-00001
PERFORMER: Gnu2
SONGWRITER: Gnu2
TITLE: I Will Survive
TITLE: Song of Joy
PERFORMER: Felix and The Purrs
SONGWRITER: Friedrich Schiller
COMPOSER: unknown
MESSAGE: Fritz and Louie once were punks
ARRANGER: Tom Cat
ISRC: XYBLG1101234
CD-TEXT for Track 2:
ARRANGER: The Guy With the Microphone
COMPOSER: The Alpha Gnu
MESSAGE: Isn't it beatiful?
ISRC: DE-GNU-11-00002
PERFORMER: Those Particular Gnus
SONGWRITER: None in Particular
TITLE: A Forest Full of Gnus
TITLE: Humpty Dumpty
PERFORMER: Catwalk Beauties
SONGWRITER: Mother Goose
MESSAGE: Pluck the goose
ISRC: XYBLG1100005
CD-TEXT for Track 3:
ARRANGER: An Even Less Famous Gnu
COMPOSER: A Not So Famous Gnu
MESSAGE: Every Gnu Is Legal!
ISRC: DE-GNU-11-00003
PERFORMER: Whatwasitsname?
SONGWRITER: A Famous Gnu
TITLE: Gnu Opera
TITLE: Mee Owwww
PERFORMER: Mia Kitten
SONGWRITER: Mia Kitten
COMPOSER: Mia Kitten
ARRANGER: Mia Kitten
ISRC: XYBLG1100006
Language 1 'German':
CD-TEXT for Disc:
TITLE: Freudvolle Nächte
PERFORMER: Vereinigtes Katzenorchester
SONGWRITER: Verschiedene Liedschreiber
COMPOSER: Verschiedene Komponisten
MESSAGE: Für alle unsere Fans
ARRANGER: Tom Cat
UPC_EAN: 1234567890123
GENRE: Katzenhafte Klassik
DISC_ID: 1234567890
CD-TEXT for Track 1:
TITLE: Lied der Freude
PERFORMER: Felix und Die Schnurrer
SONGWRITER: Friedrich Schiller
COMPOSER: Ludwig van Beethoven
MESSAGE: Fritz und Louie waren einmal Punks
ARRANGER: Tom Cat
ISRC: XYBLG1101234
CD-TEXT for Track 2:
TITLE: Rubbeldiekatz
PERFORMER: Katzengang Schönheiten
SONGWRITER: Mutter Gans
COMPOSER: unbekannt
MESSAGE: Rupft die Gans
ISRC: XYBLG1100005
CD-TEXT for Track 3:
TITLE: Mie auu
PERFORMER: Mia Kätzchen
SONGWRITER: Mia Kätzchen
COMPOSER: Mia Kätzchen
ARRANGER: Mia Kätzchen
ISRC: XYBLG1100006

2
test/check_cue.sh.in
View File

@@ -72,7 +72,7 @@ if test -f ${abs_top_srcdir}/test/data/${fname}.bin ; then
fi
else
echo "Don't see CUE file ${abs_top_srcdir}/test/data/${fname}.bin. Test $testnum skipped."
echo "Don't see binary file ${abs_top_srcdir}/test/data/${fname}.bin. Test $testnum skipped."
fi
if test -n "@HAVE_ROCK@"; then

BIN
test/data/cdtext.cdt
View File

Binary file not shown.

4
test/driver/nrg.c.in
View File

@@ -56,7 +56,7 @@ main(int argc, const char *argv[])
"Richard Stallman",
"Join us now we have the software"
};
const int cdtext_fields[NUM_FIELDS] = {CDTEXT_PERFORMER, CDTEXT_TITLE};
const int cdtext_fields[NUM_FIELDS] = {CDTEXT_FIELD_PERFORMER, CDTEXT_FIELD_TITLE};
cdio_loglevel_default = (argc > 1) ? CDIO_LOG_DEBUG : CDIO_LOG_INFO;
/* snprintf(psz_nrgfile, sizeof(psz_nrgfile)-1,
@@ -77,7 +77,7 @@ main(int argc, const char *argv[])
cdtext_t *p_cdtext = cdio_get_cdtext(p_cdio);
if (!p_cdtext) return(1);
for (i=0; i<NUM_FIELDS; i++) {
const char *psz_field = cdtext_get_const(cdtext_fields[i], 0, p_cdtext);
const char *psz_field = cdtext_get_const(p_cdtext, cdtext_fields[i], 0);
if (!psz_field)
return(2);
if (0 != strncmp(psz_field, cdtext_check[i], strlen(cdtext_check[i]))) {