diff options
author | wm4 <wm4@nowhere> | 2012-11-05 17:02:04 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-12 20:06:14 +0100 |
commit | d4bdd0473d6f43132257c9fb3848d829755167a3 (patch) | |
tree | 8021c2f7da1841393c8c832105e20cd527826d6c /core/m_struct.c | |
parent | bd48deba77bd5582c5829d6fe73a7d2571088aba (diff) | |
download | mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.bz2 mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.xz |
Rename directories, move files (step 1 of 2) (does not compile)
Tis drops the silly lib prefixes, and attempts to organize the tree in
a more logical way. Make the top-level directory less cluttered as
well.
Renames the following directories:
libaf -> audio/filter
libao2 -> audio/out
libvo -> video/out
libmpdemux -> demux
Split libmpcodecs:
vf* -> video/filter
vd*, dec_video.* -> video/decode
mp_image*, img_format*, ... -> video/
ad*, dec_audio.* -> audio/decode
libaf/format.* is moved to audio/ - this is similar to how mp_image.*
is located in video/.
Move most top-level .c/.h files to core. (talloc.c/.h is left on top-
level, because it's external.) Park some of the more annoying files
in compat/. Some of these are relicts from the time mplayer used
ffmpeg internals.
sub/ is not split, because it's too much of a mess (subtitle code is
mixed with OSD display and rendering).
Maybe the organization of core is not ideal: it mixes playback core
(like mplayer.c) and utility helpers (like bstr.c/h). Should the need
arise, the playback core will be moved somewhere else, while core
contains all helper and common code.
Diffstat (limited to 'core/m_struct.c')
-rw-r--r-- | core/m_struct.c | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/core/m_struct.c b/core/m_struct.c new file mode 100644 index 0000000000..7b885cc905 --- /dev/null +++ b/core/m_struct.c @@ -0,0 +1,91 @@ +/* + * 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, 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); +} |