From fb5ee5bfbe7a7706014b4413d37c480d30512a8a Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 21 Dec 2013 18:16:02 +0100 Subject: player: use MSGL_SMODE for some slave-mode stuff Replacement for MSGT_IDENTIFY. Can't kill it off completely yet; certain people would complain to me personally. --- player/loadfile.c | 18 +++++++++--------- player/playloop.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/player/loadfile.c b/player/loadfile.c index d9518c1918..d00c5ee218 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -220,30 +220,30 @@ static void print_stream(struct MPContext *mpctx, struct track *t) if (!iid) return; int id = t->user_tid; - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_%s_ID=%d\n", iid, id); + MP_SMODE(mpctx, "ID_%s_ID=%d\n", iid, id); if (t->title) - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_%s_%d_NAME=%s\n", iid, id, t->title); + MP_SMODE(mpctx, "ID_%s_%d_NAME=%s\n", iid, id, t->title); if (t->lang) - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_%s_%d_LANG=%s\n", iid, id, t->lang); + MP_SMODE(mpctx, "ID_%s_%d_LANG=%s\n", iid, id, t->lang); } static void print_file_properties(struct MPContext *mpctx) { - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILENAME=%s\n", mpctx->filename); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, + MP_SMODE(mpctx, "ID_FILENAME=%s\n", mpctx->filename); + MP_SMODE(mpctx, "ID_LENGTH=%.2f\n", get_time_length(mpctx)); int chapter_count = get_chapter_count(mpctx); if (chapter_count >= 0) { - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTERS=%d\n", chapter_count); + MP_SMODE(mpctx, "ID_CHAPTERS=%d\n", chapter_count); for (int i = 0; i < chapter_count; i++) { - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_ID=%d\n", i); + MP_SMODE(mpctx, "ID_CHAPTER_ID=%d\n", i); // print in milliseconds double time = chapter_start_time(mpctx, i) * 1000.0; - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_START=%"PRId64"\n", + MP_SMODE(mpctx, "ID_CHAPTER_%d_START=%"PRId64"\n", i, (int64_t)(time < 0 ? -1 : time)); char *name = chapter_name(mpctx, i); if (name) { - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_NAME=%s\n", i, + MP_SMODE(mpctx, "ID_CHAPTER_%d_NAME=%s\n", i, name); talloc_free(name); } diff --git a/player/playloop.c b/player/playloop.c index 971895b6a2..9078853fb5 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -105,7 +105,7 @@ void pause_player(struct MPContext *mpctx) print_status(mpctx); if (!mpctx->opts->quiet) - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n"); + MP_SMODE(mpctx, "ID_PAUSED\n"); } void unpause_player(struct MPContext *mpctx) -- cgit v1.2.3