summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-21 20:03:36 +0100
committerwm4 <wm4@nowhere>2013-12-21 21:43:16 +0100
commit9242c34fa26aafb09a9973a5175c281233a13bdc (patch)
treec94bf638a38ce29c8c6e37c9c6167968e8d3cc34 /video
parentd8d42b44fc717c695af59c14213d54885088ea37 (diff)
downloadmpv-9242c34fa26aafb09a9973a5175c281233a13bdc.tar.bz2
mpv-9242c34fa26aafb09a9973a5175c281233a13bdc.tar.xz
m_option: add mp_log callback to OPT_STRING_VALIDATE options
And also convert a bunch of other code, especially ao_wasapi and ao_portaudio.
Diffstat (limited to 'video')
-rw-r--r--video/out/gl_common.c10
-rw-r--r--video/out/gl_common.h4
-rw-r--r--video/out/gl_lcms.c4
-rw-r--r--video/out/gl_video.c14
4 files changed, 16 insertions, 16 deletions
diff --git a/video/out/gl_common.c b/video/out/gl_common.c
index f31ecdb64e..881cd62835 100644
--- a/video/out/gl_common.c
+++ b/video/out/gl_common.c
@@ -908,14 +908,14 @@ int mpgl_find_backend(const char *name)
return -2;
}
-int mpgl_validate_backend_opt(const struct m_option *opt, struct bstr name,
- struct bstr param)
+int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt,
+ struct bstr name, struct bstr param)
{
if (bstr_equals0(param, "help")) {
- mp_msg(MSGT_VO, MSGL_INFO, "OpenGL windowing backends:\n");
- mp_msg(MSGT_VO, MSGL_INFO, " auto (autodetect)\n");
+ mp_info(log, "OpenGL windowing backends:\n");
+ mp_info(log, " auto (autodetect)\n");
for (const struct backend *entry = backends; entry->name; entry++)
- mp_msg(MSGT_VO, MSGL_INFO, " %s\n", entry->name);
+ mp_info(log, " %s\n", entry->name);
return M_OPT_EXIT - 1;
}
char s[20];
diff --git a/video/out/gl_common.h b/video/out/gl_common.h
index 45ff9a0110..f678dbf12a 100644
--- a/video/out/gl_common.h
+++ b/video/out/gl_common.h
@@ -157,8 +157,8 @@ bool mpgl_config_window(struct MPGLContext *ctx, int gl_caps, uint32_t d_width,
int mpgl_find_backend(const char *name);
struct m_option;
-int mpgl_validate_backend_opt(const struct m_option *opt, struct bstr name,
- struct bstr param);
+int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt,
+ struct bstr name, struct bstr param);
void mpgl_set_backend_cocoa(MPGLContext *ctx);
void mpgl_set_backend_w32(MPGLContext *ctx);
diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c
index fb2098324d..db4c7dc97b 100644
--- a/video/out/gl_lcms.c
+++ b/video/out/gl_lcms.c
@@ -58,8 +58,8 @@ static bool parse_3dlut_size(const char *arg, int *p1, int *p2, int *p3)
return true;
}
-static int validate_3dlut_size_opt(const m_option_t *opt, struct bstr name,
- struct bstr param)
+static int validate_3dlut_size_opt(struct mp_log *log, const m_option_t *opt,
+ struct bstr name, struct bstr param)
{
int p1, p2, p3;
char s[20];
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index b27638b904..2e662f65ff 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -298,8 +298,8 @@ const struct gl_video_opts gl_video_opts_hq_def = {
.alpha_mode = 2,
};
-static int validate_scaler_opt(const m_option_t *opt, struct bstr name,
- struct bstr param);
+static int validate_scaler_opt(struct mp_log *log, const m_option_t *opt,
+ struct bstr name, struct bstr param);
#define OPT_BASE_STRUCT struct gl_video_opts
const struct m_sub_options gl_video_conf = {
@@ -2219,15 +2219,15 @@ bool gl_video_get_equalizer(struct gl_video *p, const char *name, int *val)
return mp_csp_equalizer_get(&p->video_eq, name, val) >= 0;
}
-static int validate_scaler_opt(const m_option_t *opt, struct bstr name,
- struct bstr param)
+static int validate_scaler_opt(struct mp_log *log, const m_option_t *opt,
+ struct bstr name, struct bstr param)
{
if (bstr_equals0(param, "help")) {
- mp_msg(MSGT_VO, MSGL_INFO, "Available scalers:\n");
+ mp_info(log, "Available scalers:\n");
for (const char **filter = fixed_scale_filters; *filter; filter++)
- mp_msg(MSGT_VO, MSGL_INFO, " %s\n", *filter);
+ mp_info(log, " %s\n", *filter);
for (int n = 0; mp_filter_kernels[n].name; n++)
- mp_msg(MSGT_VO, MSGL_INFO, " %s\n", mp_filter_kernels[n].name);
+ mp_info(log, " %s\n", mp_filter_kernels[n].name);
return M_OPT_EXIT - 1;
}
char s[20];