mirror of
https://github.com/mpv-player/mpv
synced 2025-01-29 03:02:53 +00:00
37c03f2c81
This reverts commit48f0692ab9"options: make option struct the talloc parent of options". This made things actually more complicated. It introduced a new parameter to the option parse and copy functions, which was used inconsistently. Some code passed a parent, some not. Morever, you have to call m_option_free() anyway, because not all options actually respect the talloc parent. There is also the question whether passing NULL as parent is supposed to work, or if you still have to implement m_config_free(). On the other hand, this simplifies nothing. I assume the intention was being able to free all option values with a single talloc_free() call, but the same goal can be reached by simply freeing the m_config struct. (The m_config talloc destructor will free each option values.) Get rid of the talloc parent context parameter. This essentially reverts commit48f0692ab9("options: make option struct the talloc parent of options"). In video_out.c, make the VO priv struct the talloc parent for the m_config object, so that destroying the VO will free the options. The ability to free the m_config struct and all its managed options was introduced in commit89a17bcda6.
92 lines
2.4 KiB
C
92 lines
2.4 KiB
C
/*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
/// \file
|
|
/// \ingroup OptionsStruct
|
|
|
|
#include "config.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "m_option.h"
|
|
#include "m_struct.h"
|
|
#include "mp_msg.h"
|
|
|
|
const m_option_t*
|
|
m_struct_get_field(const m_struct_t* st,const char* f) {
|
|
int i;
|
|
|
|
for(i = 0 ; st->fields[i].name ; i++) {
|
|
if(strcasecmp(st->fields[i].name,f) == 0)
|
|
return &st->fields[i];
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
void*
|
|
m_struct_alloc(const m_struct_t* st) {
|
|
int i;
|
|
void* r;
|
|
|
|
if(!st->defaults) {
|
|
mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Struct %s needs defaults\n",st->name);
|
|
return NULL;
|
|
}
|
|
|
|
r = calloc(1,st->size);
|
|
memcpy(r,st->defaults,st->size);
|
|
|
|
for(i = 0 ; st->fields[i].name ; i++) {
|
|
if(st->fields[i].type->flags & M_OPT_TYPE_DYNAMIC)
|
|
memset(M_ST_MB_P(r,st->fields[i].p),0,st->fields[i].type->size);
|
|
m_option_copy(&st->fields[i],M_ST_MB_P(r,st->fields[i].p),M_ST_MB_P(st->defaults,st->fields[i].p));
|
|
}
|
|
return r;
|
|
}
|
|
|
|
int m_struct_set(const m_struct_t *st, void *obj, const char *field,
|
|
struct bstr param)
|
|
{
|
|
const m_option_t* f = m_struct_get_field(st,field);
|
|
|
|
if(!f) {
|
|
mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Struct %s doesn't have any %s field\n",
|
|
st->name,field);
|
|
return 0;
|
|
}
|
|
|
|
if(f->type->parse(f, bstr0(field), param, false, M_ST_MB_P(obj,f->p)) < 0) {
|
|
mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Struct %s, field %s parsing error: %.*s\n",
|
|
st->name, field, BSTR_P(param));
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
/// Free an allocated struct
|
|
void
|
|
m_struct_free(const m_struct_t* st, void* obj) {
|
|
int i;
|
|
|
|
for(i = 0 ; st->fields[i].name ; i++)
|
|
m_option_free(&st->fields[i],M_ST_MB_P(obj,st->fields[i].p));
|
|
free(obj);
|
|
}
|