annotate m_config.c @ 33441:d494a6d78677

Use int as type, there is no reason to use char which also causes issues since it may be either signed or unsigned.
author reimar
date Mon, 30 May 2011 21:16:37 +0000
parents 30e60125c2f4
children a5a0019e1c28
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30429
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
1 /*
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
2 * This file is part of MPlayer.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
3 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
5 * it under the terms of the GNU General Public License as published by
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
7 * (at your option) any later version.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
8 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
12 * GNU General Public License for more details.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
13 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
14 * You should have received a copy of the GNU General Public License along
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 29263
diff changeset
17 */
18258
96568be4bfdc Doxygen attack!
albeu
parents: 17856
diff changeset
18
96568be4bfdc Doxygen attack!
albeu
parents: 17856
diff changeset
19 /// \file
96568be4bfdc Doxygen attack!
albeu
parents: 17856
diff changeset
20 /// \ingroup Config
96568be4bfdc Doxygen attack!
albeu
parents: 17856
diff changeset
21
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
22 #include "config.h"
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
23
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
24 #include <stdlib.h>
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
25 #include <stdio.h>
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
26 #include <errno.h>
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
27 #include <string.h>
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
28 #ifdef MP_DEBUG
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
29 #include <assert.h>
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
30 #endif
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
31
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
32 #include "m_config.h"
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
33 #include "m_option.h"
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
34 #include "mp_msg.h"
13699
11b249ef87b0 printf --> mp_msg by the Wanderer <inverseparadox at comcast dot net>
diego
parents: 10595
diff changeset
35 #include "help_mp.h"
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
36
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
37 #define MAX_PROFILE_DEPTH 20
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
38
32301
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
39
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
40 static int parse_profile(const m_option_t *opt, const char *name,
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
41 const char *param, void *dst, int src)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
42 {
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
43 m_config_t *config = opt->priv;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
44 char **list = NULL;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
45 int i, r;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
46 if (param && !strcmp(param, "help")) {
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
47 m_profile_t *p;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
48 if (!config->profiles) {
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
49 mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_NoProfileDefined);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
50 return M_OPT_EXIT-1;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
51 }
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
52 mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_AvailableProfiles);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
53 for (p = config->profiles; p; p = p->next)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
54 mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\t%s\t%s\n", p->name,
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
55 p->desc ? p->desc : "");
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
56 mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n");
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
57 return M_OPT_EXIT-1;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
58 }
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
59
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
60 r = m_option_type_string_list.parse(opt, name, param, &list,src);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
61 if (r < 0)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
62 return r;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
63 if (!list || !list[0])
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
64 return M_OPT_INVALID;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
65 for (i = 0; list[i]; i++)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
66 if (!m_config_get_profile(config,list[i])) {
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
67 mp_msg(MSGT_CFGPARSER, MSGL_WARN, MSGTR_UnknownProfile, list[i]);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
68 r = M_OPT_INVALID;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
69 }
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
70 if (dst)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
71 m_option_copy(opt, dst, &list);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
72 else
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
73 m_option_free(opt, &list);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
74 return r;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
75 }
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
76
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
77 static void
32301
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
78 set_profile(const m_option_t *opt, void *dst, const void *src)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
79 {
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
80 m_config_t *config = opt->priv;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
81 m_profile_t *p;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
82 char **list = NULL;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
83 int i;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
84 if (!src || !*(char***)src)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
85 return;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
86 m_option_copy(opt,&list,src);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
87 for (i = 0; list[i]; i++) {
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
88 p = m_config_get_profile(config, list[i]);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
89 if (!p)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
90 continue;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
91 m_config_set_profile(config, p);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
92 }
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
93 m_option_free(opt, &list);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
94 }
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
95
32301
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
96 static int show_profile(m_option_t *opt, char* name, char *param)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
97 {
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
98 m_config_t *config = opt->priv;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
99 m_profile_t *p;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
100 int i, j;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
101 if (!param)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
102 return M_OPT_MISSING_PARAM;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
103 if (!(p = m_config_get_profile(config, param))) {
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
104 mp_msg(MSGT_CFGPARSER, MSGL_ERR, MSGTR_UnknownProfile, param);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
105 return M_OPT_EXIT - 1;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
106 }
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
107 if (!config->profile_depth)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
108 mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_Profile, param,
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
109 p->desc ? p->desc : "");
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
110 config->profile_depth++;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
111 for (i = 0; i < p->num_opts; i++) {
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
112 char spc[config->profile_depth + 1];
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
113 for (j = 0; j < config->profile_depth; j++)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
114 spc[j] = ' ';
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
115 spc[config->profile_depth] = '\0';
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
116
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
117 mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s%s=%s\n", spc,
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
118 p->opts[2 * i], p->opts[2 * i + 1]);
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
119
32301
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
120 if (config->profile_depth < MAX_PROFILE_DEPTH &&
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
121 !strcmp(p->opts[2*i],"profile")) {
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
122 char *e, *list = p->opts[2 * i + 1];
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
123 while ((e = strchr(list, ','))) {
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
124 int l = e-list;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
125 char tmp[l+1];
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
126 if (!l)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
127 continue;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
128 memcpy(tmp, list, l);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
129 tmp[l] = '\0';
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
130 show_profile(opt, name, tmp);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
131 list = e+1;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
132 }
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
133 if (list[0] != '\0')
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
134 show_profile(opt, name, list);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
135 }
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
136 }
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
137 config->profile_depth--;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
138 if (!config->profile_depth)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
139 mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n");
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
140 return M_OPT_EXIT - 1;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
141 }
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
142
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
143 static int list_options(m_option_t *opt, char* name, char *param)
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
144 {
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
145 m_config_t *config = opt->priv;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
146 m_config_print_option_list(config);
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
147 return M_OPT_EXIT;
a65635702512 cosmetics: Move some functions around to avoid ugly forward declarations.
diego
parents: 32300
diff changeset
148 }
17472
526abfe30498 Make -list-options work in both MPlayer and MEncoder.
albeu
parents: 17471
diff changeset
149
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
150 m_config_t*
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
151 m_config_new(void) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
152 m_config_t* config;
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25634
diff changeset
153 static int initialized = 0;
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
154 static m_option_type_t profile_opt_type;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
155 static m_option_t ref_opts[] = {
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
156 { "profile", NULL, &profile_opt_type, CONF_NOSAVE, 0, 0, NULL },
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
157 { "show-profile", show_profile, CONF_TYPE_PRINT_FUNC, CONF_NOCFG, 0, 0, NULL },
17472
526abfe30498 Make -list-options work in both MPlayer and MEncoder.
albeu
parents: 17471
diff changeset
158 { "list-options", list_options, CONF_TYPE_PRINT_FUNC, CONF_NOCFG, 0, 0, NULL },
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
159 { NULL, NULL, NULL, 0, 0, 0, NULL }
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
160 };
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
161 int i;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
162
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18335
diff changeset
163 config = calloc(1,sizeof(m_config_t));
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
164 config->lvl = 1; // 0 Is the defaults
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25634
diff changeset
165 if(!initialized) {
afa125da85cf typo fix: inited --> initialized
diego
parents: 25634
diff changeset
166 initialized = 1;
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
167 profile_opt_type = m_option_type_string_list;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
168 profile_opt_type.parse = parse_profile;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
169 profile_opt_type.set = set_profile;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
170 }
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
171 config->self_opts = malloc(sizeof(ref_opts));
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
172 memcpy(config->self_opts,ref_opts,sizeof(ref_opts));
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
173 for(i = 0 ; config->self_opts[i].name ; i++)
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
174 config->self_opts[i].priv = config;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
175 m_config_register_options(config,config->self_opts);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26408
diff changeset
176
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
177 return config;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
178 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
179
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
180 void
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
181 m_config_free(m_config_t* config) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
182 m_config_option_t *i = config->opts, *ct;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
183 m_config_save_slot_t *sl,*st;
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
184 m_profile_t *p,*pn;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
185 int j;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
186
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
187 #ifdef MP_DEBUG
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
188 assert(config != NULL);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
189 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26408
diff changeset
190
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
191 while(i) {
13824
bad703951cf9 a few 10l fixes by Wei Jiang <jiangw98@yahoo.com>
faust3
parents: 13699
diff changeset
192 if (i->flags & M_CFG_OPT_ALIAS)
bad703951cf9 a few 10l fixes by Wei Jiang <jiangw98@yahoo.com>
faust3
parents: 13699
diff changeset
193 sl = NULL;
bad703951cf9 a few 10l fixes by Wei Jiang <jiangw98@yahoo.com>
faust3
parents: 13699
diff changeset
194 else
bad703951cf9 a few 10l fixes by Wei Jiang <jiangw98@yahoo.com>
faust3
parents: 13699
diff changeset
195 sl = i->slots;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
196 while(sl) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
197 m_option_free(i->opt,sl->data);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
198 st = sl->prev;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
199 free(sl);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
200 sl = st;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
201 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
202 if(i->name != i->opt->name)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
203 free(i->name);
33397
30e60125c2f4 Add missing m_option_free() to m_config_free().
ib
parents: 32511
diff changeset
204 if(i->opt->p && (i->opt->type->flags & M_OPT_TYPE_DYNAMIC))
30e60125c2f4 Add missing m_option_free() to m_config_free().
ib
parents: 32511
diff changeset
205 m_option_free(i->opt, i->opt->p);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
206 ct = i->next;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
207 free(i);
13824
bad703951cf9 a few 10l fixes by Wei Jiang <jiangw98@yahoo.com>
faust3
parents: 13699
diff changeset
208 i = ct;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
209 }
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
210 for(p = config->profiles ; p ; p = pn) {
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
211 pn = p->next;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
212 free(p->name);
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32301
diff changeset
213 free(p->desc);
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
214 for(j = 0 ; j < p->num_opts ; j++) {
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
215 free(p->opts[2*j]);
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32301
diff changeset
216 free(p->opts[2*j + 1]);
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
217 }
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
218 free(p->opts);
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
219 free(p);
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
220 }
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
221 free(config->self_opts);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26408
diff changeset
222 free(config);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
223 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
224
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
225 void
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
226 m_config_push(m_config_t* config) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
227 m_config_option_t *co;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
228 m_config_save_slot_t *slot;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
229
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
230 #ifdef MP_DEBUG
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
231 assert(config != NULL);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
232 assert(config->lvl > 0);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
233 #endif
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
234
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
235 config->lvl++;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
236
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
237 for(co = config->opts ; co ; co = co->next ) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
238 if(co->opt->type->flags & M_OPT_TYPE_HAS_CHILD)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
239 continue;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
240 if(co->opt->flags & (M_OPT_GLOBAL|M_OPT_NOSAVE))
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
241 continue;
21054
7d5035aafcc6 Fix obvious typo, although the exact effect is still unclear to me, see also bug #593.
reimar
parents: 18879
diff changeset
242 if((co->opt->flags & M_OPT_OLD) && !(co->flags & M_CFG_OPT_SET))
9912
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
243 continue;
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
244 if(co->flags & M_CFG_OPT_ALIAS)
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
245 continue;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
246
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
247 // Update the current status
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
248 m_option_save(co->opt,co->slots->data,co->opt->p);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26408
diff changeset
249
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26408
diff changeset
250 // Allocate a new slot
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18335
diff changeset
251 slot = calloc(1,sizeof(m_config_save_slot_t) + co->opt->type->size);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
252 slot->lvl = config->lvl;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
253 slot->prev = co->slots;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
254 co->slots = slot;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
255 m_option_copy(co->opt,co->slots->data,co->slots->prev->data);
9912
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
256 // Reset our set flag
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
257 co->flags &= ~M_CFG_OPT_SET;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
258 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26408
diff changeset
259
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
260 mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Config pushed level is now %d\n",config->lvl);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
261 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
262
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
263 void
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
264 m_config_pop(m_config_t* config) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
265 m_config_option_t *co;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
266 m_config_save_slot_t *slot;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
267
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
268 #ifdef MP_DEBUG
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
269 assert(config != NULL);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
270 assert(config->lvl > 1);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
271 #endif
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
272
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
273 for(co = config->opts ; co ; co = co->next ) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
274 int pop = 0;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
275 if(co->opt->type->flags & M_OPT_TYPE_HAS_CHILD)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
276 continue;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
277 if(co->opt->flags & (M_OPT_GLOBAL|M_OPT_NOSAVE))
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
278 continue;
9912
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
279 if(co->flags & M_CFG_OPT_ALIAS)
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
280 continue;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
281 if(co->slots->lvl > config->lvl)
13699
11b249ef87b0 printf --> mp_msg by the Wanderer <inverseparadox at comcast dot net>
diego
parents: 10595
diff changeset
282 mp_msg(MSGT_CFGPARSER, MSGL_WARN,MSGTR_SaveSlotTooOld,config->lvl,co->slots->lvl);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26408
diff changeset
283
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
284 while(co->slots->lvl >= config->lvl) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
285 m_option_free(co->opt,co->slots->data);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
286 slot = co->slots;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
287 co->slots = slot->prev;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
288 free(slot);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
289 pop++;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
290 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
291 if(pop) // We removed some ctx -> set the previous value
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
292 m_option_set(co->opt,co->opt->p,co->slots->data);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
293 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
294
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
295 config->lvl--;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
296 mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Config poped level=%d\n",config->lvl);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
297 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
298
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
299 static void
25225
51c23a18a17b First try to mark some things in m_config correctly as const
reimar
parents: 23868
diff changeset
300 m_config_add_option(m_config_t *config, const m_option_t *arg, const char* prefix) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
301 m_config_option_t *co;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
302 m_config_save_slot_t* sl;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
303
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
304 #ifdef MP_DEBUG
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
305 assert(config != NULL);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
306 assert(config->lvl > 0);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
307 assert(arg != NULL);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
308 #endif
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
309
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
310 // Allocate a new entry for this option
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18335
diff changeset
311 co = calloc(1,sizeof(m_config_option_t) + arg->type->size);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
312 co->opt = arg;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
313
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
314 // Fill in the full name
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
315 if(prefix && strlen(prefix) > 0) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
316 int l = strlen(prefix) + 1 + strlen(arg->name) + 1;
23806
0a38ad149c5c Remove some more useless *alloc casts
reimar
parents: 21054
diff changeset
317 co->name = malloc(l);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
318 sprintf(co->name,"%s:%s",prefix,arg->name);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
319 } else
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
320 co->name = arg->name;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
321
23868
09c2fe1e021d Fix some typos in comments
reimar
parents: 23806
diff changeset
322 // Option with children -> add them
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
323 if(arg->type->flags & M_OPT_TYPE_HAS_CHILD) {
25225
51c23a18a17b First try to mark some things in m_config correctly as const
reimar
parents: 23868
diff changeset
324 const m_option_t *ol = arg->p;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
325 int i;
13824
bad703951cf9 a few 10l fixes by Wei Jiang <jiangw98@yahoo.com>
faust3
parents: 13699
diff changeset
326 co->slots = NULL;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
327 for(i = 0 ; ol[i].name != NULL ; i++)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
328 m_config_add_option(config,&ol[i], co->name);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
329 } else {
9912
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
330 m_config_option_t *i;
23868
09c2fe1e021d Fix some typos in comments
reimar
parents: 23806
diff changeset
331 // Check if there is already an option pointing to this address
9912
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
332 if(arg->p) {
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
333 for(i = config->opts ; i ; i = i->next ) {
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
334 if(i->opt->p == arg->p) { // So we don't save the same vars more than 1 time
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
335 co->slots = i->slots;
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
336 co->flags |= M_CFG_OPT_ALIAS;
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
337 break;
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
338 }
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
339 }
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
340 }
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
341 if(!(co->flags & M_CFG_OPT_ALIAS)) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
342 // Allocate a slot for the defaults
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18335
diff changeset
343 sl = calloc(1,sizeof(m_config_save_slot_t) + arg->type->size);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
344 m_option_save(arg,sl->data,(void**)arg->p);
23868
09c2fe1e021d Fix some typos in comments
reimar
parents: 23806
diff changeset
345 // Hack to avoid too much trouble with dynamically allocated data :
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
346 // We always use a dynamic version
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
347 if((arg->type->flags & M_OPT_TYPE_DYNAMIC) && arg->p && (*(void**)arg->p)) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
348 *(void**)arg->p = NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
349 m_option_set(arg,arg->p,sl->data);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
350 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
351 sl->lvl = 0;
13824
bad703951cf9 a few 10l fixes by Wei Jiang <jiangw98@yahoo.com>
faust3
parents: 13699
diff changeset
352 sl->prev = NULL;
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18335
diff changeset
353 co->slots = calloc(1,sizeof(m_config_save_slot_t) + arg->type->size);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
354 co->slots->prev = sl;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
355 co->slots->lvl = config->lvl;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
356 m_option_copy(co->opt,co->slots->data,sl->data);
9912
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
357 } // !M_OPT_ALIAS
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
358 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
359 co->next = config->opts;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
360 config->opts = co;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
361 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
362
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
363 int
25225
51c23a18a17b First try to mark some things in m_config correctly as const
reimar
parents: 23868
diff changeset
364 m_config_register_options(m_config_t *config, const m_option_t *args) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
365 int i;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
366
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
367 #ifdef MP_DEBUG
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
368 assert(config != NULL);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
369 assert(config->lvl > 0);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
370 assert(args != NULL);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
371 #endif
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
372
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
373 for(i = 0 ; args[i].name != NULL ; i++)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
374 m_config_add_option(config,&args[i],NULL);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
375
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
376 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
377 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
378
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26408
diff changeset
379 static m_config_option_t*
32300
1ca3d798b518 Mark some function parameters that are not modified as const.
diego
parents: 30728
diff changeset
380 m_config_get_co(const m_config_t *config, char *arg) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
381 m_config_option_t *co;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
382
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
383 for(co = config->opts ; co ; co = co->next ) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
384 int l = strlen(co->name) - 1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26408
diff changeset
385 if((co->opt->type->flags & M_OPT_TYPE_ALLOW_WILDCARD) &&
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
386 (co->name[l] == '*')) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
387 if(strncasecmp(co->name,arg,l) == 0)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
388 return co;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
389 } else if(strcasecmp(co->name,arg) == 0)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
390 return co;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
391 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
392 return NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
393 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
394
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
395 static int
32300
1ca3d798b518 Mark some function parameters that are not modified as const.
diego
parents: 30728
diff changeset
396 m_config_parse_option(const m_config_t *config, char *arg, char *param, int set) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
397 m_config_option_t *co;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
398 int r = 0;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
399
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
400 #ifdef MP_DEBUG
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
401 assert(config != NULL);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
402 assert(config->lvl > 0);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
403 assert(arg != NULL);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
404 #endif
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
405
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
406 co = m_config_get_co(config,arg);
8892
06843e67a04b print meaningful error message
arpi
parents: 8512
diff changeset
407 if(!co){
8894
e6a83b140b39 better error handling for invalud suboptions
arpi
parents: 8892
diff changeset
408 // mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Unknown option: %s\n",arg);
10595
522afd56703c 100l to albeu for his english grammar, and 10l to me becouse I noticed that lately (my backward compatibilty macro uses M_OPT_UNKNOWN)
alex
parents: 10594
diff changeset
409 return M_OPT_UNKNOWN;
8892
06843e67a04b print meaningful error message
arpi
parents: 8512
diff changeset
410 }
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
411
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
412 #ifdef MP_DEBUG
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
413 // This is the only mandatory function
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
414 assert(co->opt->type->parse);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
415 #endif
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
416
23868
09c2fe1e021d Fix some typos in comments
reimar
parents: 23806
diff changeset
417 // Check if this option isn't forbidden in the current mode
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
418 if((config->mode == M_CONFIG_FILE) && (co->opt->flags & M_OPT_NOCFG)) {
13699
11b249ef87b0 printf --> mp_msg by the Wanderer <inverseparadox at comcast dot net>
diego
parents: 10595
diff changeset
419 mp_msg(MSGT_CFGPARSER, MSGL_ERR,MSGTR_InvalidCfgfileOption,arg);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
420 return M_OPT_INVALID;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
421 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
422 if((config->mode == M_COMMAND_LINE) && (co->opt->flags & M_OPT_NOCMD)) {
13699
11b249ef87b0 printf --> mp_msg by the Wanderer <inverseparadox at comcast dot net>
diego
parents: 10595
diff changeset
423 mp_msg(MSGT_CFGPARSER, MSGL_ERR,MSGTR_InvalidCmdlineOption,arg);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
424 return M_OPT_INVALID;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
425 }
26408
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26288
diff changeset
426 // During command line preparse set only pre-parse options
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26288
diff changeset
427 // Otherwise only set pre-parse option if they were not already set.
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26288
diff changeset
428 if(((config->mode == M_COMMAND_LINE_PRE_PARSE) &&
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26288
diff changeset
429 !(co->opt->flags & M_OPT_PRE_PARSE)) ||
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26288
diff changeset
430 ((config->mode != M_COMMAND_LINE_PRE_PARSE) &&
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26288
diff changeset
431 (co->opt->flags & M_OPT_PRE_PARSE) && (co->flags & M_CFG_OPT_SET)))
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26288
diff changeset
432 set = 0;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
433
23868
09c2fe1e021d Fix some typos in comments
reimar
parents: 23806
diff changeset
434 // Option with children are a bit different to parse
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
435 if(co->opt->type->flags & M_OPT_TYPE_HAS_CHILD) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
436 char** lst = NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
437 int i,sr;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
438 // Parse the child options
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9222
diff changeset
439 r = m_option_parse(co->opt,arg,param,&lst,M_COMMAND_LINE);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
440 // Set them now
8894
e6a83b140b39 better error handling for invalud suboptions
arpi
parents: 8892
diff changeset
441 if(r >= 0)
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
442 for(i = 0 ; lst && lst[2*i] ; i++) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
443 int l = strlen(co->name) + 1 + strlen(lst[2*i]) + 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
444 if(r >= 0) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
445 // Build the full name
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
446 char n[l];
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
447 sprintf(n,"%s:%s",co->name,lst[2*i]);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
448 sr = m_config_parse_option(config,n,lst[2*i+1],set);
8894
e6a83b140b39 better error handling for invalud suboptions
arpi
parents: 8892
diff changeset
449 if(sr < 0){
10595
522afd56703c 100l to albeu for his english grammar, and 10l to me becouse I noticed that lately (my backward compatibilty macro uses M_OPT_UNKNOWN)
alex
parents: 10594
diff changeset
450 if(sr == M_OPT_UNKNOWN){
13699
11b249ef87b0 printf --> mp_msg by the Wanderer <inverseparadox at comcast dot net>
diego
parents: 10595
diff changeset
451 mp_msg(MSGT_CFGPARSER, MSGL_ERR,MSGTR_InvalidSuboption,co->name,lst[2*i]);
8894
e6a83b140b39 better error handling for invalud suboptions
arpi
parents: 8892
diff changeset
452 r = M_OPT_INVALID;
e6a83b140b39 better error handling for invalud suboptions
arpi
parents: 8892
diff changeset
453 } else
9222
d3da9b617aa8 print meaningful error message for missing parameter
arpi
parents: 8894
diff changeset
454 if(sr == M_OPT_MISSING_PARAM){
13699
11b249ef87b0 printf --> mp_msg by the Wanderer <inverseparadox at comcast dot net>
diego
parents: 10595
diff changeset
455 mp_msg(MSGT_CFGPARSER, MSGL_ERR,MSGTR_MissingSuboptionParameter,lst[2*i],co->name);
9222
d3da9b617aa8 print meaningful error message for missing parameter
arpi
parents: 8894
diff changeset
456 r = M_OPT_INVALID;
d3da9b617aa8 print meaningful error message for missing parameter
arpi
parents: 8894
diff changeset
457 } else
8894
e6a83b140b39 better error handling for invalud suboptions
arpi
parents: 8892
diff changeset
458 r = sr;
e6a83b140b39 better error handling for invalud suboptions
arpi
parents: 8892
diff changeset
459 }
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
460 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
461 free(lst[2*i]);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
462 free(lst[2*i+1]);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
463 }
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32301
diff changeset
464 free(lst);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
465 } else
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
466 r = m_option_parse(co->opt,arg,param,set ? co->slots->data : NULL,config->mode);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
467
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
468 // Parsing failed ?
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
469 if(r < 0)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
470 return r;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
471 // Set the option
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
472 if(set) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
473 m_option_set(co->opt,co->opt->p,co->slots->data);
9912
39444d65c4cb Don't save restore all options wich point to the same variable.
albeu
parents: 9593
diff changeset
474 co->flags |= M_CFG_OPT_SET;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
475 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
476
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
477 return r;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
478 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
479
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
480 int
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
481 m_config_set_option(m_config_t *config, char* arg, char* param) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
482 mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Setting %s=%s\n",arg,param);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
483 return m_config_parse_option(config,arg,param,1);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
484 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
485
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
486 int
32300
1ca3d798b518 Mark some function parameters that are not modified as const.
diego
parents: 30728
diff changeset
487 m_config_check_option(const m_config_t *config, char *arg, char *param) {
9222
d3da9b617aa8 print meaningful error message for missing parameter
arpi
parents: 8894
diff changeset
488 int r;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
489 mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Checking %s=%s\n",arg,param);
9222
d3da9b617aa8 print meaningful error message for missing parameter
arpi
parents: 8894
diff changeset
490 r=m_config_parse_option(config,arg,param,0);
d3da9b617aa8 print meaningful error message for missing parameter
arpi
parents: 8894
diff changeset
491 if(r==M_OPT_MISSING_PARAM){
13699
11b249ef87b0 printf --> mp_msg by the Wanderer <inverseparadox at comcast dot net>
diego
parents: 10595
diff changeset
492 mp_msg(MSGT_CFGPARSER, MSGL_ERR,MSGTR_MissingOptionParameter,arg);
9222
d3da9b617aa8 print meaningful error message for missing parameter
arpi
parents: 8894
diff changeset
493 return M_OPT_INVALID;
d3da9b617aa8 print meaningful error message for missing parameter
arpi
parents: 8894
diff changeset
494 }
d3da9b617aa8 print meaningful error message for missing parameter
arpi
parents: 8894
diff changeset
495 return r;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
496 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
497
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
498
25225
51c23a18a17b First try to mark some things in m_config correctly as const
reimar
parents: 23868
diff changeset
499 const m_option_t*
32300
1ca3d798b518 Mark some function parameters that are not modified as const.
diego
parents: 30728
diff changeset
500 m_config_get_option(const m_config_t *config, char *arg) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
501 m_config_option_t *co;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
502
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
503 #ifdef MP_DEBUG
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
504 assert(config != NULL);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
505 assert(config->lvl > 0);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
506 assert(arg != NULL);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
507 #endif
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
508
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
509 co = m_config_get_co(config,arg);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
510 if(co)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
511 return co->opt;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
512 else
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
513 return NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
514 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
515
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
516
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
517 void
32300
1ca3d798b518 Mark some function parameters that are not modified as const.
diego
parents: 30728
diff changeset
518 m_config_print_option_list(const m_config_t *config) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
519 char min[50],max[50];
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
520 m_config_option_t* co;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
521 int count = 0;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
522
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
523 if(!config->opts) return;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
524
17481
99c0caec4677 Fix the MSG?_FIXME and make the profiles help translatable.
albeu
parents: 17472
diff changeset
525 mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_OptionListHeader);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
526 for(co = config->opts ; co ; co = co->next) {
25225
51c23a18a17b First try to mark some things in m_config correctly as const
reimar
parents: 23868
diff changeset
527 const m_option_t* opt = co->opt;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
528 if(opt->type->flags & M_OPT_TYPE_HAS_CHILD) continue;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
529 if(opt->flags & M_OPT_MIN)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
530 sprintf(min,"%-8.0f",opt->min);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
531 else
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
532 strcpy(min,"No");
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
533 if(opt->flags & M_OPT_MAX)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
534 sprintf(max,"%-8.0f",opt->max);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
535 else
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
536 strcpy(max,"No");
17481
99c0caec4677 Fix the MSG?_FIXME and make the profiles help translatable.
albeu
parents: 17472
diff changeset
537 mp_msg(MSGT_CFGPARSER, MSGL_INFO, " %-20.20s %-15.15s %-10.10s %-10.10s %-3.3s %-3.3s %-3.3s\n",
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
538 co->name,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
539 co->opt->type->name,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
540 min,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
541 max,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
542 opt->flags & CONF_GLOBAL ? "Yes" : "No",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
543 opt->flags & CONF_NOCMD ? "No" : "Yes",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
544 opt->flags & CONF_NOCFG ? "No" : "Yes");
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
545 count++;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
546 }
17481
99c0caec4677 Fix the MSG?_FIXME and make the profiles help translatable.
albeu
parents: 17472
diff changeset
547 mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_TotalOptions,count);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
548 }
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
549
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
550 m_profile_t*
32300
1ca3d798b518 Mark some function parameters that are not modified as const.
diego
parents: 30728
diff changeset
551 m_config_get_profile(const m_config_t *config, char *name) {
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
552 m_profile_t* p;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
553 for(p = config->profiles ; p ; p = p->next)
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
554 if(!strcmp(p->name,name)) return p;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
555 return NULL;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
556 }
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
557
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
558 m_profile_t*
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
559 m_config_add_profile(m_config_t* config, char* name) {
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
560 m_profile_t* p = m_config_get_profile(config,name);
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
561 if(p) return p;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
562 p = calloc(1,sizeof(m_profile_t));
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
563 p->name = strdup(name);
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
564 p->next = config->profiles;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
565 config->profiles = p;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
566 return p;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
567 }
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
568
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
569 void
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
570 m_profile_set_desc(m_profile_t* p, char* desc) {
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32301
diff changeset
571 free(p->desc);
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
572 p->desc = desc ? strdup(desc) : NULL;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
573 }
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
574
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
575 int
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
576 m_config_set_profile_option(m_config_t* config, m_profile_t* p,
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
577 char* name, char* val) {
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
578 int i = m_config_check_option(config,name,val);
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
579 if(i < 0) return i;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
580 if(p->opts) p->opts = realloc(p->opts,2*(p->num_opts+2)*sizeof(char*));
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
581 else p->opts = malloc(2*(p->num_opts+2)*sizeof(char*));
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
582 p->opts[p->num_opts*2] = strdup(name);
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
583 p->opts[p->num_opts*2+1] = val ? strdup(val) : NULL;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
584 p->num_opts++;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
585 p->opts[p->num_opts*2] = p->opts[p->num_opts*2+1] = NULL;
17856
98f0e0542cb6 10L fix missing return statement.
albeu
parents: 17481
diff changeset
586 return 1;
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
587 }
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
588
25634
4344e84f7a9f export m_config_set_profile()
ben
parents: 25225
diff changeset
589 void
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
590 m_config_set_profile(m_config_t* config, m_profile_t* p) {
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
591 int i;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
592 if(config->profile_depth > MAX_PROFILE_DEPTH) {
18335
5766a9d21992 Rename some misspelled and misnamed messages.
diego
parents: 18258
diff changeset
593 mp_msg(MSGT_CFGPARSER, MSGL_WARN, MSGTR_ProfileInclusionTooDeep);
17471
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
594 return;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
595 }
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
596 config->profile_depth++;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
597 for(i = 0 ; i < p->num_opts ; i++)
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
598 m_config_set_option(config,p->opts[2*i],p->opts[2*i+1]);
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
599 config->profile_depth--;
63909962d3fc Profiles support.
albeu
parents: 13824
diff changeset
600 }