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

Show CD-Text info.

Browse Source
This commit is contained in:
rocky
2005-03-12 20:32:23 +00:00
parent 160a69f0b2
commit fcc0806e8d
1 changed files with 57 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/cdda-player.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdda-player.c,v 1.7 2005/03/12 16:53:29 rocky Exp $ $Id: cdda-player.c,v 1.8 2005/03/12 20:32:23 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -70,6 +70,8 @@ static void play_track(track_t t1, track_t t2);
static void display_cdinfo(CdIo_t *p_cdio, track_t i_tracks, static void display_cdinfo(CdIo_t *p_cdio, track_t i_tracks,
track_t i_first_track); track_t i_first_track);
static void get_cddb_track_info(track_t i_track); static void get_cddb_track_info(track_t i_track);
static void get_cdtext_track_info(track_t i_track);
static void get_track_info(track_t i_track);
CdIo_t *p_cdio; /* libcdio handle */ CdIo_t *p_cdio; /* libcdio handle */
driver_id_t driver_id = DRIVER_DEVICE; driver_id_t driver_id = DRIVER_DEVICE;
@@ -94,7 +96,7 @@ bool b_verbose = false;
bool debug = false; bool debug = false;
bool interactive = true; bool interactive = true;
int todo; /* non-interactive */ int todo; /* non-interactive */
bool have_wdb = false; /* wdb database present */ bool b_prefer_cdtext = true;
bool b_cddb = false; /* cddb datebase present */ bool b_cddb = false; /* cddb datebase present */
bool b_cddb_l = false; /* local cddb */ bool b_cddb_l = false; /* local cddb */
bool b_cddb_r = false; /* remote cddb */ bool b_cddb_r = false; /* remote cddb */
@@ -416,7 +418,7 @@ read_toc(CdIo_t *p_cdio)
} }
} }
} }
get_cddb_track_info(i); get_track_info(i);
} }
b_record = true; b_record = true;
read_subchannel(p_cdio); read_subchannel(p_cdio);
@@ -531,29 +533,36 @@ display_status()
sub.audio_status == CDIO_MMC_READ_SUB_ST_PLAY) && sub.audio_status == CDIO_MMC_READ_SUB_ST_PLAY) &&
b_cd) { b_cd) {
i_last_display_track = sub.track; i_last_display_track = sub.track;
const cd_track_info_rec_t *p_cd_info = &cd_info[sub.track];
if (i_first_audio_track != sub.track && if (i_first_audio_track != sub.track &&
strlen(cd_info[sub.track-1].title)) { strlen(cd_info[sub.track-1].title)) {
mvprintw(LINE_TRACK_PREV, 0, "track %2d title : %s", const cd_track_info_rec_t *p_cd_info = &cd_info[sub.track-1];
sub.track-1, cd_info[sub.track-1].title); mvprintw(LINE_TRACK_PREV, 0, "track %2d title : %s [%s]",
sub.track-1, p_cd_info->title,
p_cd_info->b_cdtext ? "CD-Text" : "CDDB");
clrtoeol(); clrtoeol();
} else { } else {
mvprintw(LINE_TRACK_PREV, 0, "%s",""); mvprintw(LINE_TRACK_PREV, 0, "%s","");
clrtoeol(); clrtoeol();
} }
if (strlen(cd_info[sub.track].title)) { if (strlen(p_cd_info->title)) {
mvprintw(LINE_TRACK_TITLE, 0, "track %2d title : %s", mvprintw(LINE_TRACK_TITLE, 0, "track %2d title : %s [%s]",
sub.track, cd_info[sub.track].title); sub.track, p_cd_info->title,
p_cd_info->b_cdtext ? "CD-Text" : "CDDB");
clrtoeol(); clrtoeol();
} }
if (strlen(cd_info[sub.track].artist)) { if (strlen(p_cd_info->artist)) {
mvprintw(LINE_TRACK_ARTIST, 0, "track %2d artist : %s", mvprintw(LINE_TRACK_ARTIST, 0, "track %2d artist : %s [%s]",
sub.track, cd_info[sub.track].artist); sub.track, p_cd_info->artist,
p_cd_info->b_cdtext ? "CD-Text" : "CDDB");
clrtoeol(); clrtoeol();
} }
if (i_last_audio_track != sub.track && if (i_last_audio_track != sub.track &&
strlen(cd_info[sub.track+1].title)) { strlen(cd_info[sub.track+1].title)) {
mvprintw(LINE_TRACK_NEXT, 0, "track %2d title : %s", const cd_track_info_rec_t *p_cd_info = &cd_info[sub.track+1];
sub.track+1, cd_info[sub.track+1].title); mvprintw(LINE_TRACK_NEXT, 0, "track %2d title : %s [%s]",
sub.track+1, p_cd_info->title,
p_cd_info->b_cdtext ? "CD-Text" : "CDDB");
clrtoeol(); clrtoeol();
} else { } else {
mvprintw(LINE_TRACK_NEXT, 0, "%s",""); mvprintw(LINE_TRACK_NEXT, 0, "%s","");
@@ -587,6 +596,41 @@ get_cddb_track_info(track_t i_track)
#endif #endif
} }
#define add_cdtext_track_info(format_str, info_field, FIELD) \
if (p_cdtext->field[FIELD]) { \
snprintf(cd_info[i_track].info_field, \
sizeof(cd_info[i_track].info_field), \
format_str, p_cdtext->field[FIELD]); \
cd_info[i_track].b_cdtext = true; \
}
static void
get_cdtext_track_info(track_t i_track)
{
cdtext_t *p_cdtext = cdio_get_cdtext(p_cdio, i_track);
if (NULL != p_cdtext) {
add_cdtext_track_info("%s", title, CDTEXT_TITLE);
add_cdtext_track_info("%s", title, CDTEXT_PERFORMER);
}
cdtext_destroy(p_cdtext);
}
static void
get_track_info(track_t i_track)
{
if (b_prefer_cdtext) {
get_cdtext_track_info(i_track);
get_cddb_track_info(i_track);
} else {
get_cddb_track_info(i_track);
get_cdtext_track_info(i_track);
}
}
#define display_line(LINE_NO, COL_NO, format_str, field) \ #define display_line(LINE_NO, COL_NO, format_str, field) \
if (field && field[0]) \ if (field && field[0]) \
mvprintw(LINE_NO, COL_NO, format_str, field); mvprintw(LINE_NO, COL_NO, format_str, field);