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

Revise OO CD-Text CPP for different interface. Update copyright and untabify some files.

Browse Source
This commit is contained in:
R. Bernstein
2012-03-03 07:55:27 -05:00
parent 2b84a552e3
commit dde01f420a
3 changed files with 64 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
example/C++/OO/cdtext.cpp
View File

@@ -1,7 +1,5 @@
/* /*
$Id: cdtext.cpp,v 1.4 2008/03/24 15:30:57 karl Exp $ Copyright (C) 2005, 2008, 2009, 2012 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -23,7 +21,6 @@
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#define __CDIO_CONFIG_H__ 1
#endif #endif
#ifdef HAVE_STDIO_H #ifdef HAVE_STDIO_H
@@ -41,16 +38,17 @@
static void static void
print_cdtext_track_info(CdioDevice *device, track_t i_track, print_cdtext_track_info(CdioDevice *device, track_t i_track,
const char *psz_msg) { const char *psz_msg) {
cdtext_t *cdtext = device->getCdtext(0); cdtext_t *cdtext = device->getCdtext();
if (NULL != cdtext) { if (NULL != cdtext) {
cdtext_field_t i; cdtext_field_t i;
printf("%s\n", psz_msg); printf("%s\n", psz_msg);
for (i= (cdtext_field_t) MIN_CDTEXT_FIELD; i < MAX_CDTEXT_FIELDS; i++) { for (i= (cdtext_field_t) MIN_CDTEXT_FIELD; i < MAX_CDTEXT_FIELDS; i++) {
if (cdtext->field[i]) { if (cdtext_get_const(i, i_track, cdtext)) {
printf("\t%s: %s\n", cdtext_field2str(i), cdtext->field[i]); printf("\t%s: %s\n", cdtext_field2str(i),
cdtext_get_const(i, i_track, cdtext));
} }
} }
} }

91
example/cdtext.c
View File

@@ -1,5 +1,5 @@
/* /*
Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011 Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011, 2012
Rocky Bernstein <rocky@gnu.org> Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
@@ -35,70 +35,71 @@
static void static void
print_cdtext_track_info(cdtext_t *cdtext, track_t i_track, const char *psz_msg) { print_cdtext_track_info(cdtext_t *cdtext, track_t i_track, const char *psz_msg) {
cdtext_field_t i; cdtext_field_t i;
printf("%s\n", psz_msg); printf("%s\n", psz_msg);
for (i=0; i < MAX_CDTEXT_FIELDS; i++) { for (i=0; i < MAX_CDTEXT_FIELDS; i++) {
if (cdtext_get_const(i, i_track, cdtext)) { if (cdtext_get_const(i, i_track, cdtext)) {
printf("\t%s: %s\n", cdtext_field2str(i), cdtext_get_const(i, i_track, cdtext)); printf("\t%s: %s\n", cdtext_field2str(i), cdtext_get_const(i, i_track, cdtext));
}
} }
}
} }
static void static void
print_disc_info(CdIo_t *p_cdio, track_t i_tracks, track_t i_first_track) { print_disc_info(CdIo_t *p_cdio, track_t i_tracks, track_t i_first_track) {
track_t i_last_track = i_first_track+i_tracks; track_t i_last_track = i_first_track+i_tracks;
discmode_t cd_discmode = cdio_get_discmode(p_cdio); discmode_t cd_discmode = cdio_get_discmode(p_cdio);
cdtext_t *cdtext = cdio_get_cdtext(p_cdio); cdtext_t *cdtext = cdio_get_cdtext(p_cdio);
printf("%s\n", discmode2str[cd_discmode]); printf("%s\n", discmode2str[cd_discmode]);
if (NULL == cdtext) if (NULL == cdtext)
{ {
printf("\nNo CD-Text found on Disc."); printf("\nNo CD-Text found on Disc.");
return; return;
} }
printf("Encoding: %s; Language: %s\n", cdtext->encoding, cdtext->language); printf("Encoding: %s; Language: %s\n", cdtext->encoding, cdtext->language);
print_cdtext_track_info(cdtext, 0, "\nCD-Text for Disc:"); print_cdtext_track_info(cdtext, 0, "\nCD-Text for Disc:");
for ( ; i_first_track < i_last_track; i_first_track++ ) { for ( ; i_first_track < i_last_track; i_first_track++ ) {
char psz_msg[50]; char psz_msg[50];
snprintf(psz_msg, sizeof(psz_msg), "CD-Text for Track %d:", i_first_track); snprintf(psz_msg, sizeof(psz_msg), "CD-Text for Track %d:",
print_cdtext_track_info(cdtext, i_first_track, psz_msg); i_first_track);
} print_cdtext_track_info(cdtext, i_first_track, psz_msg);
}
} }
int int
main(int argc, const char *argv[]) main(int argc, const char *argv[])
{ {
track_t i_first_track; track_t i_first_track;
track_t i_tracks; track_t i_tracks;
CdIo_t *p_cdio = cdio_open ("../test/cdda.cue", DRIVER_BINCUE); CdIo_t *p_cdio = cdio_open ("../test/cdda.cue", DRIVER_BINCUE);
if (NULL == p_cdio) { if (NULL == p_cdio) {
printf("Couldn't open ../test/cdda.cue with BIN/CUE driver.\n"); printf("Couldn't open ../test/cdda.cue with BIN/CUE driver.\n");
} else { } else {
i_first_track = cdio_get_first_track_num(p_cdio);
i_tracks = cdio_get_num_tracks(p_cdio);
print_disc_info(p_cdio, i_tracks, i_first_track);
cdio_destroy(p_cdio);
}
p_cdio = cdio_open (NULL, DRIVER_DEVICE);
i_first_track = cdio_get_first_track_num(p_cdio); i_first_track = cdio_get_first_track_num(p_cdio);
i_tracks = cdio_get_num_tracks(p_cdio); i_tracks = cdio_get_num_tracks(p_cdio);
print_disc_info(p_cdio, i_tracks, i_first_track);
if (NULL == p_cdio) {
printf("Couldn't find CD\n");
return 77;
} else {
print_disc_info(p_cdio, i_tracks, i_first_track);
}
cdio_destroy(p_cdio); cdio_destroy(p_cdio);
}
p_cdio = cdio_open (NULL, DRIVER_DEVICE); return 0;
i_first_track = cdio_get_first_track_num(p_cdio);
i_tracks = cdio_get_num_tracks(p_cdio);
if (NULL == p_cdio) {
printf("Couldn't find CD\n");
return 77;
} else {
print_disc_info(p_cdio, i_tracks, i_first_track);
}
cdio_destroy(p_cdio);
return 0;
} }

4
include/cdio++/disc.hpp
View File

@@ -1,7 +1,5 @@
/* /*
$Id: disc.hpp,v 1.2 2008/03/25 15:59:10 karl Exp $ Copyright (C) 2005, 2008, 2012 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by