RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

stream_cdda: print cd text header only if there are any cd text fields

This commit is contained in:
wm4 2014-03-26 16:57:38 +01:00
parent 6fa2c52589
commit 3ad2a67d3f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stream/stream_cdda.c
View File

@ -129,8 +129,8 @@ static bool print_cdtext(stream_t *s, int track)
#else #else
cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio); cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio);
#endif #endif
int header = 0;
if (text) { if (text) {
MP_INFO(s, "CD-Text (%s):\n", track ? "track" : "CD");
for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) { for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) {
const char *name = cdtext_name[i]; const char *name = cdtext_name[i];
#ifdef OLD_API #ifdef OLD_API
@ -138,8 +138,12 @@ static bool print_cdtext(stream_t *s, int track)
#else #else
const char *value = cdtext_get_const(text, i, track); const char *value = cdtext_get_const(text, i, track);
#endif #endif
if (name && value) if (name && value) {
if (!header)
MP_INFO(s, "CD-Text (%s):\n", track ? "track" : "CD");
header = 1;
MP_INFO(s, " %s: '%s'\n", name, value); MP_INFO(s, " %s: '%s'\n", name, value);
}
} }
return true; return true;
} }