summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-26 08:27:33 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-26 09:40:34 +0300
commit98b959ae1fadd70b7a8ac8259759b11d6ed4fb2d (patch)
tree019b683088b6142fbf449655c9289f87a9acb5c3
parent2b47fd59ab442ee27db9cfc4e7ebcdba93bab57b (diff)
downloadmpv-98b959ae1fadd70b7a8ac8259759b11d6ed4fb2d.tar.bz2
mpv-98b959ae1fadd70b7a8ac8259759b11d6ed4fb2d.tar.xz
options: Remove "reset" functionality from CONF_TYPE_FUNC[_PARAM]
The "reset to default before setting to something else" functionality is not used by any current option, but prevents using the "priv" field of the option data for anything else.
-rw-r--r--m_option.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/m_option.c b/m_option.c
index e2a644402b..f9a3758534 100644
--- a/m_option.c
+++ b/m_option.c
@@ -762,8 +762,6 @@ static void set_func_param(const m_option_t* opt, void* dst, void* src) {
if(!s) return;
- // Revert if needed
- if(opt->priv) ((m_opt_default_func_t)opt->priv)(opt,opt->name);
for( ; s != NULL ; s = s->next)
((m_opt_func_param_t) opt->p)(opt,s->param);
}
@@ -821,7 +819,6 @@ static int parse_func(const m_option_t* opt,const char *name, char *param, void*
static void set_func(const m_option_t* opt,void* dst, void* src) {
int i;
- if(opt->priv) ((m_opt_default_func_t)opt->priv)(opt,opt->name);
for(i = 0 ; i < VAL(src) ; i++)
((m_opt_func_t) opt->p)(opt);
}