summaryrefslogtreecommitdiffstats
path: root/mpvcore/m_option.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-16 20:40:02 +0100
committerwm4 <wm4@nowhere>2013-12-16 20:41:08 +0100
commit7dc7b900c622235d595337c988a0c75280084b7c (patch)
tree7f896555c9478430edd28d56fb6fde5691b0e643 /mpvcore/m_option.c
parent3e6cd3ef19aca7c79dfc73412f98b70b7de011b4 (diff)
downloadmpv-7dc7b900c622235d595337c988a0c75280084b7c.tar.bz2
mpv-7dc7b900c622235d595337c988a0c75280084b7c.tar.xz
Replace mp_tmsg, mp_dbg -> mp_msg, remove mp_gtext(), remove set_osd_tmsg
The tmsg stuff was for the internal gettext() based translation system, which nobody ever attempted to use and thus was removed. mp_gtext() and set_osd_tmsg() were also for this. mp_dbg was once enabled in debug mode only, but since we have log level for enabling debug messages, it seems utterly useless.
Diffstat (limited to 'mpvcore/m_option.c')
-rw-r--r--mpvcore/m_option.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/mpvcore/m_option.c b/mpvcore/m_option.c
index 066500cd71..85ac974861 100644
--- a/mpvcore/m_option.c
+++ b/mpvcore/m_option.c
@@ -45,18 +45,18 @@ char *m_option_strerror(int code)
{
switch (code) {
case M_OPT_UNKNOWN:
- return mp_gtext("option not found");
+ return "option not found";
case M_OPT_MISSING_PARAM:
- return mp_gtext("option requires parameter");
+ return "option requires parameter";
case M_OPT_INVALID:
- return mp_gtext("option parameter could not be parsed");
+ return "option parameter could not be parsed";
case M_OPT_OUT_OF_RANGE:
- return mp_gtext("parameter is outside values allowed for option");
+ return "parameter is outside values allowed for option";
case M_OPT_DISALLOW_PARAM:
- return mp_gtext("option doesn't take a parameter");
+ return "option doesn't take a parameter";
case M_OPT_PARSER_ERR:
default:
- return mp_gtext("parser error");
+ return "parser error";
}
}
@@ -1161,7 +1161,8 @@ static int parse_print(const m_option_t *opt, struct bstr name,
struct bstr param, void *dst)
{
if (opt->type == CONF_TYPE_PRINT) {
- mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", mp_gtext(opt->p));
+ const char *msg = opt->p;
+ mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", msg);
} else {
char *name0 = bstrdup0(NULL, name);
char *param0 = bstrdup0(NULL, param);