summaryrefslogtreecommitdiffstats
path: root/stream/stream_cdda.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-21 20:36:45 +0100
committerwm4 <wm4@nowhere>2013-12-21 21:43:16 +0100
commit0335011f11d9d13f70db6c46ed6189a74d48ec67 (patch)
tree03a146b06b5a8c405f5c521abadeeea35c296920 /stream/stream_cdda.c
parent3dbc9007b080028f0aebbbf8b9ab1233cd70c45b (diff)
downloadmpv-0335011f11d9d13f70db6c46ed6189a74d48ec67.tar.bz2
mpv-0335011f11d9d13f70db6c46ed6189a74d48ec67.tar.xz
stream: mp_msg conversions
We also drop some slave mode stuff from stream_vcd.
Diffstat (limited to 'stream/stream_cdda.c')
-rw-r--r--stream/stream_cdda.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index bc026843c8..5d095f6d74 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -133,7 +133,7 @@ static bool print_cdtext(stream_t *s, int track)
cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio);
#endif
if (text) {
- mp_msg(MSGT_SEEK, MSGL_INFO, "CD-Text (%s):\n", track ? "track" : "CD");
+ MP_INFO(s, "CD-Text (%s):\n", track ? "track" : "CD");
for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) {
const char *name = cdtext_name[i];
#ifdef OLD_API
@@ -142,7 +142,7 @@ static bool print_cdtext(stream_t *s, int track)
const char *value = cdtext_get_const(text, i, track);
#endif
if (name && value)
- mp_msg(MSGT_SEEK, MSGL_INFO, " %s: '%s'\n", name, value);
+ MP_INFO(s, " %s: '%s'\n", name, value);
}
return true;
}
@@ -154,13 +154,13 @@ static void print_track_info(stream_t *s, int track)
cdda_priv* p = (cdda_priv*)s->priv;
cd_track_t *cd_track = cd_info_get_track(p->cd_info, track);
if( cd_track!=NULL ) {
- mp_msg(MSGT_SEEK, MSGL_INFO, "\n%s\n", cd_track->name);
- mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDA_TRACK=%d\n",
+ MP_INFO(s, "\n%s\n", cd_track->name);
+ MP_INFO(s, "ID_CDDA_TRACK=%d\n",
cd_track->track_nb);
}
if (print_cdtext(s, track)) {
// hack for term OSD overwriting the last line of CDTEXT
- mp_msg(MSGT_SEEK, MSGL_INFO, "\n");
+ MP_INFO(s, "\n");
}
}
@@ -340,7 +340,7 @@ static int open_cdda(stream_t *st, int m)
#endif
if (!cdd) {
- mp_msg(MSGT_OPEN, MSGL_ERR, "Can't open CDDA device.\n");
+ MP_ERR(st, "Can't open CDDA device.\n");
return STREAM_ERROR;
}
@@ -350,13 +350,13 @@ static int open_cdda(stream_t *st, int m)
cdd->nsectors = p->sector_size;
if (cdda_open(cdd) != 0) {
- mp_msg(MSGT_OPEN, MSGL_ERR, "Can't open disc.\n");
+ MP_ERR(st, "Can't open disc.\n");
cdda_close(cdd);
return STREAM_ERROR;
}
cd_info = cd_info_new();
- mp_msg(MSGT_OPEN, MSGL_INFO, "Found audio CD with %d tracks.\n",
+ MP_INFO(st, "Found audio CD with %d tracks.\n",
(int)cdda_tracks(cdd));
for (i = 0; i < cdd->tracks; i++) {
char track_name[80];