diff options
author | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
commit | 0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2 (patch) | |
tree | b70f214f8c3fc802d6d6edbf8395273c854ac0fd /stream/resolve/resolve_quvi.c | |
parent | a4fe95b0d8d339ba5afbdb5346ad8fd367a4a1c1 (diff) | |
parent | 245e5b844177e9ad9a9c07eff5efab7c3fccdebc (diff) | |
download | mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.bz2 mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.xz |
Merge branch 'msg_refactor'
This branch changes mp_msg() so that it doesn't require global context.
The changes are pretty violent.
Diffstat (limited to 'stream/resolve/resolve_quvi.c')
-rw-r--r-- | stream/resolve/resolve_quvi.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/stream/resolve/resolve_quvi.c b/stream/resolve/resolve_quvi.c index 4baaca2528..837496081a 100644 --- a/stream/resolve/resolve_quvi.c +++ b/stream/resolve/resolve_quvi.c @@ -19,6 +19,7 @@ #include <quvi/quvi.h> #include "talloc.h" +#include "common/global.h" #include "common/msg.h" #include "options/options.h" #include "resolve.h" @@ -34,7 +35,8 @@ static void add_source(struct mp_resolve_result *res, const char *url, MP_TARRAY_APPEND(res, res->srcs, res->num_srcs, src); } -struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts) +struct mp_resolve_result *mp_resolve_quvi(const char *url, + struct mpv_global *global) { QUVIcode rc; bool mp_url = false; @@ -58,7 +60,10 @@ struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts) return NULL; } - mp_msg(MSGT_OPEN, MSGL_INFO, "[quvi] Checking URL...\n"); + struct MPOpts *opts = global->opts; + struct mp_log *log = mp_log_new(NULL, global->log, "quvi"); + + mp_info(log, "Checking URL...\n"); const char *req_format = opts->quvi_format ? opts->quvi_format : "best"; @@ -73,8 +78,9 @@ struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts) quvi_media_t m; rc = quvi_parse(q, (char *)url, &m); if (rc != QUVI_OK) { - mp_msg(MSGT_OPEN, MSGL_ERR, "[quvi] %s\n", quvi_strerror(q, rc)); + mp_err(log, "%s\n", quvi_strerror(q, rc)); quvi_close(&q); + talloc_free(log); return NULL; } @@ -107,5 +113,6 @@ struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts) if (strcmp(req_format, "best") != 0 && strcmp(req_format, "default") != 0) add_source(result, NULL, req_format); + talloc_free(log); return result; } |