mirror of
https://github.com/mpv-player/mpv.git
synced 2025-12-28 05:33:14 +00:00
msg: rename mp_msg_log -> mp_msg
Same for companion functions.
This commit is contained in:
@@ -865,29 +865,29 @@ static struct mp_resolve_result *resolve_url(const char *filename,
|
||||
static void print_resolve_contents(struct mp_log *log,
|
||||
struct mp_resolve_result *res)
|
||||
{
|
||||
mp_msg_log(log, MSGL_V, "Resolve:\n");
|
||||
mp_msg_log(log, MSGL_V, " title: %s\n", res->title);
|
||||
mp_msg_log(log, MSGL_V, " url: %s\n", res->url);
|
||||
mp_msg(log, MSGL_V, "Resolve:\n");
|
||||
mp_msg(log, MSGL_V, " title: %s\n", res->title);
|
||||
mp_msg(log, MSGL_V, " url: %s\n", res->url);
|
||||
for (int n = 0; n < res->num_srcs; n++) {
|
||||
mp_msg_log(log, MSGL_V, " source %d:\n", n);
|
||||
mp_msg(log, MSGL_V, " source %d:\n", n);
|
||||
if (res->srcs[n]->url)
|
||||
mp_msg_log(log, MSGL_V, " url: %s\n", res->srcs[n]->url);
|
||||
mp_msg(log, MSGL_V, " url: %s\n", res->srcs[n]->url);
|
||||
if (res->srcs[n]->encid)
|
||||
mp_msg_log(log, MSGL_V, " encid: %s\n", res->srcs[n]->encid);
|
||||
mp_msg(log, MSGL_V, " encid: %s\n", res->srcs[n]->encid);
|
||||
}
|
||||
for (int n = 0; n < res->num_subs; n++) {
|
||||
mp_msg_log(log, MSGL_V, " subtitle %d:\n", n);
|
||||
mp_msg(log, MSGL_V, " subtitle %d:\n", n);
|
||||
if (res->subs[n]->url)
|
||||
mp_msg_log(log, MSGL_V, " url: %s\n", res->subs[n]->url);
|
||||
mp_msg(log, MSGL_V, " url: %s\n", res->subs[n]->url);
|
||||
if (res->subs[n]->lang)
|
||||
mp_msg_log(log, MSGL_V, " lang: %s\n", res->subs[n]->lang);
|
||||
mp_msg(log, MSGL_V, " lang: %s\n", res->subs[n]->lang);
|
||||
if (res->subs[n]->data) {
|
||||
mp_msg_log(log, MSGL_V, " data: %zd bytes\n",
|
||||
mp_msg(log, MSGL_V, " data: %zd bytes\n",
|
||||
strlen(res->subs[n]->data));
|
||||
}
|
||||
}
|
||||
if (res->playlist) {
|
||||
mp_msg_log(log, MSGL_V, " playlist with %d entries\n",
|
||||
mp_msg(log, MSGL_V, " playlist with %d entries\n",
|
||||
playlist_entry_count(res->playlist));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -287,10 +287,10 @@ static int script_log(lua_State *L)
|
||||
const char *s = lua_tostring(L, -1);
|
||||
if (s == NULL)
|
||||
return luaL_error(L, "Invalid argument");
|
||||
mp_msg_log(ctx->log, msgl, "%s%s", s, i > 0 ? " " : "");
|
||||
mp_msg(ctx->log, msgl, "%s%s", s, i > 0 ? " " : "");
|
||||
lua_pop(L, 1); // args... tostring
|
||||
}
|
||||
mp_msg_log(ctx->log, msgl, "\n");
|
||||
mp_msg(ctx->log, msgl, "\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -97,10 +97,10 @@ const char mp_help_text[] =
|
||||
void mp_print_version(struct mp_log *log, int always)
|
||||
{
|
||||
int v = always ? MSGL_INFO : MSGL_V;
|
||||
mp_msg_log(log, v,
|
||||
mp_msg(log, v,
|
||||
"%s (C) 2000-2013 mpv/MPlayer/mplayer2 projects\n built on %s\n", mplayer_version, mplayer_builddate);
|
||||
print_libav_versions(log, v);
|
||||
mp_msg_log(log, v, "\n");
|
||||
mp_msg(log, v, "\n");
|
||||
}
|
||||
|
||||
static MP_NORETURN void exit_player(struct MPContext *mpctx,
|
||||
|
||||
Reference in New Issue
Block a user