summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-21 20:38:42 +0100
committerwm4 <wm4@nowhere>2013-12-21 21:43:17 +0100
commitd9b5652cacb12600fa58dc2076b9fe1279ea01a9 (patch)
treee843f5ff7bbedf8c6aeb49892a31de97f4230c88 /stream
parent33c8fd789dd967e4417157ef511fbd7dd33c209e (diff)
downloadmpv-d9b5652cacb12600fa58dc2076b9fe1279ea01a9.tar.bz2
mpv-d9b5652cacb12600fa58dc2076b9fe1279ea01a9.tar.xz
quvi: mp_msg conversions
Diffstat (limited to 'stream')
-rw-r--r--stream/resolve/resolve.h6
-rw-r--r--stream/resolve/resolve_quvi.c13
-rw-r--r--stream/resolve/resolve_quvi9.c28
3 files changed, 30 insertions, 17 deletions
diff --git a/stream/resolve/resolve.h b/stream/resolve/resolve.h
index 7a60b29114..3a5358a99e 100644
--- a/stream/resolve/resolve.h
+++ b/stream/resolve/resolve.h
@@ -19,8 +19,7 @@
#ifndef MP_RESOLVE_H
#define MP_RESOLVE_H
-struct MPContext;
-struct MPOpts;
+struct mpv_global;
struct mp_resolve_result {
char *url;
@@ -48,6 +47,7 @@ struct mp_resolve_sub {
char *lang;
};
-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);
#endif
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;
}
diff --git a/stream/resolve/resolve_quvi9.c b/stream/resolve/resolve_quvi9.c
index ed8a95502c..108f1aabb7 100644
--- a/stream/resolve/resolve_quvi9.c
+++ b/stream/resolve/resolve_quvi9.c
@@ -22,38 +22,43 @@
#include <quvi.h>
#include "talloc.h"
+#include "common/global.h"
#include "common/msg.h"
#include "options/options.h"
#include "common/playlist.h"
#include "resolve.h"
-static bool mp_quvi_ok(quvi_t q)
+static bool mp_quvi_ok(quvi_t q, struct mp_log *log)
{
if (!quvi_ok(q)) {
- mp_msg(MSGT_OPEN, MSGL_ERR, "[quvi] %s\n", quvi_errmsg(q));
+ mp_err(log, "%s\n", quvi_errmsg(q));
return false;
}
return true;
}
-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)
{
+ struct mp_log *log = mp_log_new(NULL, global->log, "quvi");
+ struct MPOpts *opts = global->opts;
int mode = QUVI_SUPPORTS_MODE_OFFLINE;
quvi_t q = quvi_new();
if (!quvi_ok(q)) {
- mp_msg(MSGT_OPEN, MSGL_ERR, "[quvi] %s\n", quvi_errmsg(q));
+ mp_err(log, "%s\n", quvi_errmsg(q));
quvi_free(q);
+ talloc_free(log);
return NULL;
}
struct mp_resolve_result *res = talloc_zero(NULL, struct mp_resolve_result);
if (quvi_supports(q, url, mode, QUVI_SUPPORTS_TYPE_PLAYLIST)) {
- mp_msg(MSGT_OPEN, MSGL_INFO, "[quvi] Checking playlist...\n");
+ mp_info(log, "Checking playlist...\n");
quvi_playlist_t qp = quvi_playlist_new(q, url);
- if (mp_quvi_ok(q)) {
+ if (mp_quvi_ok(q, log)) {
res->playlist = talloc_zero(res, struct playlist);
while (quvi_playlist_media_next(qp)) {
char *entry = NULL;
@@ -66,9 +71,9 @@ struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts)
}
if (quvi_supports(q, url, mode, QUVI_SUPPORTS_TYPE_MEDIA)) {
- mp_msg(MSGT_OPEN, MSGL_INFO, "[quvi] Checking URL...\n");
+ mp_info(log, "Checking URL...\n");
quvi_media_t media = quvi_media_new(q, url);
- if (mp_quvi_ok(q)) {
+ if (mp_quvi_ok(q, log)) {
char *format = opts->quvi_format ? opts->quvi_format : "best";
bool use_default = strcmp(format, "default") == 0;
if (!use_default)
@@ -107,9 +112,9 @@ struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts)
}
if (quvi_supports(q, url, mode, QUVI_SUPPORTS_TYPE_SUBTITLE)) {
- mp_msg(MSGT_OPEN, MSGL_INFO, "[quvi] Getting subtitles...\n");
+ mp_info(log, "Getting subtitles...\n");
quvi_subtitle_t qsub = quvi_subtitle_new(q, url);
- if (mp_quvi_ok(q)) {
+ if (mp_quvi_ok(q, log)) {
while (1) {
quvi_subtitle_type_t qst = quvi_subtitle_type_next(qsub);
if (!qst)
@@ -124,7 +129,7 @@ struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts)
// Let quvi convert the subtitle to SRT.
quvi_subtitle_export_t qse =
quvi_subtitle_export_new(qsl, "srt");
- if (mp_quvi_ok(q)) {
+ if (mp_quvi_ok(q, log)) {
const char *subdata = quvi_subtitle_export_data(qse);
struct mp_resolve_sub *sub = talloc_ptrtype(res, sub);
*sub = (struct mp_resolve_sub) {
@@ -142,6 +147,7 @@ struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts)
}
quvi_free(q);
+ talloc_free(log);
if (!res->url && (!res->playlist || !res->playlist->first)) {
talloc_free(res);