From eef36f03ea76f97c10075ae4b08e1e53e5195479 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 21 Dec 2013 21:49:13 +0100 Subject: msg: rename mp_msg_log -> mp_msg Same for companion functions. --- common/av_log.c | 14 +++++++------- common/codecs.c | 10 +++++----- common/encode_lavc.c | 2 +- common/msg.c | 10 +++++----- common/msg.h | 22 +++++++++++----------- common/playlist_parser.c | 4 ++-- 6 files changed, 31 insertions(+), 31 deletions(-) (limited to 'common') diff --git a/common/av_log.c b/common/av_log.c index a6d51f88e3..1fcaf55fcc 100644 --- a/common/av_log.c +++ b/common/av_log.c @@ -134,12 +134,12 @@ static void mp_msg_av_log_callback(void *ptr, int level, const char *fmt, struct mp_log *log = get_av_log(ptr); - if (mp_msg_test_log(log, mp_level)) { + if (mp_msg_test(log, mp_level)) { if (log_print_prefix) - mp_msg_log(log, mp_level, "%s: ", avc ? avc->item_name(ptr) : "?"); + mp_msg(log, mp_level, "%s: ", avc ? avc->item_name(ptr) : "?"); log_print_prefix = fmt[strlen(fmt) - 1] == '\n'; - mp_msg_log_va(log, mp_level, fmt, vl); + mp_msg_va(log, mp_level, fmt, vl); } pthread_mutex_unlock(&log_lock); @@ -184,16 +184,16 @@ void uninit_libav(struct mpv_global *global) static void print_version(struct mp_log *log, int v, char *name, unsigned buildv, unsigned runv) { - mp_msg_log(log, v, " %-15s %d.%d.%d", name, V(buildv)); + mp_msg(log, v, " %-15s %d.%d.%d", name, V(buildv)); if (buildv != runv) - mp_msg_log(log, v, " (runtime %d.%d.%d)", V(runv)); - mp_msg_log(log, v, "\n"); + mp_msg(log, v, " (runtime %d.%d.%d)", V(runv)); + mp_msg(log, v, "\n"); } #undef V void print_libav_versions(struct mp_log *log, int v) { - mp_msg_log(log, v, "%s library versions:\n", LIB_PREFIX); + mp_msg(log, v, "%s library versions:\n", LIB_PREFIX); print_version(log, v, "libavutil", LIBAVUTIL_VERSION_INT, avutil_version()); print_version(log, v, "libavcodec", LIBAVCODEC_VERSION_INT, avcodec_version()); diff --git a/common/codecs.c b/common/codecs.c index a71a7a4be2..1cbab44969 100644 --- a/common/codecs.c +++ b/common/codecs.c @@ -133,14 +133,14 @@ struct mp_decoder_list *mp_select_decoders(struct mp_decoder_list *all, void mp_print_decoders(struct mp_log *log, int msgl, const char *header, struct mp_decoder_list *list) { - mp_msg_log(log, msgl, "%s\n", header); + mp_msg(log, msgl, "%s\n", header); for (int n = 0; n < list->num_entries; n++) { struct mp_decoder_entry *entry = &list->entries[n]; - mp_msg_log(log, msgl, " %s:%s", entry->family, entry->decoder); + mp_msg(log, msgl, " %s:%s", entry->family, entry->decoder); if (strcmp(entry->decoder, entry->codec) != 0) - mp_msg_log(log, msgl, " (%s)", entry->codec); - mp_msg_log(log, msgl, " - %s\n", entry->desc); + mp_msg(log, msgl, " (%s)", entry->codec); + mp_msg(log, msgl, " - %s\n", entry->desc); } if (list->num_entries == 0) - mp_msg_log(log, msgl, " (no decoders)\n"); + mp_msg(log, msgl, " (no decoders)\n"); } diff --git a/common/encode_lavc.c b/common/encode_lavc.c index 1efe388507..b25d183477 100644 --- a/common/encode_lavc.c +++ b/common/encode_lavc.c @@ -1046,7 +1046,7 @@ void encode_lavc_fail(struct encode_lavc_context *ctx, const char *format, ...) { va_list va; va_start(va, format); - mp_msg_log_va(ctx->log, MSGL_ERR, format, va); + mp_msg_va(ctx->log, MSGL_ERR, format, va); if (ctx->failed) return; ctx->failed = true; diff --git a/common/msg.c b/common/msg.c index 3a6f3a14e3..ed103024ec 100644 --- a/common/msg.c +++ b/common/msg.c @@ -115,7 +115,7 @@ static void update_loglevel(struct mp_log *log) } // Return whether the message at this verbosity level would be actually printed. -bool mp_msg_test_log(struct mp_log *log, int lev) +bool mp_msg_test(struct mp_log *log, int lev) { if (mp_msg_mute || !log->root) return false; @@ -142,9 +142,9 @@ static void set_msg_color(FILE* stream, int lev) terminal_set_foreground_color(stream, v_colors[lev]); } -void mp_msg_log_va(struct mp_log *log, int lev, const char *format, va_list va) +void mp_msg_va(struct mp_log *log, int lev, const char *format, va_list va) { - if (!mp_msg_test_log(log, lev)) + if (!mp_msg_test(log, lev)) return; // do not display pthread_mutex_lock(&mp_msg_lock); @@ -258,11 +258,11 @@ void mp_msg_uninit(struct mpv_global *global) global->log = NULL; } -void mp_msg_log(struct mp_log *log, int lev, const char *format, ...) +void mp_msg(struct mp_log *log, int lev, const char *format, ...) { va_list va; va_start(va, format); - mp_msg_log_va(log, lev, format, va); + mp_msg_va(log, lev, format, va); va_end(va); } diff --git a/common/msg.h b/common/msg.h index fd0e176273..27701ff30b 100644 --- a/common/msg.h +++ b/common/msg.h @@ -52,25 +52,25 @@ enum { struct mp_log *mp_log_new(void *talloc_ctx, struct mp_log *parent, const char *name); -void mp_msg_log(struct mp_log *log, int lev, const char *format, ...) +void mp_msg(struct mp_log *log, int lev, const char *format, ...) PRINTF_ATTRIBUTE(3, 4); -void mp_msg_log_va(struct mp_log *log, int lev, const char *format, va_list va); +void mp_msg_va(struct mp_log *log, int lev, const char *format, va_list va); -bool mp_msg_test_log(struct mp_log *log, int lev); +bool mp_msg_test(struct mp_log *log, int lev); // Convenience macros. -#define mp_fatal(log, ...) mp_msg_log(log, MSGL_FATAL, __VA_ARGS__) -#define mp_err(log, ...) mp_msg_log(log, MSGL_ERR, __VA_ARGS__) -#define mp_warn(log, ...) mp_msg_log(log, MSGL_WARN, __VA_ARGS__) -#define mp_info(log, ...) mp_msg_log(log, MSGL_INFO, __VA_ARGS__) -#define mp_verbose(log, ...) mp_msg_log(log, MSGL_V, __VA_ARGS__) -#define mp_dbg(log, ...) mp_msg_log(log, MSGL_DEBUG, __VA_ARGS__) -#define mp_trace(log, ...) mp_msg_log(log, MSGL_TRACE, __VA_ARGS__) +#define mp_fatal(log, ...) mp_msg(log, MSGL_FATAL, __VA_ARGS__) +#define mp_err(log, ...) mp_msg(log, MSGL_ERR, __VA_ARGS__) +#define mp_warn(log, ...) mp_msg(log, MSGL_WARN, __VA_ARGS__) +#define mp_info(log, ...) mp_msg(log, MSGL_INFO, __VA_ARGS__) +#define mp_verbose(log, ...) mp_msg(log, MSGL_V, __VA_ARGS__) +#define mp_dbg(log, ...) mp_msg(log, MSGL_DEBUG, __VA_ARGS__) +#define mp_trace(log, ...) mp_msg(log, MSGL_TRACE, __VA_ARGS__) // Convenience macros, typically called with a pointer to a context struct // as first argument, which has a "struct mp_log log;" member. -#define MP_MSG(obj, lev, ...) mp_msg_log((obj)->log, lev, __VA_ARGS__) +#define MP_MSG(obj, lev, ...) mp_msg((obj)->log, lev, __VA_ARGS__) #define MP_FATAL(obj, ...) MP_MSG(obj, MSGL_FATAL, __VA_ARGS__) #define MP_ERR(obj, ...) MP_MSG(obj, MSGL_ERR, __VA_ARGS__) diff --git a/common/playlist_parser.c b/common/playlist_parser.c index 2e06009db5..d871854dbb 100644 --- a/common/playlist_parser.c +++ b/common/playlist_parser.c @@ -560,13 +560,13 @@ static struct playlist *do_parse(struct stream* stream, bool forced, if(success) mp_verbose(log, "Playlist successfully parsed\n"); else { - mp_msg_log(log,((forced==1)?MSGL_ERR:MSGL_V),"Error while parsing playlist\n"); + mp_msg(log,((forced==1)?MSGL_ERR:MSGL_V),"Error while parsing playlist\n"); talloc_free(p.pl); p.pl = NULL; } if (p.pl && !p.pl->first) - mp_msg_log(log, ((forced==1)?MSGL_WARN:MSGL_V),"Warning: empty playlist\n"); + mp_msg(log, ((forced==1)?MSGL_WARN:MSGL_V),"Warning: empty playlist\n"); return p.pl; } -- cgit v1.2.3