From d8d42b44fc717c695af59c14213d54885088ea37 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 21 Dec 2013 19:45:42 +0100 Subject: m_option, m_config: mp_msg conversions Always pass around mp_log contexts in the option parser code. This of course affects all users of this API as well. In stream.c, pass a mp_null_log, because we can't do it properly yet. This will be fixed later. --- audio/chmap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'audio/chmap.c') diff --git a/audio/chmap.c b/audio/chmap.c index ce301b6565..a67c4e1c70 100644 --- a/audio/chmap.c +++ b/audio/chmap.c @@ -471,19 +471,19 @@ bool mp_chmap_from_str(struct mp_chmap *dst, bstr src) return true; } -void mp_chmap_print_help(int msgt, int msgl) +void mp_chmap_print_help(struct mp_log *log) { - mp_msg(msgt, msgl, "Speakers:\n"); + mp_info(log, "Speakers:\n"); for (int n = 0; n < MP_SPEAKER_ID_COUNT; n++) { if (speaker_names[n][0]) - mp_msg(msgt, msgl, " %-16s (%s)\n", - speaker_names[n][0], speaker_names[n][1]); + mp_info(log, " %-16s (%s)\n", + speaker_names[n][0], speaker_names[n][1]); } - mp_msg(msgt, msgl, "Standard layouts:\n"); + mp_info(log, "Standard layouts:\n"); for (int n = 0; std_layout_names[n][0]; n++) { - mp_msg(msgt, msgl, " %-16s (%s)\n", - std_layout_names[n][0], std_layout_names[n][1]); + mp_info(log, " %-16s (%s)\n", + std_layout_names[n][0], std_layout_names[n][1]); } for (int n = 0; n < MP_NUM_CHANNELS; n++) - mp_msg(msgt, msgl, " unknown%d\n", n); + mp_info(log, " unknown%d\n", n); } -- cgit v1.2.3