annotate m_option.c @ 35805:5d163370a554

Restructure code for video window in uiChangeSkin(). Compact the conditions. It's much clearer now what's happening. Additionally, change comment to indicate that the video window will not be reloaded (like all other windows).
author ib
date Sat, 26 Jan 2013 15:32:37 +0000
parents 388b4cc85c0e
children 389d43c448b3
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: 30241
diff changeset
1 /*
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30241
diff changeset
2 * This file is part of MPlayer.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30241
diff changeset
3 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30241
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: 30241
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: 30241
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: 30241
diff changeset
7 * (at your option) any later version.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30241
diff changeset
8 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30241
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: 30241
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: 30241
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: 30241
diff changeset
12 * GNU General Public License for more details.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30241
diff changeset
13 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30241
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: 30241
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: 30241
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: 30241
diff changeset
17 */
18258
96568be4bfdc Doxygen attack!
albeu
parents: 18237
diff changeset
18
96568be4bfdc Doxygen attack!
albeu
parents: 18237
diff changeset
19 /// \file
96568be4bfdc Doxygen attack!
albeu
parents: 18237
diff changeset
20 /// \ingroup Options
96568be4bfdc Doxygen attack!
albeu
parents: 18237
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 <string.h>
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
26 #include <math.h>
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
27 #include <stdio.h>
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
28 #include <stdarg.h>
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
29 #include <inttypes.h>
8262
103a2758f9c5 FreeBSD fix
nexus
parents: 8168
diff changeset
30 #include <unistd.h>
8164
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_option.h"
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
33 //#include "m_config.h"
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
34 #include "mp_msg.h"
35590
388b4cc85c0e Allow "nopts" as time specification, it might be useful in
reimar
parents: 35272
diff changeset
35 #include "mp_global.h"
19271
64d82a45a05d introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents: 19194
diff changeset
36 #include "stream/url.h"
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23423
diff changeset
37 #include "libavutil/avstring.h"
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
38
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
39 // Don't free for 'production' atm
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
40 #ifndef MP_DEBUG
16425
7ca9d8c0ae47 Do not define NO_FREE, it causes a giant memleak with -loop 0 and a short file.
reimar
parents: 16345
diff changeset
41 //#define NO_FREE
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
42 #endif
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
43
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
44 const m_option_t* m_option_list_find(const m_option_t* list,const char* name) {
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
45 int i;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
46
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
47 for(i = 0 ; list[i].name ; i++) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
48 int l = strlen(list[i].name) - 1;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
49 if((list[i].type->flags & M_OPT_TYPE_ALLOW_WILDCARD) &&
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
50 (l > 0) && (list[i].name[l] == '*')) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
51 if(strncasecmp(list[i].name,name,l) == 0)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
52 return &list[i];
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
53 } else if(strcasecmp(list[i].name,name) == 0)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
54 return &list[i];
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
55 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
56 return NULL;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
57 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
58
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
59 // Default function that just does a memcpy
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
60
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
61 static void copy_opt(const m_option_t* opt,void* dst,const void* src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
62 if(dst && src)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
63 memcpy(dst,src,opt->type->size);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
64 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
65
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
66 // Helper for the print funcs (from man printf)
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
67 static char* dup_printf(const char *fmt, ...) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
68 /* Guess we need no more than 50 bytes. */
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
69 int n, size = 50;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
70 char *p;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
71 va_list ap;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
72 if ((p = malloc (size)) == NULL)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
73 return NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
74 while (1) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
75 /* Try to print in the allocated space. */
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
76 va_start(ap, fmt);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
77 n = vsnprintf (p, size, fmt, ap);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
78 va_end(ap);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
79 /* If that worked, return the string. */
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
80 if (n > -1 && n < size)
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
81 return p;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
82 /* Else try again with more space. */
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
83 if (n > -1) /* glibc 2.1 */
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
84 size = n+1; /* precisely what is needed */
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
85 else /* glibc 2.0 */
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
86 size *= 2; /* twice the old size */
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
87 if ((p = realloc (p, size)) == NULL)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
88 return NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
89 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
90 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
91
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
92
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
93 // Flag
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
94
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
95 #define VAL(x) (*(int*)(x))
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
96
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
97 static int parse_flag(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
98 if (src == M_CONFIG_FILE) {
10355
b39a943c902f Fix the segfault in case of missing arg for flag options
albeu
parents: 10236
diff changeset
99 if(!param) return M_OPT_MISSING_PARAM;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
100 if (!strcasecmp(param, "yes") || /* any other language? */
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
101 !strcasecmp(param, "on") ||
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
102 !strcasecmp(param, "ja") ||
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
103 !strcasecmp(param, "si") ||
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
104 !strcasecmp(param, "igen") ||
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
105 !strcasecmp(param, "y") ||
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
106 !strcasecmp(param, "j") ||
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
107 !strcasecmp(param, "i") ||
11781
03baca2aa79c polish yes/no options support
wight
parents: 11771
diff changeset
108 !strcasecmp(param, "tak") ||
11785
3f488aa0d646 swedish yes/no options support
wight
parents: 11781
diff changeset
109 !strcasecmp(param, "ja") ||
12775
470c2e531d10 make config accept true/false as parameters
iive
parents: 12653
diff changeset
110 !strcasecmp(param, "true") ||
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
111 !strcmp(param, "1")) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
112 if(dst) VAL(dst) = opt->max;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
113 } else if (!strcasecmp(param, "no") ||
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
114 !strcasecmp(param, "off") ||
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
115 !strcasecmp(param, "nein") ||
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
116 !strcasecmp(param, "nicht") ||
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
117 !strcasecmp(param, "nem") ||
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
118 !strcasecmp(param, "n") ||
11781
03baca2aa79c polish yes/no options support
wight
parents: 11771
diff changeset
119 !strcasecmp(param, "nie") ||
11785
3f488aa0d646 swedish yes/no options support
wight
parents: 11781
diff changeset
120 !strcasecmp(param, "nej") ||
12775
470c2e531d10 make config accept true/false as parameters
iive
parents: 12653
diff changeset
121 !strcasecmp(param, "false") ||
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
122 !strcmp(param, "0")) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
123 if(dst) VAL(dst) = opt->min;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
124 } else {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
125 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Invalid parameter for %s flag: %s\n",name, param);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
126 return M_OPT_INVALID;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
127 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
128 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
129 } else {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
130 if(dst) VAL(dst) = opt->max;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
131 return 0;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
132 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
133 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
134
25229
4f611a555224 Option print functions may not and do not modify value
reimar
parents: 24966
diff changeset
135 static char* print_flag(const m_option_t* opt, const void* val) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
136 if(VAL(val) == opt->min)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
137 return strdup("no");
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
138 else
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
139 return strdup("yes");
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
140 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
141
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
142 const m_option_type_t m_option_type_flag = {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
143 "Flag",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
144 "need yes or no in config files",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
145 sizeof(int),
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
146 0,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
147 parse_flag,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
148 print_flag,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
149 copy_opt,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
150 copy_opt,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
151 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
152 NULL
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
153 };
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
154
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
155 // Integer
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
156
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
157 static int parse_int(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
28758
f8625bfd9aa5 Use strtoll in parse_int to avoid discrepancies between 32 and 64 bit systems.
reimar
parents: 28757
diff changeset
158 long long tmp_int;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
159 char *endptr;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
160 src = 0;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
161
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
162 if (param == NULL)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
163 return M_OPT_MISSING_PARAM;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
164
28758
f8625bfd9aa5 Use strtoll in parse_int to avoid discrepancies between 32 and 64 bit systems.
reimar
parents: 28757
diff changeset
165 tmp_int = strtoll(param, &endptr, 10);
18718
7ef29a590f3f Do not parse numbers as octal, strip leading zeroes instead.
reimar
parents: 18258
diff changeset
166 if (*endptr)
28758
f8625bfd9aa5 Use strtoll in parse_int to avoid discrepancies between 32 and 64 bit systems.
reimar
parents: 28757
diff changeset
167 tmp_int = strtoll(param, &endptr, 0);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
168 if (*endptr) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
169 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "The %s option must be an integer: %s\n",name, param);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
170 return M_OPT_INVALID;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
171 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
172
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
173 if ((opt->flags & M_OPT_MIN) && (tmp_int < opt->min)) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
174 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "The %s option must be >= %d: %s\n", name, (int) opt->min, param);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
175 return M_OPT_OUT_OF_RANGE;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
176 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
177
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
178 if ((opt->flags & M_OPT_MAX) && (tmp_int > opt->max)) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
179 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "The %s option must be <= %d: %s\n",name, (int) opt->max, param);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
180 return M_OPT_OUT_OF_RANGE;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
181 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
182
28759
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
183 if(dst) {
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
184 if (opt->type->size == sizeof(int64_t))
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
185 *(int64_t *)dst = tmp_int;
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
186 else
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
187 VAL(dst) = tmp_int;
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
188 }
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
189
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
190 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
191 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
192
25229
4f611a555224 Option print functions may not and do not modify value
reimar
parents: 24966
diff changeset
193 static char* print_int(const m_option_t* opt, const void* val) {
28759
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
194 if (opt->type->size == sizeof(int64_t))
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
195 return dup_printf("%"PRId64, *(const int64_t *)val);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
196 return dup_printf("%d",VAL(val));
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
197 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
198
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
199 const m_option_type_t m_option_type_int = {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
200 "Integer",
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 sizeof(int),
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
203 0,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
204 parse_int,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
205 print_int,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
206 copy_opt,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
207 copy_opt,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
208 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
209 NULL
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
210 };
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
211
28759
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
212 const m_option_type_t m_option_type_int64 = {
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
213 "Integer64",
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
214 "",
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
215 sizeof(int64_t),
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
216 0,
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
217 parse_int,
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
218 print_int,
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
219 copy_opt,
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
220 copy_opt,
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
221 NULL,
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
222 NULL
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
223 };
af274aef6b81 Add a 64 bit integer type to the suboption parser.
reimar
parents: 28758
diff changeset
224
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
225 // Float
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
226
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
227 #undef VAL
11947
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
228 #define VAL(x) (*(double*)(x))
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
229
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
230 static int parse_double(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
11947
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
231 double tmp_float;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
232 char* endptr;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
233 src = 0;
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 if (param == NULL)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
236 return M_OPT_MISSING_PARAM;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
237
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
238 tmp_float = strtod(param, &endptr);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
239
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
240 switch(*endptr) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
241 case ':':
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
242 case '/':
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
243 tmp_float /= strtod(endptr+1, &endptr);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
244 break;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
245 case '.':
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
246 case ',':
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
247 /* we also handle floats specified with
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
248 * non-locale decimal point ::atmos
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
249 */
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
250 if(tmp_float<0)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
251 tmp_float -= 1.0/pow(10,strlen(endptr+1)) * strtod(endptr+1, &endptr);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
252 else
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
253 tmp_float += 1.0/pow(10,strlen(endptr+1)) * strtod(endptr+1, &endptr);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
254 break;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
255 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
256
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
257 if (*endptr) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
258 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "The %s option must be a floating point "
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
259 "number or a ratio (numerator[:/]denominator): %s\n",name, param);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
260 return M_OPT_INVALID;
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 if (opt->flags & M_OPT_MIN)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
264 if (tmp_float < opt->min) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
265 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "The %s option must be >= %f: %s\n", name, opt->min, param);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
266 return M_OPT_OUT_OF_RANGE;
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
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
269 if (opt->flags & M_OPT_MAX)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
270 if (tmp_float > opt->max) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
271 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "The %s option must be <= %f: %s\n", name, opt->max, param);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
272 return M_OPT_OUT_OF_RANGE;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
273 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
274
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
275 if(dst) VAL(dst) = tmp_float;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
276 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
277 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
278
25229
4f611a555224 Option print functions may not and do not modify value
reimar
parents: 24966
diff changeset
279 static char* print_double(const m_option_t* opt, const void* val) {
11947
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
280 opt = NULL;
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
281 return dup_printf("%f",VAL(val));
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
282 }
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
283
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
284 const m_option_type_t m_option_type_double = {
11947
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
285 "Double",
31834
64ba1daa147a various spelling fixes, found by the Debian QA tool 'lintian'
siretart
parents: 31493
diff changeset
286 "double precision floating point number or ratio (numerator[:/]denominator)",
11947
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
287 sizeof(double),
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
288 0,
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
289 parse_double,
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
290 print_double,
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
291 copy_opt,
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
292 copy_opt,
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
293 NULL,
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
294 NULL
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
295 };
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
296
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
297 #undef VAL
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
298 #define VAL(x) (*(float*)(x))
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
299
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
300 static int parse_float(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
11947
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
301 double tmp;
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
302 int r= parse_double(opt, name, param, &tmp, src);
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
303 if(r==1 && dst) VAL(dst) = tmp;
11950
1d32c7c7355c 100l (cvs commit + tired ...)
michael
parents: 11947
diff changeset
304 return r;
11947
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
305 }
3ccd5dcf447c m_option_type_double
michael
parents: 11785
diff changeset
306
25229
4f611a555224 Option print functions may not and do not modify value
reimar
parents: 24966
diff changeset
307 static char* print_float(const m_option_t* opt, const void* val) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
308 opt = NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
309 return dup_printf("%f",VAL(val));
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
310 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
311
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
312 const m_option_type_t m_option_type_float = {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
313 "Float",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
314 "floating point number or ratio (numerator[:/]denominator)",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
315 sizeof(float),
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
316 0,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
317 parse_float,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
318 print_float,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
319 copy_opt,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
320 copy_opt,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
321 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
322 NULL
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
323 };
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
324
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
325 ///////////// Position
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
326 #undef VAL
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
327 #define VAL(x) (*(off_t*)(x))
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
328
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
329 static int parse_position(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
330 off_t tmp_off;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
331 char dummy;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
332
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
333 if (param == NULL)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
334 return M_OPT_MISSING_PARAM;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
335 if (sscanf(param, sizeof(off_t) == sizeof(int) ?
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16741
diff changeset
336 "%d%c" : "%"PRId64"%c", &tmp_off, &dummy) != 1) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
337 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "The %s option must be an integer: %s\n",opt->name,param);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
338 return M_OPT_INVALID;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
339 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
340
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
341 if (opt->flags & M_OPT_MIN)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
342 if (tmp_off < opt->min) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
343 mp_msg(MSGT_CFGPARSER, MSGL_ERR,
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16741
diff changeset
344 "The %s option must be >= %"PRId64": %s\n",
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16741
diff changeset
345 name, (int64_t) opt->min, param);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
346 return M_OPT_OUT_OF_RANGE;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
347 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
348
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
349 if (opt->flags & M_OPT_MAX)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
350 if (tmp_off > opt->max) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
351 mp_msg(MSGT_CFGPARSER, MSGL_ERR,
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16741
diff changeset
352 "The %s option must be <= %"PRId64": %s\n",
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16741
diff changeset
353 name, (int64_t) opt->max, param);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
354 return M_OPT_OUT_OF_RANGE;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
355 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
356
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
357 if(dst)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
358 VAL(dst) = tmp_off;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
359 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
360 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
361
25229
4f611a555224 Option print functions may not and do not modify value
reimar
parents: 24966
diff changeset
362 static char* print_position(const m_option_t* opt, const void* val) {
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16741
diff changeset
363 return dup_printf("%"PRId64,(int64_t)VAL(val));
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
364 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
365
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
366 const m_option_type_t m_option_type_position = {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
367 "Position",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
368 "Integer (off_t)",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
369 sizeof(off_t),
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
370 0,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
371 parse_position,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
372 print_position,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
373 copy_opt,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
374 copy_opt,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
375 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
376 NULL
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
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
379
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
380 ///////////// String
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
381
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
382 #undef VAL
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
383 #define VAL(x) (*(char**)(x))
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
384
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
385 static int parse_str(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
386
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
387
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
388 if (param == NULL)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
389 return M_OPT_MISSING_PARAM;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
390
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
391 if ((opt->flags & M_OPT_MIN) && (strlen(param) < opt->min)) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
392 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Parameter must be >= %d chars: %s\n",
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
393 (int) opt->min, param);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
394 return M_OPT_OUT_OF_RANGE;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
395 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
396
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
397 if ((opt->flags & M_OPT_MAX) && (strlen(param) > opt->max)) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
398 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Parameter must be <= %d chars: %s\n",
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
399 (int) opt->max, param);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
400 return M_OPT_OUT_OF_RANGE;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
401 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
402
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
403 if(dst) {
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32428
diff changeset
404 free(VAL(dst));
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
405 VAL(dst) = strdup(param);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
406 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
407
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
408 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
409
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
410 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
411
25229
4f611a555224 Option print functions may not and do not modify value
reimar
parents: 24966
diff changeset
412 static char* print_str(const m_option_t* opt, const void* val) {
8168
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
413 return (val && VAL(val) && strlen(VAL(val)) > 0) ? strdup(VAL(val)) : NULL;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
414 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
415
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
416 static void copy_str(const m_option_t* opt,void* dst, const void* src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
417 if(dst && src) {
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
418 #ifndef NO_FREE
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32428
diff changeset
419 free(VAL(dst)); //FIXME!!!
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
420 #endif
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
421 VAL(dst) = VAL(src) ? strdup(VAL(src)) : NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
422 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
423 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
424
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
425 static void free_str(void* src) {
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
426 if(src && VAL(src)){
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
427 #ifndef NO_FREE
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
428 free(VAL(src)); //FIXME!!!
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
429 #endif
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
430 VAL(src) = NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
431 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
432 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
433
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
434 const m_option_type_t m_option_type_string = {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
435 "String",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
436 "",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
437 sizeof(char*),
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
438 M_OPT_TYPE_DYNAMIC,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
439 parse_str,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
440 print_str,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
441 copy_str,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
442 copy_str,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
443 copy_str,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
444 free_str
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
445 };
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
446
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
447 //////////// String list
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
448
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
449 #define LIST_SEPARATOR ','
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
450 #undef VAL
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
451 #define VAL(x) (*(char***)(x))
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
452
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
453 #define OP_NONE 0
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
454 #define OP_ADD 1
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
455 #define OP_PRE 2
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
456 #define OP_DEL 3
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
457 #define OP_CLR 4
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
458
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
459 static void free_str_list(void* dst) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
460 char** d;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
461 int i;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
462
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
463 if(!dst || !VAL(dst)) return;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
464 d = VAL(dst);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
465
9177
01a713dcaf23 disable free() in string and string_list parsers. yes, it's a hack
arpi
parents: 8736
diff changeset
466 // FIXME!!!
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
467 #ifndef NO_FREE
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
468 for(i = 0 ; d[i] != NULL ; i++)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
469 free(d[i]);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
470 free(d);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
471 #endif
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
472 VAL(dst) = NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
473 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
474
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
475 static int str_list_add(char** add, int n,void* dst,int pre) {
35261
1c18199bbf7c Remove assignment that is duplicated a few lines down,
reimar
parents: 34932
diff changeset
476 char** lst;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
477 int ln;
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 if(!dst) return M_OPT_PARSER_ERR;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
480 lst = VAL(dst);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
481
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
482 for(ln = 0 ; lst && lst[ln] ; ln++)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
483 /**/;
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 lst = realloc(lst,(n+ln+1)*sizeof(char*));
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
486
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
487 if(pre) {
31493
0a7222a42a70 Ensure that e.g. -af-pre will not cause the filter list to be
reimar
parents: 31082
diff changeset
488 memmove(&lst[n],lst,ln*sizeof(char*));
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
489 memcpy(lst,add,n*sizeof(char*));
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
490 } else
31493
0a7222a42a70 Ensure that e.g. -af-pre will not cause the filter list to be
reimar
parents: 31082
diff changeset
491 memcpy(&lst[ln],add,n*sizeof(char*));
0a7222a42a70 Ensure that e.g. -af-pre will not cause the filter list to be
reimar
parents: 31082
diff changeset
492 // (re-)add NULL-termination
0a7222a42a70 Ensure that e.g. -af-pre will not cause the filter list to be
reimar
parents: 31082
diff changeset
493 lst[ln+n] = NULL;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
494
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
495 free(add);
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 VAL(dst) = lst;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
498
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
499 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
500 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
501
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
502 static int str_list_del(char** del, int n,void* dst) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
503 char **lst,*ep,**d;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
504 int i,ln,s;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
505 long idx;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
506
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
507 if(!dst) return M_OPT_PARSER_ERR;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
508 lst = VAL(dst);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
509
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
510 for(ln = 0 ; lst && lst[ln] ; ln++)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
511 /**/;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
512 s = ln;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
513
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
514 for(i = 0 ; del[i] != NULL ; i++) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
515 idx = strtol(del[i], &ep, 0);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
516 if(*ep) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
517 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Invalid index: %s\n",del[i]);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
518 free(del[i]);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
519 continue;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
520 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
521 free(del[i]);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
522 if(idx < 0 || idx >= ln) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
523 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Index %ld is out of range.\n",idx);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
524 continue;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
525 } else if(!lst[idx])
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
526 continue;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
527 free(lst[idx]);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
528 lst[idx] = NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
529 s--;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
530 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
531 free(del);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
532
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
533 if(s == 0) {
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32428
diff changeset
534 free(lst);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
535 VAL(dst) = NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
536 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
537 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
538
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
539 d = calloc(s+1,sizeof(char*));
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
540 for(i = 0, n = 0 ; i < ln ; i++) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
541 if(!lst[i]) continue;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
542 d[n] = lst[i];
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
543 n++;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
544 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
545 d[s] = NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
546
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32428
diff changeset
547 free(lst);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
548 VAL(dst) = d;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
549
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
550 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
551 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
552
22133
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
553 static char *get_nextsep(char *ptr, char sep, int modify) {
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
554 char *last_ptr = ptr;
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
555 for(;;){
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
556 ptr = strchr(ptr, sep);
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
557 if(ptr && ptr>last_ptr && ptr[-1]=='\\'){
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
558 if (modify) memmove(ptr-1, ptr, strlen(ptr)+1);
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
559 else ptr++;
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
560 }else
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
561 break;
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
562 }
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
563 return ptr;
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
564 }
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
565
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
566 static int parse_str_list(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
567 int n = 0,len = strlen(opt->name);
22133
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
568 char *str;
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
569 char *ptr = (char *)param, *last_ptr, **res;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
570 int op = OP_NONE;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
571
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
572 if(opt->name[len-1] == '*' && ((int)strlen(name) > len - 1)) {
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
573 const char* n = &name[len-1];
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
574 if(strcasecmp(n,"-add") == 0)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
575 op = OP_ADD;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
576 else if(strcasecmp(n,"-pre") == 0)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
577 op = OP_PRE;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
578 else if(strcasecmp(n,"-del") == 0)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
579 op = OP_DEL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
580 else if(strcasecmp(n,"-clr") == 0)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
581 op = OP_CLR;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
582 else
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
583 return M_OPT_UNKNOWN;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
584 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
585
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
586 // Clear the list ??
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
587 if(op == OP_CLR) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
588 if(dst)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
589 free_str_list(dst);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
590 return 0;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
591 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
592
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
593 // All other ops need a param
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
594 if (param == NULL || strlen(param) == 0)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
595 return M_OPT_MISSING_PARAM;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
596
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
597
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
598 while(ptr[0] != '\0') {
22133
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
599 ptr = get_nextsep(ptr, LIST_SEPARATOR, 0);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
600 if(!ptr) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
601 n++;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
602 break;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
603 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
604 ptr++;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
605 n++;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
606 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
607 if(n == 0)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
608 return M_OPT_INVALID;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
609 if( ((opt->flags & M_OPT_MIN) && (n < opt->min)) ||
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
610 ((opt->flags & M_OPT_MAX) && (n > opt->max)) )
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
611 return M_OPT_OUT_OF_RANGE;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
612
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
613 if(!dst) return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
614
8384
7a7980b874f5 fixed 'mplayer -nosound xxx' sig11 if configfile have string list options
arpi
parents: 8262
diff changeset
615 res = malloc((n+2)*sizeof(char*));
22133
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
616 ptr = str = strdup(param);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
617 n = 0;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
618
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
619 while(1) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
620 last_ptr = ptr;
22133
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
621 ptr = get_nextsep(ptr, LIST_SEPARATOR, 1);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
622 if(!ptr) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
623 res[n] = strdup(last_ptr);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
624 n++;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
625 break;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
626 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
627 len = ptr - last_ptr;
18869
682a16136d6c rm unnecesary void* casts - part 1
reynaldo
parents: 18718
diff changeset
628 res[n] = malloc(len + 1);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
629 if(len) strncpy(res[n],last_ptr,len);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
630 res[n][len] = '\0';
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
631 ptr++;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
632 n++;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
633 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
634 res[n] = NULL;
22133
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
635 free(str);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
636
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
637 switch(op) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
638 case OP_ADD:
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
639 return str_list_add(res,n,dst,0);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
640 case OP_PRE:
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
641 return str_list_add(res,n,dst,1);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
642 case OP_DEL:
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
643 return str_list_del(res,n,dst);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
644 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
645
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
646 if(VAL(dst))
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
647 free_str_list(dst);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
648 VAL(dst) = res;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
649
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
650 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
651 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
652
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
653 static void copy_str_list(const m_option_t* opt,void* dst, const void* src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
654 int n;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
655 char **d,**s;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
656
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
657 if(!(dst && src)) return;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
658 s = VAL(src);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
659
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
660 if(VAL(dst))
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
661 free_str_list(dst);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
662
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
663 if(!s) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
664 VAL(dst) = NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
665 return;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
666 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
667
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
668 for(n = 0 ; s[n] != NULL ; n++)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
669 /* NOTHING */;
18869
682a16136d6c rm unnecesary void* casts - part 1
reynaldo
parents: 18718
diff changeset
670 d = malloc((n+1)*sizeof(char*));
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
671 for( ; n >= 0 ; n--)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
672 d[n] = s[n] ? strdup(s[n]) : NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
673
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
674 VAL(dst) = d;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
675 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
676
25229
4f611a555224 Option print functions may not and do not modify value
reimar
parents: 24966
diff changeset
677 static char* print_str_list(const m_option_t* opt, const void* src) {
8168
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
678 char **lst = NULL;
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
679 char *ret = NULL,*last = NULL;
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
680 int i;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
681
8168
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
682 if(!(src && VAL(src))) return NULL;
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
683 lst = VAL(src);
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
684
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
685 for(i = 0 ; lst[i] ; i++) {
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
686 if(last) {
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
687 ret = dup_printf("%s,%s",last,lst[i]);
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
688 free(last);
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
689 } else
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
690 ret = strdup(lst[i]);
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
691 last = ret;
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
692 }
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
693 if(last && last != ret) free(last);
ff6a98628e6c Fix the Gui with NEW_CONFIG
albeu
parents: 8164
diff changeset
694 return ret;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
695 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
696
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
697 const m_option_type_t m_option_type_string_list = {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
698 "String list",
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
699 "A list of strings separated by ','\n"
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
700 "Option with a name ending in an * permits using the following suffix: \n"
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
701 "\t-add: Add the given parameters at the end of the list.\n"
25489
52f6429a9ba7 typo: begining --> beginning
diego
parents: 25229
diff changeset
702 "\t-pre: Add the given parameters at the beginning of the list.\n"
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
703 "\t-del: Remove the entry at the given indices.\n"
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
704 "\t-clr: Clear the list.\n"
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
705 "e.g: -vf-add flip,mirror -vf-del 2,5\n",
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
706 sizeof(char**),
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
707 M_OPT_TYPE_DYNAMIC | M_OPT_TYPE_ALLOW_WILDCARD,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
708 parse_str_list,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
709 print_str_list,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
710 copy_str_list,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
711 copy_str_list,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
712 copy_str_list,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
713 free_str_list
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
714 };
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
715
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
716
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
717 /////////////////// Func based options
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
718
34169
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
719 static int parse_call_func(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
34171
cca4f430b0f4 Pass on errors from CONF_TYPE_FUNC_PARAM_IMMEDIATE function.
reimar
parents: 34170
diff changeset
720 int res = ((m_opt_func_param_t) opt->p)(opt,param);
cca4f430b0f4 Pass on errors from CONF_TYPE_FUNC_PARAM_IMMEDIATE function.
reimar
parents: 34170
diff changeset
721 if (res < 0)
cca4f430b0f4 Pass on errors from CONF_TYPE_FUNC_PARAM_IMMEDIATE function.
reimar
parents: 34170
diff changeset
722 return res;
34170
a05c274e1409 Fix parse_call_func return value.
reimar
parents: 34169
diff changeset
723 return 1;
34169
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
724 }
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
725
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
726 // special variant, will not have a history/be able to
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
727 // be used as per-file option etc.
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
728 const m_option_type_t m_option_type_func_param_immediate = {
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
729 "Func param once",
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
730 "",
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
731 0,
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
732 M_OPT_TYPE_INDIRECT,
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
733 parse_call_func,
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
734 NULL,
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
735 NULL, // Nothing to do on save
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
736 NULL,
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
737 NULL,
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
738 NULL
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
739 };
9b617726812c Sanitize include behaviour.
reimar
parents: 34157
diff changeset
740
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
741 // A chained list to save the various calls for func_param and func_full
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
742 typedef struct m_func_save m_func_save_t;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
743 struct m_func_save {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
744 m_func_save_t* next;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
745 char* name;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
746 char* param;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
747 };
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
748
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
749 #undef VAL
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
750 #define VAL(x) (*(m_func_save_t**)(x))
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
751
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
752 static void free_func_pf(void* src) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
753 m_func_save_t *s,*n;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
754
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
755 if(!src) return;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
756
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
757 s = VAL(src);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
758
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
759 while(s) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
760 n = s->next;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
761 free(s->name);
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32428
diff changeset
762 free(s->param);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
763 free(s);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
764 s = n;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
765 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
766 VAL(src) = NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
767 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
768
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
769 // Parser for func_param and func_full
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
770 static int parse_func_pf(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
771 m_func_save_t *s,*p;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
772
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
773 if(!dst)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
774 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
775
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18869
diff changeset
776 s = calloc(1,sizeof(m_func_save_t));
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
777 s->name = strdup(name);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
778 s->param = param ? strdup(param) : NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
779
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
780 p = VAL(dst);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
781 if(p) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
782 for( ; p->next != NULL ; p = p->next)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
783 /**/;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
784 p->next = s;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
785 } else
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
786 VAL(dst) = s;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
787
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
788 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
789 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
790
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
791 static void copy_func_pf(const m_option_t* opt,void* dst, const void* src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
792 m_func_save_t *d = NULL, *s,* last = NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
793
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
794 if(!(dst && src)) return;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
795 s = VAL(src);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
796
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
797 if(VAL(dst))
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
798 free_func_pf(dst);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
799
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
800 while(s) {
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18869
diff changeset
801 d = calloc(1,sizeof(m_func_save_t));
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
802 d->name = strdup(s->name);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
803 d->param = s->param ? strdup(s->param) : NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
804 if(last)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
805 last->next = d;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
806 else
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
807 VAL(dst) = d;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
808 last = d;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
809 s = s->next;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
810 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
811
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
812
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
813 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
814
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
815 /////////////////// Func_param
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
816
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
817 static void set_func_param(const m_option_t* opt, void* dst, const void* src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
818 m_func_save_t* s;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
819
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
820 if(!src) return;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
821 s = VAL(src);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
822
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
823 if(!s) return;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
824
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
825 // Revert if needed
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
826 if(opt->priv) ((m_opt_default_func_t)opt->priv)(opt,opt->name);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
827 for( ; s != NULL ; s = s->next)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
828 ((m_opt_func_param_t) opt->p)(opt,s->param);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
829 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
830
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
831 const m_option_type_t m_option_type_func_param = {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
832 "Func param",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
833 "",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
834 sizeof(m_func_save_t*),
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
835 M_OPT_TYPE_INDIRECT,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
836 parse_func_pf,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
837 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
838 NULL, // Nothing to do on save
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
839 set_func_param,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
840 copy_func_pf,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
841 free_func_pf
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
842 };
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
843
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
844 /////////////////// Func_full
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
845
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
846 static void set_func_full(const m_option_t* opt, void* dst, const void* src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
847 m_func_save_t* s;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
848
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
849 if(!src) return;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
850
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
851 for(s = VAL(src) ; s ; s = s->next) {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
852 // Revert if needed
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
853 if(opt->priv) ((m_opt_default_func_t)opt->priv)(opt,s->name);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
854 ((m_opt_func_full_t) opt->p)(opt,s->name,s->param);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
855 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
856 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
857
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
858 const m_option_type_t m_option_type_func_full = {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
859 "Func full",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
860 "",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
861 sizeof(m_func_save_t*),
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
862 M_OPT_TYPE_ALLOW_WILDCARD|M_OPT_TYPE_INDIRECT,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
863 parse_func_pf,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
864 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
865 NULL, // Nothing to do on save
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
866 set_func_full,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
867 copy_func_pf,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
868 free_func_pf
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
869 };
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
870
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
871 /////////////// Func
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
872
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
873 #undef VAL
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
874 #define VAL(x) (*(int*)(x))
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
875
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
876 static int parse_func(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
877 if(dst)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
878 VAL(dst) += 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
879 return 0;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
880 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
881
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
882 static void set_func(const m_option_t* opt,void* dst, const void* src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
883 int i;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
884 if(opt->priv) ((m_opt_default_func_t)opt->priv)(opt,opt->name);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
885 for(i = 0 ; i < VAL(src) ; i++)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
886 ((m_opt_func_t) opt->p)(opt);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
887 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
888
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
889 const m_option_type_t m_option_type_func = {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
890 "Func",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
891 "",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
892 sizeof(int),
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
893 M_OPT_TYPE_INDIRECT,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
894 parse_func,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
895 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
896 NULL, // Nothing to do on save
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
897 set_func,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
898 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
899 NULL
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
900 };
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
901
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
902 /////////////////// Print
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
903
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
904 static int parse_print(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
905 if(opt->type == CONF_TYPE_PRINT_INDIRECT)
8736
michael
parents: 8384
diff changeset
906 mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", *(char **) opt->p);
17470
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
907 else if(opt->type == CONF_TYPE_PRINT_FUNC)
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
908 return ((m_opt_func_full_t) opt->p)(opt,name,param);
8736
michael
parents: 8384
diff changeset
909 else
michael
parents: 8384
diff changeset
910 mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", (char *) opt->p);
michael
parents: 8384
diff changeset
911
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
912 if(opt->priv == NULL)
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
913 return M_OPT_EXIT;
34149
11d9ef2177ec Improve option type CONF_TYPE_PRINT.
ib
parents: 34028
diff changeset
914 if(opt->priv == PRIV_NO_EXIT)
11d9ef2177ec Improve option type CONF_TYPE_PRINT.
ib
parents: 34028
diff changeset
915 return 0;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
916 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
917 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
918
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
919 const m_option_type_t m_option_type_print = {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
920 "Print",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
921 "",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
922 0,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
923 0,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
924 parse_print,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
925 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
926 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
927 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
928 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
929 NULL
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
930 };
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
931
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
932 const m_option_type_t m_option_type_print_indirect = {
8736
michael
parents: 8384
diff changeset
933 "Print",
michael
parents: 8384
diff changeset
934 "",
michael
parents: 8384
diff changeset
935 0,
17468
41d8991c3632 Fix misuse of the M_OPT_TYPE_INDIRECT flag, it has nothing to do
albeu
parents: 16854
diff changeset
936 0,
8736
michael
parents: 8384
diff changeset
937 parse_print,
michael
parents: 8384
diff changeset
938 NULL,
michael
parents: 8384
diff changeset
939 NULL,
michael
parents: 8384
diff changeset
940 NULL,
michael
parents: 8384
diff changeset
941 NULL,
michael
parents: 8384
diff changeset
942 NULL
michael
parents: 8384
diff changeset
943 };
michael
parents: 8384
diff changeset
944
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
945 const m_option_type_t m_option_type_print_func = {
17470
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
946 "Print",
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
947 "",
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
948 0,
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
949 M_OPT_TYPE_ALLOW_WILDCARD,
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
950 parse_print,
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
951 NULL,
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
952 NULL,
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
953 NULL,
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
954 NULL,
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
955 NULL
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
956 };
21123e349463 New option type to print help text with a function.
albeu
parents: 17468
diff changeset
957
8736
michael
parents: 8384
diff changeset
958
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
959 /////////////////////// Subconfig
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
960 #undef VAL
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
961 #define VAL(x) (*(char***)(x))
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
962
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
963 static int parse_subconf(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
964 char *subparam;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
965 char *subopt;
35272
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
966 int nr = 0,i,r = 1;
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
967 const m_option_t *subopts;
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
968 const char *p;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
969 char** lst = NULL;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
970
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
971 if (param == NULL || strlen(param) == 0)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
972 return M_OPT_MISSING_PARAM;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
973
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
974 subparam = malloc(strlen(param)+1);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
975 subopt = malloc(strlen(param)+1);
16741
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
976 p = param;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
977
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
978 subopts = opt->p;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
979
16741
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
980 while(p[0])
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
981 {
16741
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
982 int sscanf_ret = 1;
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
983 int optlen = strcspn(p, ":=");
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
984 /* clear out */
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
985 subopt[0] = subparam[0] = 0;
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23423
diff changeset
986 av_strlcpy(subopt, p, optlen + 1);
16741
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
987 p = &p[optlen];
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
988 if (p[0] == '=') {
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
989 sscanf_ret = 2;
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
990 p = &p[1];
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
991 if (p[0] == '"') {
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
992 p = &p[1];
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
993 optlen = strcspn(p, "\"");
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23423
diff changeset
994 av_strlcpy(subparam, p, optlen + 1);
16741
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
995 p = &p[optlen];
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
996 if (p[0] != '"') {
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
997 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Terminating '\"' missing for '%s'\n", subopt);
35272
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
998 r = M_OPT_INVALID;
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
999 goto out;
16741
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1000 }
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1001 p = &p[1];
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1002 } else if (p[0] == '%') {
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1003 p = &p[1];
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1004 optlen = (int)strtol(p, (char**)&p, 0);
16741
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1005 if (!p || p[0] != '%' || (optlen > strlen(p) - 1)) {
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1006 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Invalid length %i for '%s'\n", optlen, subopt);
35272
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
1007 r = M_OPT_INVALID;
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
1008 goto out;
16741
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1009 }
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1010 p = &p[1];
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23423
diff changeset
1011 av_strlcpy(subparam, p, optlen + 1);
16741
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1012 p = &p[optlen];
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1013 } else {
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1014 optlen = strcspn(p, ":");
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23423
diff changeset
1015 av_strlcpy(subparam, p, optlen + 1);
16741
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1016 p = &p[optlen];
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1017 }
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1018 }
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1019 if (p[0] == ':')
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1020 p = &p[1];
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1021 else if (p[0]) {
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1022 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Incorrect termination for '%s'\n", subopt);
35272
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
1023 r = M_OPT_INVALID;
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
1024 goto out;
16741
ec4a53c1c40b Add support for suboption escaping via both "" and %n%str syntax
reimar
parents: 16425
diff changeset
1025 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1026
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1027 switch(sscanf_ret)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1028 {
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1029 case 1:
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1030 subparam[0] = 0;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1031 case 2:
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1032 for(i = 0 ; subopts[i].name ; i++) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1033 if(!strcmp(subopts[i].name,subopt)) break;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1034 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1035 if(!subopts[i].name) {
10397
6180d7558f75 output typo fixes: unknow --> unknown
diego
parents: 10355
diff changeset
1036 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Unknown suboption %s\n",name,subopt);
35272
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
1037 r = M_OPT_UNKNOWN;
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
1038 goto out;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1039 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1040 r = m_option_parse(&subopts[i],subopt,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1041 subparam[0] == 0 ? NULL : subparam,NULL,src);
35272
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
1042 if(r < 0) goto out;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1043 if(dst) {
30702
9fc9d1e788aa Do not cast the results of malloc/calloc/realloc.
diego
parents: 30695
diff changeset
1044 lst = realloc(lst,2 * (nr+2) * sizeof(char*));
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1045 lst[2*nr] = strdup(subopt);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1046 lst[2*nr+1] = subparam[0] == 0 ? NULL : strdup(subparam);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1047 memset(&lst[2*(nr+1)],0,2*sizeof(char*));
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1048 nr++;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1049 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1050 break;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1051 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1052 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1053
35272
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
1054 if(dst)
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
1055 VAL(dst) = lst;
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
1056 r = 1;
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
1057
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
1058 out:
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1059 free(subparam);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1060 free(subopt);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1061
35272
8756cd0da7b7 Fix memleaks for error case.
reimar
parents: 35261
diff changeset
1062 return r;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1063 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1064
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1065 const m_option_type_t m_option_type_subconfig = {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1066 "Subconfig",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1067 "The syntax is -option opt1=foo:flag:opt2=blah",
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1068 sizeof(int),
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1069 M_OPT_TYPE_HAS_CHILD,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1070 parse_subconf,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1071 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1072 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1073 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1074 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1075 NULL
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1076 };
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1077
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1078 #include "libmpcodecs/img_format.h"
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1079
10746
0e5e55232e9d added nv12/nv21 and some other fourccs (still not synced)
alex
parents: 10660
diff changeset
1080 /* FIXME: snyc with img_format.h */
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1081 static struct {
19194
5949a654e2d4 marks some read-only char* inside structs as const, patch by Stefan Huehner, stefan At huehner-org
reynaldo
parents: 19053
diff changeset
1082 const char* name;
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1083 unsigned int fmt;
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1084 } mp_imgfmt_list[] = {
30110
19414a605695 Add support for 16-bit per component YUV formats.
reimar
parents: 30098
diff changeset
1085 {"444p16le", IMGFMT_444P16_LE},
19414a605695 Add support for 16-bit per component YUV formats.
reimar
parents: 30098
diff changeset
1086 {"444p16be", IMGFMT_444P16_BE},
34923
eb76937af57e Support FFmpeg pix_fmts YUV4xxP12*, YUV4xxP14*, GBR12P* and GBR14P*.
cehoyos
parents: 34805
diff changeset
1087 {"444p14le", IMGFMT_444P14_LE},
eb76937af57e Support FFmpeg pix_fmts YUV4xxP12*, YUV4xxP14*, GBR12P* and GBR14P*.
cehoyos
parents: 34805
diff changeset
1088 {"444p14be", IMGFMT_444P14_BE},
eb76937af57e Support FFmpeg pix_fmts YUV4xxP12*, YUV4xxP14*, GBR12P* and GBR14P*.
cehoyos
parents: 34805
diff changeset
1089 {"444p12le", IMGFMT_444P12_LE},
eb76937af57e Support FFmpeg pix_fmts YUV4xxP12*, YUV4xxP14*, GBR12P* and GBR14P*.
cehoyos
parents: 34805
diff changeset
1090 {"444p12be", IMGFMT_444P12_BE},
34028
cf2a4f4cac0e Add 444P10 support.
cehoyos
parents: 33605
diff changeset
1091 {"444p10le", IMGFMT_444P10_LE},
cf2a4f4cac0e Add 444P10 support.
cehoyos
parents: 33605
diff changeset
1092 {"444p10be", IMGFMT_444P10_BE},
34191
47e1375c4d79 Whitespace cosmetics: Align some IMGFMT-lists.
cehoyos
parents: 34189
diff changeset
1093 {"444p9le", IMGFMT_444P9_LE},
47e1375c4d79 Whitespace cosmetics: Align some IMGFMT-lists.
cehoyos
parents: 34189
diff changeset
1094 {"444p9be", IMGFMT_444P9_BE},
30110
19414a605695 Add support for 16-bit per component YUV formats.
reimar
parents: 30098
diff changeset
1095 {"422p16le", IMGFMT_422P16_LE},
19414a605695 Add support for 16-bit per component YUV formats.
reimar
parents: 30098
diff changeset
1096 {"422p16be", IMGFMT_422P16_BE},
34923
eb76937af57e Support FFmpeg pix_fmts YUV4xxP12*, YUV4xxP14*, GBR12P* and GBR14P*.
cehoyos
parents: 34805
diff changeset
1097 {"422p14le", IMGFMT_422P14_LE},
eb76937af57e Support FFmpeg pix_fmts YUV4xxP12*, YUV4xxP14*, GBR12P* and GBR14P*.
cehoyos
parents: 34805
diff changeset
1098 {"422p14be", IMGFMT_422P14_BE},
eb76937af57e Support FFmpeg pix_fmts YUV4xxP12*, YUV4xxP14*, GBR12P* and GBR14P*.
cehoyos
parents: 34805
diff changeset
1099 {"422p12le", IMGFMT_422P12_LE},
eb76937af57e Support FFmpeg pix_fmts YUV4xxP12*, YUV4xxP14*, GBR12P* and GBR14P*.
cehoyos
parents: 34805
diff changeset
1100 {"422p12be", IMGFMT_422P12_BE},
33364
e1ee4895e500 Support displaying of 9- and 10-bit pixel formats,
cehoyos
parents: 32511
diff changeset
1101 {"422p10le", IMGFMT_422P10_LE},
e1ee4895e500 Support displaying of 9- and 10-bit pixel formats,
cehoyos
parents: 32511
diff changeset
1102 {"422p10be", IMGFMT_422P10_BE},
34436
8a96cf601e57 Add support for 422P9.
reimar
parents: 34191
diff changeset
1103 {"422p9le", IMGFMT_422P9_LE},
8a96cf601e57 Add support for 422P9.
reimar
parents: 34191
diff changeset
1104 {"422p9be", IMGFMT_422P9_BE},
30110
19414a605695 Add support for 16-bit per component YUV formats.
reimar
parents: 30098
diff changeset
1105 {"420p16le", IMGFMT_420P16_LE},
19414a605695 Add support for 16-bit per component YUV formats.
reimar
parents: 30098
diff changeset
1106 {"420p16be", IMGFMT_420P16_BE},
33364
e1ee4895e500 Support displaying of 9- and 10-bit pixel formats,
cehoyos
parents: 32511
diff changeset
1107 {"420p10le", IMGFMT_420P10_LE},
e1ee4895e500 Support displaying of 9- and 10-bit pixel formats,
cehoyos
parents: 32511
diff changeset
1108 {"420p10be", IMGFMT_420P10_BE},
34191
47e1375c4d79 Whitespace cosmetics: Align some IMGFMT-lists.
cehoyos
parents: 34189
diff changeset
1109 {"420p9le", IMGFMT_420P9_LE},
47e1375c4d79 Whitespace cosmetics: Align some IMGFMT-lists.
cehoyos
parents: 34189
diff changeset
1110 {"420p9be", IMGFMT_420P9_BE},
47e1375c4d79 Whitespace cosmetics: Align some IMGFMT-lists.
cehoyos
parents: 34189
diff changeset
1111 {"444p16", IMGFMT_444P16},
47e1375c4d79 Whitespace cosmetics: Align some IMGFMT-lists.
cehoyos
parents: 34189
diff changeset
1112 {"422p16", IMGFMT_422P16},
47e1375c4d79 Whitespace cosmetics: Align some IMGFMT-lists.
cehoyos
parents: 34189
diff changeset
1113 {"422p10", IMGFMT_422P10},
47e1375c4d79 Whitespace cosmetics: Align some IMGFMT-lists.
cehoyos
parents: 34189
diff changeset
1114 {"420p16", IMGFMT_420P16},
47e1375c4d79 Whitespace cosmetics: Align some IMGFMT-lists.
cehoyos
parents: 34189
diff changeset
1115 {"420p10", IMGFMT_420P10},
47e1375c4d79 Whitespace cosmetics: Align some IMGFMT-lists.
cehoyos
parents: 34189
diff changeset
1116 {"420p9", IMGFMT_420P9},
34565
25acb5f98cb4 Support v408 and AYUV decoding via FFmpeg.
cehoyos
parents: 34436
diff changeset
1117 {"444a", IMGFMT_444A},
34805
0eba64545a27 Improve Avid Meridien (AVUI) decoding with FFmpeg.
cehoyos
parents: 34572
diff changeset
1118 {"422a", IMGFMT_422A},
30115
ad61464d02a7 Add support for YUV format with alpha and fix the codecs.conf entry for vp6a
reimar
parents: 30110
diff changeset
1119 {"420a", IMGFMT_420A},
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1120 {"444p", IMGFMT_444P},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1121 {"422p", IMGFMT_422P},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1122 {"411p", IMGFMT_411P},
30098
834af9d1e3e9 Add support for 440p colorspace.
reimar
parents: 29900
diff changeset
1123 {"440p", IMGFMT_440P},
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1124 {"yuy2", IMGFMT_YUY2},
33605
f242acd22d93 Allow specifying yvyu format as option.
reimar
parents: 33364
diff changeset
1125 {"yvyu", IMGFMT_YVYU},
10746
0e5e55232e9d added nv12/nv21 and some other fourccs (still not synced)
alex
parents: 10660
diff changeset
1126 {"uyvy", IMGFMT_UYVY},
0e5e55232e9d added nv12/nv21 and some other fourccs (still not synced)
alex
parents: 10660
diff changeset
1127 {"yvu9", IMGFMT_YVU9},
0e5e55232e9d added nv12/nv21 and some other fourccs (still not synced)
alex
parents: 10660
diff changeset
1128 {"if09", IMGFMT_IF09},
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1129 {"yv12", IMGFMT_YV12},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1130 {"i420", IMGFMT_I420},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1131 {"iyuv", IMGFMT_IYUV},
10746
0e5e55232e9d added nv12/nv21 and some other fourccs (still not synced)
alex
parents: 10660
diff changeset
1132 {"clpl", IMGFMT_CLPL},
11688
c996b8da4ad0 10l. found by John Wehle <john@feith.com>
alex
parents: 11412
diff changeset
1133 {"hm12", IMGFMT_HM12},
10746
0e5e55232e9d added nv12/nv21 and some other fourccs (still not synced)
alex
parents: 10660
diff changeset
1134 {"y800", IMGFMT_Y800},
34191
47e1375c4d79 Whitespace cosmetics: Align some IMGFMT-lists.
cehoyos
parents: 34189
diff changeset
1135 {"y8", IMGFMT_Y8},
34932
19212dea7a97 Add missing aequivalents for PIX_FMT_GRAY8A and PIX_FMT_GRAY16*.
cehoyos
parents: 34923
diff changeset
1136 {"y8a", IMGFMT_Y8A},
19212dea7a97 Add missing aequivalents for PIX_FMT_GRAY8A and PIX_FMT_GRAY16*.
cehoyos
parents: 34923
diff changeset
1137 {"y16be", IMGFMT_Y16_BE},
19212dea7a97 Add missing aequivalents for PIX_FMT_GRAY8A and PIX_FMT_GRAY16*.
cehoyos
parents: 34923
diff changeset
1138 {"y16le", IMGFMT_Y16_LE},
10746
0e5e55232e9d added nv12/nv21 and some other fourccs (still not synced)
alex
parents: 10660
diff changeset
1139 {"nv12", IMGFMT_NV12},
0e5e55232e9d added nv12/nv21 and some other fourccs (still not synced)
alex
parents: 10660
diff changeset
1140 {"nv21", IMGFMT_NV21},
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1141 {"bgr24", IMGFMT_BGR24},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1142 {"bgr32", IMGFMT_BGR32},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1143 {"bgr16", IMGFMT_BGR16},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1144 {"bgr15", IMGFMT_BGR15},
31082
92f88bb315c5 Add support for 12-bit color mode on framebuffer devices.
cehoyos
parents: 30702
diff changeset
1145 {"bgr12", IMGFMT_BGR12},
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1146 {"bgr8", IMGFMT_BGR8},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1147 {"bgr4", IMGFMT_BGR4},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1148 {"bg4b", IMGFMT_BG4B},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1149 {"bgr1", IMGFMT_BGR1},
34572
2a372b469420 Support displaying 64bit RGB via OpenGL.
cehoyos
parents: 34565
diff changeset
1150 {"rgb64be", IMGFMT_RGB64BE},
2a372b469420 Support displaying 64bit RGB via OpenGL.
cehoyos
parents: 34565
diff changeset
1151 {"rgb64le", IMGFMT_RGB64LE},
29900
9ebc41cbf893 Support 16-bit-per-component RGB formats (rgb48[bln]e) in option parser.
reimar
parents: 29263
diff changeset
1152 {"rgb48be", IMGFMT_RGB48BE},
9ebc41cbf893 Support 16-bit-per-component RGB formats (rgb48[bln]e) in option parser.
reimar
parents: 29263
diff changeset
1153 {"rgb48le", IMGFMT_RGB48LE},
9ebc41cbf893 Support 16-bit-per-component RGB formats (rgb48[bln]e) in option parser.
reimar
parents: 29263
diff changeset
1154 {"rgb48ne", IMGFMT_RGB48NE},
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1155 {"rgb24", IMGFMT_RGB24},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1156 {"rgb32", IMGFMT_RGB32},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1157 {"rgb16", IMGFMT_RGB16},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1158 {"rgb15", IMGFMT_RGB15},
31082
92f88bb315c5 Add support for 12-bit color mode on framebuffer devices.
cehoyos
parents: 30702
diff changeset
1159 {"rgb12", IMGFMT_RGB12},
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1160 {"rgb8", IMGFMT_RGB8},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1161 {"rgb4", IMGFMT_RGB4},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1162 {"rg4b", IMGFMT_RG4B},
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1163 {"rgb1", IMGFMT_RGB1},
12999
bc8cda64ad7f RGBA variants
michael
parents: 12775
diff changeset
1164 {"rgba", IMGFMT_RGBA},
bc8cda64ad7f RGBA variants
michael
parents: 12775
diff changeset
1165 {"argb", IMGFMT_ARGB},
bc8cda64ad7f RGBA variants
michael
parents: 12775
diff changeset
1166 {"bgra", IMGFMT_BGRA},
bc8cda64ad7f RGBA variants
michael
parents: 12775
diff changeset
1167 {"abgr", IMGFMT_ABGR},
34923
eb76937af57e Support FFmpeg pix_fmts YUV4xxP12*, YUV4xxP14*, GBR12P* and GBR14P*.
cehoyos
parents: 34805
diff changeset
1168 {"gbr14pbe", IMGFMT_GBR14PLE},
eb76937af57e Support FFmpeg pix_fmts YUV4xxP12*, YUV4xxP14*, GBR12P* and GBR14P*.
cehoyos
parents: 34805
diff changeset
1169 {"gbr14ple", IMGFMT_GBR14PBE},
eb76937af57e Support FFmpeg pix_fmts YUV4xxP12*, YUV4xxP14*, GBR12P* and GBR14P*.
cehoyos
parents: 34805
diff changeset
1170 {"gbr12pbe", IMGFMT_GBR12PLE},
eb76937af57e Support FFmpeg pix_fmts YUV4xxP12*, YUV4xxP14*, GBR12P* and GBR14P*.
cehoyos
parents: 34805
diff changeset
1171 {"gbr12ple", IMGFMT_GBR12PBE},
34157
ab178e06077e Support planar GBR24 decoding.
cehoyos
parents: 34149
diff changeset
1172 {"gbr24p", IMGFMT_GBR24P},
23423
6b18c979dd45 mjpeg support for v4l2 tv:// driver
voroshil
parents: 23415
diff changeset
1173 {"mjpeg", IMGFMT_MJPEG},
6b18c979dd45 mjpeg support for v4l2 tv:// driver
voroshil
parents: 23415
diff changeset
1174 {"mjpg", IMGFMT_MJPEG},
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1175 { NULL, 0 }
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1176 };
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1177
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
1178 static int parse_imgfmt(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1179 uint32_t fmt = 0;
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1180 int i;
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1181
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1182 if (param == NULL || strlen(param) == 0)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1183 return M_OPT_MISSING_PARAM;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1184
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1185 if(!strcmp(param,"help")) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
1186 mp_msg(MSGT_CFGPARSER, MSGL_INFO, "Available formats:");
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1187 for(i = 0 ; mp_imgfmt_list[i].name ; i++)
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1188 mp_msg(MSGT_CFGPARSER, MSGL_INFO, " %s",mp_imgfmt_list[i].name);
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1189 mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n");
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 15789
diff changeset
1190 return M_OPT_EXIT - 1;
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1191 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1192
10597
697688503349 CONF_TYPE_IMGFMT now supports 0xffffffff (hexa)-style fourccs too
alex
parents: 10595
diff changeset
1193 if (sscanf(param, "0x%x", &fmt) != 1)
697688503349 CONF_TYPE_IMGFMT now supports 0xffffffff (hexa)-style fourccs too
alex
parents: 10595
diff changeset
1194 {
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1195 for(i = 0 ; mp_imgfmt_list[i].name ; i++) {
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1196 if(!strcasecmp(param,mp_imgfmt_list[i].name)) {
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1197 fmt=mp_imgfmt_list[i].fmt;
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1198 break;
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1199 }
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1200 }
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1201 if(!mp_imgfmt_list[i].name) {
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1202 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: unknown format name: '%s'\n",name,param);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1203 return M_OPT_INVALID;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1204 }
10597
697688503349 CONF_TYPE_IMGFMT now supports 0xffffffff (hexa)-style fourccs too
alex
parents: 10595
diff changeset
1205 }
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1206
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1207 if(dst)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1208 *((uint32_t*)dst) = fmt;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1209
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1210 return 1;
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1211 }
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1212
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1213 const m_option_type_t m_option_type_imgfmt = {
9600
f55ea7b2fa50 Improve the imgfmt option type
albeu
parents: 9593
diff changeset
1214 "Image format",
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
1215 "Please report any missing colorspaces.",
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1216 sizeof(uint32_t),
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1217 0,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1218 parse_imgfmt,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1219 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1220 copy_opt,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1221 copy_opt,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1222 NULL,
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1223 NULL
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1224 };
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents:
diff changeset
1225
14246
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1226 #include "libaf/af_format.h"
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1227
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1228 /* FIXME: snyc with af_format.h */
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1229 static struct {
19194
5949a654e2d4 marks some read-only char* inside structs as const, patch by Stefan Huehner, stefan At huehner-org
reynaldo
parents: 19053
diff changeset
1230 const char* name;
14246
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1231 unsigned int fmt;
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1232 } mp_afmt_list[] = {
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1233 // SPECIAL
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1234 {"mulaw", AF_FORMAT_MU_LAW},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1235 {"alaw", AF_FORMAT_A_LAW},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1236 {"mpeg2", AF_FORMAT_MPEG2},
30241
02b9c1a452e1 Add support for distinguishing between little- and big-endian SPDIF AC3
reimar
parents: 30115
diff changeset
1237 {"ac3le", AF_FORMAT_AC3_LE},
02b9c1a452e1 Add support for distinguishing between little- and big-endian SPDIF AC3
reimar
parents: 30115
diff changeset
1238 {"ac3be", AF_FORMAT_AC3_BE},
02b9c1a452e1 Add support for distinguishing between little- and big-endian SPDIF AC3
reimar
parents: 30115
diff changeset
1239 {"ac3ne", AF_FORMAT_AC3_NE},
14246
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1240 {"imaadpcm", AF_FORMAT_IMA_ADPCM},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1241 // ORIDNARY
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1242 {"u8", AF_FORMAT_U8},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1243 {"s8", AF_FORMAT_S8},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1244 {"u16le", AF_FORMAT_U16_LE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1245 {"u16be", AF_FORMAT_U16_BE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1246 {"u16ne", AF_FORMAT_U16_NE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1247 {"s16le", AF_FORMAT_S16_LE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1248 {"s16be", AF_FORMAT_S16_BE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1249 {"s16ne", AF_FORMAT_S16_NE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1250 {"u24le", AF_FORMAT_U24_LE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1251 {"u24be", AF_FORMAT_U24_BE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1252 {"u24ne", AF_FORMAT_U24_NE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1253 {"s24le", AF_FORMAT_S24_LE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1254 {"s24be", AF_FORMAT_S24_BE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1255 {"s24ne", AF_FORMAT_S24_NE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1256 {"u32le", AF_FORMAT_U32_LE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1257 {"u32be", AF_FORMAT_U32_BE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1258 {"u32ne", AF_FORMAT_U32_NE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1259 {"s32le", AF_FORMAT_S32_LE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1260 {"s32be", AF_FORMAT_S32_BE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1261 {"s32ne", AF_FORMAT_S32_NE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1262 {"floatle", AF_FORMAT_FLOAT_LE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1263 {"floatbe", AF_FORMAT_FLOAT_BE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1264 {"floatne", AF_FORMAT_FLOAT_NE},
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1265 { NULL, 0 }
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1266 };
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1267
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
1268 static int parse_afmt(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
14246
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1269 uint32_t fmt = 0;
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1270 int i;
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1271
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1272 if (param == NULL || strlen(param) == 0)
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1273 return M_OPT_MISSING_PARAM;
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1274
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1275 if(!strcmp(param,"help")) {
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1276 mp_msg(MSGT_CFGPARSER, MSGL_INFO, "Available formats:");
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1277 for(i = 0 ; mp_afmt_list[i].name ; i++)
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1278 mp_msg(MSGT_CFGPARSER, MSGL_INFO, " %s",mp_afmt_list[i].name);
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1279 mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n");
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 15789
diff changeset
1280 return M_OPT_EXIT - 1;
14246
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1281 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1282
14246
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1283 if (sscanf(param, "0x%x", &fmt) != 1)
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1284 {
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1285 for(i = 0 ; mp_afmt_list[i].name ; i++) {
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1286 if(!strcasecmp(param,mp_afmt_list[i].name)) {
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1287 fmt=mp_afmt_list[i].fmt;
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1288 break;
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1289 }
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1290 }
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1291 if(!mp_afmt_list[i].name) {
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1292 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: unknown format name: '%s'\n",name,param);
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1293 return M_OPT_INVALID;
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1294 }
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1295 }
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1296
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1297 if(dst)
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1298 *((uint32_t*)dst) = fmt;
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1299
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1300 return 1;
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1301 }
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1302
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1303 const m_option_type_t m_option_type_afmt = {
14246
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1304 "Audio format",
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1305 "Please report any missing formats.",
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1306 sizeof(uint32_t),
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1307 0,
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1308 parse_afmt,
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1309 NULL,
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1310 copy_opt,
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1311 copy_opt,
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1312 NULL,
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1313 NULL
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1314 };
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1315
474a40917f73 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
alex
parents: 14085
diff changeset
1316
32428
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1317 int parse_timestring(const char *str, double *time, char endchar)
22312
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1318 {
32428
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1319 int a, b, len;
22312
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1320 double d;
32428
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1321 *time = 0; /* ensure initialization for error cases */
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1322 if (sscanf(str, "%d:%d:%lf%n", &a, &b, &d, &len) >= 3)
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1323 *time = 3600*a + 60*b + d;
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1324 else if (sscanf(str, "%d:%lf%n", &a, &d, &len) >= 2)
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1325 *time = 60*a + d;
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1326 else if (sscanf(str, "%lf%n", &d, &len) >= 1)
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1327 *time = d;
35590
388b4cc85c0e Allow "nopts" as time specification, it might be useful in
reimar
parents: 35272
diff changeset
1328 else if (strncasecmp(str, "nopts", 5) == 0) {
388b4cc85c0e Allow "nopts" as time specification, it might be useful in
reimar
parents: 35272
diff changeset
1329 *time = MP_NOPTS_VALUE;
388b4cc85c0e Allow "nopts" as time specification, it might be useful in
reimar
parents: 35272
diff changeset
1330 len = 5;
388b4cc85c0e Allow "nopts" as time specification, it might be useful in
reimar
parents: 35272
diff changeset
1331 } else
32428
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1332 return 0; /* unsupported time format */
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1333 if (str[len] && str[len] != endchar)
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1334 return 0; /* invalid extra characters at the end */
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1335 return len;
22312
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1336 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1337
22312
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1338
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
1339 static int parse_time(const m_option_t* opt,const char *name, const char *param, void* dst, int src)
22312
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1340 {
22356
37248dbbf6ff remove C99-ism (mixed declaration and code),
gpoirier
parents: 22312
diff changeset
1341 double time;
37248dbbf6ff remove C99-ism (mixed declaration and code),
gpoirier
parents: 22312
diff changeset
1342
22312
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1343 if (param == NULL || strlen(param) == 0)
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1344 return M_OPT_MISSING_PARAM;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1345
32428
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1346 if (!parse_timestring(param, &time, 0)) {
22312
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1347 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: invalid time: '%s'\n",
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1348 name,param);
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1349 return M_OPT_INVALID;
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1350 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1351
22312
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1352 if (dst)
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1353 *(double *)dst = time;
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1354 return 1;
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1355 }
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1356
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1357 const m_option_type_t m_option_type_time = {
22312
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1358 "Time",
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1359 "",
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1360 sizeof(double),
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1361 0,
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1362 parse_time,
23415
0f0803d6544a Add a print function for the time option type.
albeu
parents: 22356
diff changeset
1363 print_double,
22312
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1364 copy_opt,
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1365 copy_opt,
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1366 NULL,
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1367 NULL
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1368 };
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1369
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1370
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1371 // Time or size (-endpos)
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1372
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
1373 static int parse_time_size(const m_option_t* opt,const char *name, const char *param, void* dst, int src) {
20003
9f256c4066ff Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,
reimar
parents: 19973
diff changeset
1374 m_time_size_t ts;
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1375 char unit[4];
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1376 double end_at;
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1377
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1378 if (param == NULL || strlen(param) == 0)
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1379 return M_OPT_MISSING_PARAM;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1380
20003
9f256c4066ff Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,
reimar
parents: 19973
diff changeset
1381 ts.pos=0;
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1382 /* End at size parsing */
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1383 if(sscanf(param, "%lf%3s", &end_at, unit) == 2) {
20003
9f256c4066ff Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,
reimar
parents: 19973
diff changeset
1384 ts.type = END_AT_SIZE;
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1385 if(!strcasecmp(unit, "b"))
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1386 ;
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1387 else if(!strcasecmp(unit, "kb"))
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1388 end_at *= 1024;
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1389 else if(!strcasecmp(unit, "mb"))
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1390 end_at *= 1024*1024;
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1391 else if(!strcasecmp(unit, "gb"))
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1392 end_at *= 1024*1024*1024;
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1393 else
20003
9f256c4066ff Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,
reimar
parents: 19973
diff changeset
1394 ts.type = END_AT_NONE;
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1395
20003
9f256c4066ff Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,
reimar
parents: 19973
diff changeset
1396 if (ts.type == END_AT_SIZE) {
9f256c4066ff Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,
reimar
parents: 19973
diff changeset
1397 ts.pos = end_at;
9f256c4066ff Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,
reimar
parents: 19973
diff changeset
1398 goto out;
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1399 }
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1400 }
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1401
22312
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1402 /* End at time parsing. This has to be last because the parsing accepts
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22133
diff changeset
1403 * even a number followed by garbage */
32428
92b92a78ca2a Make the parse_timestring public, with a slightly extended API.
cigaes
parents: 32335
diff changeset
1404 if (!parse_timestring(param, &end_at, 0)) {
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1405 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: invalid time or size: '%s'\n",
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1406 name,param);
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1407 return M_OPT_INVALID;
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1408 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1409
20003
9f256c4066ff Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,
reimar
parents: 19973
diff changeset
1410 ts.type = END_AT_TIME;
9f256c4066ff Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,
reimar
parents: 19973
diff changeset
1411 ts.pos = end_at;
9f256c4066ff Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,
reimar
parents: 19973
diff changeset
1412 out:
9f256c4066ff Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,
reimar
parents: 19973
diff changeset
1413 if(dst)
9f256c4066ff Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,
reimar
parents: 19973
diff changeset
1414 *(m_time_size_t *)dst = ts;
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1415 return 1;
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1416 }
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1417
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1418 const m_option_type_t m_option_type_time_size = {
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1419 "Time or size",
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1420 "",
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1421 sizeof(m_time_size_t),
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1422 0,
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1423 parse_time_size,
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1424 NULL,
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1425 copy_opt,
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1426 copy_opt,
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1427 NULL,
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1428 NULL
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1429 };
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19358
diff changeset
1430
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1431
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
1432 //// Objects (i.e. filters, etc) settings
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1433
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1434 #include "m_struct.h"
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1435
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1436 #undef VAL
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1437 #define VAL(x) (*(m_obj_settings_t**)(x))
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1438
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1439 static int find_obj_desc(const char* name,const m_obj_list_t* l,const m_struct_t** ret) {
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1440 int i;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1441 char* n;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1442
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1443 for(i = 0 ; l->list[i] ; i++) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1444 n = M_ST_MB(char*,l->list[i],l->name_off);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1445 if(!strcmp(n,name)) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1446 *ret = M_ST_MB(m_struct_t*,l->list[i],l->desc_off);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1447 return 1;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1448 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1449 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1450 return 0;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1451 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1452
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1453 static int get_obj_param(const char* opt_name,const char* obj_name, const m_struct_t* desc,
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1454 char* str,int* nold,int oldmax,char** dst) {
18958
a8e681ad7c90 Remove unused variables, patch by Stefan Huehner stefan at huehner org.
diego
parents: 18879
diff changeset
1455 char* eq;
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1456 const m_option_t* opt;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1457 int r;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1458
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1459 eq = strchr(str,'=');
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1460 if(eq && eq == str)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1461 eq = NULL;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1462
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1463 if(eq) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1464 char* p = eq + 1;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1465 if(p[0] == '\0') p = NULL;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1466 eq[0] = '\0';
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1467 opt = m_option_list_find(desc->fields,str);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1468 if(!opt) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
1469 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: %s doesn't have a %s parameter.\n",opt_name,obj_name,str);
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
1470 return M_OPT_UNKNOWN;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1471 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1472 r = m_option_parse(opt,str,p,NULL,M_CONFIG_FILE);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1473 if(r < 0) {
17874
1973600f8f3e Small fix with object list (-vf) help.
albeu
parents: 17727
diff changeset
1474 if(r > M_OPT_EXIT)
1973600f8f3e Small fix with object list (-vf) help.
albeu
parents: 17727
diff changeset
1475 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while parsing %s parameter %s (%s)\n",opt_name,obj_name,str,p);
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1476 eq[0] = '=';
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1477 return r;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1478 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1479 if(dst) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1480 dst[0] = strdup(str);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1481 dst[1] = p ? strdup(p) : NULL;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1482 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1483 eq[0] = '=';
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1484 } else {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1485 if((*nold) >= oldmax) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
1486 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: %s has only %d params, so you can't give more than %d unnamed params.\n",
10660
8f168a4128c5 a 100l and another typo
diego
parents: 10641
diff changeset
1487 opt_name,obj_name,oldmax,oldmax);
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1488 return M_OPT_OUT_OF_RANGE;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1489 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1490 opt = &desc->fields[(*nold)];
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1491 r = m_option_parse(opt,opt->name,str,NULL,M_CONFIG_FILE);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1492 if(r < 0) {
17874
1973600f8f3e Small fix with object list (-vf) help.
albeu
parents: 17727
diff changeset
1493 if(r > M_OPT_EXIT)
1973600f8f3e Small fix with object list (-vf) help.
albeu
parents: 17727
diff changeset
1494 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while parsing %s parameter %s (%s)\n",opt_name,obj_name,opt->name,str);
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1495 return r;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1496 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1497 if(dst) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1498 dst[0] = strdup(opt->name);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1499 dst[1] = strdup(str);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1500 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1501 (*nold)++;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1502 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1503 return 1;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1504 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1505
19053
75327b24e06f marks several string parameters as const, as they are not modified inside the function, Patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents: 18958
diff changeset
1506 static int get_obj_params(const char* opt_name, const char* name,char* params,
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1507 const m_struct_t* desc,char separator, char*** _ret) {
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1508 int n = 0,nold = 0, nopts,r;
18958
a8e681ad7c90 Remove unused variables, patch by Stefan Huehner stefan at huehner org.
diego
parents: 18879
diff changeset
1509 char* ptr,*last_ptr = params;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1510 char** ret;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1511
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1512 if(!strcmp(params,"help")) { // Help
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1513 char min[50],max[50];
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1514 if(!desc->fields) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
1515 printf("%s doesn't have any options.\n\n",name);
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 15789
diff changeset
1516 return M_OPT_EXIT - 1;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1517 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1518 printf("\n Name Type Min Max\n\n");
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1519 for(n = 0 ; desc->fields[n].name ; n++) {
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1520 const m_option_t* opt = &desc->fields[n];
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1521 if(opt->type->flags & M_OPT_TYPE_HAS_CHILD) continue;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1522 if(opt->flags & M_OPT_MIN)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1523 sprintf(min,"%-8.0f",opt->min);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1524 else
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1525 strcpy(min,"No");
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1526 if(opt->flags & M_OPT_MAX)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1527 sprintf(max,"%-8.0f",opt->max);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1528 else
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1529 strcpy(max,"No");
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1530 printf(" %-20.20s %-15.15s %-10.10s %-10.10s\n",
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1531 opt->name,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1532 opt->type->name,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1533 min,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1534 max);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1535 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1536 printf("\n");
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 15789
diff changeset
1537 return M_OPT_EXIT - 1;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1538 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1539
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1540 for(nopts = 0 ; desc->fields[nopts].name ; nopts++)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1541 /* NOP */;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1542
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1543 // TODO : Check that each opt can be parsed
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1544 r = 1;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1545 while(last_ptr && last_ptr[0] != '\0') {
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1546 ptr = strchr(last_ptr,separator);
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1547 if(!ptr) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1548 r = get_obj_param(opt_name,name,desc,last_ptr,&nold,nopts,NULL);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1549 n++;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1550 break;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1551 }
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1552 if(ptr == last_ptr) { // Empty field, count it and go on
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1553 nold++;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1554 last_ptr = ptr+1;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1555 continue;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1556 }
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1557 ptr[0] = '\0';
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1558 r = get_obj_param(opt_name,name,desc,last_ptr,&nold,nopts,NULL);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1559 ptr[0] = separator;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1560 if(r < 0) break;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1561 n++;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1562 last_ptr = ptr+1;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1563 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1564 if(r < 0) return r;
15743
c06986fbf819 Fix crash with e.g. -vf scale=::
reimar
parents: 15460
diff changeset
1565 if (!last_ptr[0]) // count an empty field at the end, too
c06986fbf819 Fix crash with e.g. -vf scale=::
reimar
parents: 15460
diff changeset
1566 nold++;
c06986fbf819 Fix crash with e.g. -vf scale=::
reimar
parents: 15460
diff changeset
1567 if (nold > nopts) {
c06986fbf819 Fix crash with e.g. -vf scale=::
reimar
parents: 15460
diff changeset
1568 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Too many options for %s\n", name);
c06986fbf819 Fix crash with e.g. -vf scale=::
reimar
parents: 15460
diff changeset
1569 return M_OPT_OUT_OF_RANGE;
c06986fbf819 Fix crash with e.g. -vf scale=::
reimar
parents: 15460
diff changeset
1570 }
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1571 if(!_ret) // Just test
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1572 return 1;
15743
c06986fbf819 Fix crash with e.g. -vf scale=::
reimar
parents: 15460
diff changeset
1573 if (n == 0) // No options or only empty options
c06986fbf819 Fix crash with e.g. -vf scale=::
reimar
parents: 15460
diff changeset
1574 return 1;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1575
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1576 ret = malloc((n+2)*2*sizeof(char*));
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1577 n = nold = 0;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1578 last_ptr = params;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1579
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1580 while(last_ptr && last_ptr[0] != '\0') {
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1581 ptr = strchr(last_ptr,separator);
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1582 if(!ptr) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1583 get_obj_param(opt_name,name,desc,last_ptr,&nold,nopts,&ret[n*2]);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1584 n++;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1585 break;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1586 }
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1587 if(ptr == last_ptr) { // Empty field, count it and go on
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1588 last_ptr = ptr+1;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1589 nold++;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1590 continue;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1591 }
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1592 ptr[0] = '\0';
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1593 get_obj_param(opt_name,name,desc,last_ptr,&nold,nopts,&ret[n*2]);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1594 n++;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1595 last_ptr = ptr+1;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1596 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1597 ret[n*2] = ret[n*2+1] = NULL;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1598 *_ret = ret;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1599
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1600 return 1;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1601 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1602
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1603 static int parse_obj_params(const m_option_t* opt,const char *name,
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
1604 const char *param, void* dst, int src) {
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1605 char** opts;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1606 int r;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1607 m_obj_params_t* p = opt->priv;
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1608 const m_struct_t* desc;
27835
28b6709b52a2 Avoid a potential memleak in parse_obj_params in case of a missing
reimar
parents: 25489
diff changeset
1609 char* cpy;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1610
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1611 // We need the object desc
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1612 if(!p)
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1613 return M_OPT_INVALID;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1614
20098
e3a61060d458 Another != NULL check after dereferencing
reimar
parents: 20097
diff changeset
1615 desc = p->desc;
27835
28b6709b52a2 Avoid a potential memleak in parse_obj_params in case of a missing
reimar
parents: 25489
diff changeset
1616 cpy = strdup(param);
20101
4ccb2a53b859 Avoid memleak when calling parse_obj_params only for syntax-checking (dst == NULL)
reimar
parents: 20098
diff changeset
1617 r = get_obj_params(name,desc->name,cpy,desc,p->separator,dst ? &opts : NULL);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1618 free(cpy);
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1619 if(r < 0)
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1620 return r;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1621 if(!dst)
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1622 return 1;
15743
c06986fbf819 Fix crash with e.g. -vf scale=::
reimar
parents: 15460
diff changeset
1623 if (!opts) // no arguments given
c06986fbf819 Fix crash with e.g. -vf scale=::
reimar
parents: 15460
diff changeset
1624 return 1;
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1625
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1626 for(r = 0 ; opts[r] ; r += 2)
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1627 m_struct_set(desc,dst,opts[r],opts[r+1]);
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1628
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1629 return 1;
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1630 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1631
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1632
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1633 const m_option_type_t m_option_type_obj_params = {
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1634 "Object params",
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1635 "",
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1636 0,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1637 0,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1638 parse_obj_params,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1639 NULL,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1640 NULL,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1641 NULL,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1642 NULL,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1643 NULL
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1644 };
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1645
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
1646 /// Some predefined types as a definition would be quite lengthy
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1647
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1648 /// Span arguments
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1649 static const m_span_t m_span_params_dflts = { -1, -1 };
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1650 static const m_option_t m_span_params_fields[] = {
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1651 {"start", M_ST_OFF(m_span_t,start), CONF_TYPE_INT, M_OPT_MIN, 1 ,0, NULL},
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1652 {"end", M_ST_OFF(m_span_t,end), CONF_TYPE_INT, M_OPT_MIN , 1 ,0, NULL},
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1653 { NULL, NULL, 0, 0, 0, 0, NULL }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1654 };
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1655 static const struct m_struct_st m_span_opts = {
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1656 "m_span",
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1657 sizeof(m_span_t),
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1658 &m_span_params_dflts,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1659 m_span_params_fields
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1660 };
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1661 const m_obj_params_t m_span_params_def = {
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1662 &m_span_opts,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1663 '-'
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1664 };
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1665
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1666 static int parse_obj_settings(const char* opt,char* str,const m_obj_list_t* list,
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1667 m_obj_settings_t **_ret, int ret_n) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1668 int r;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1669 char *param,**plist = NULL;
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1670 const m_struct_t* desc;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1671 m_obj_settings_t *ret = _ret ? *_ret : NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1672
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1673
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
1674 // Now check that the object exists
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1675 param = strchr(str,'=');
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1676 if(param) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1677 param[0] = '\0';
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1678 param++;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1679 if(strlen(param) <= 0)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1680 param = NULL;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1681 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1682
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1683
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1684 if(!find_obj_desc(str,list,&desc)) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
1685 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: %s doesn't exist.\n",opt,str);
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1686 return M_OPT_INVALID;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1687 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1688
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1689 if(param) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1690 if(!desc && _ret) {
17874
1973600f8f3e Small fix with object list (-vf) help.
albeu
parents: 17727
diff changeset
1691 if(!strcmp(param,"help")) {
1973600f8f3e Small fix with object list (-vf) help.
albeu
parents: 17727
diff changeset
1692 mp_msg(MSGT_CFGPARSER, MSGL_INFO, "Option %s: %s have no option description.\n",opt,str);
1973600f8f3e Small fix with object list (-vf) help.
albeu
parents: 17727
diff changeset
1693 return M_OPT_EXIT - 1;
1973600f8f3e Small fix with object list (-vf) help.
albeu
parents: 17727
diff changeset
1694 }
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1695 plist = calloc(4,sizeof(char*));
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1696 plist[0] = strdup("_oldargs_");
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1697 plist[1] = strdup(param);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1698 } else if(desc) {
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
1699 r = get_obj_params(opt,str,param,desc,':',_ret ? &plist : NULL);
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1700 if(r < 0)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1701 return r;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1702 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1703 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1704 if(!_ret)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1705 return 1;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1706
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1707 ret = realloc(ret,(ret_n+2)*sizeof(m_obj_settings_t));
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1708 memset(&ret[ret_n],0,2*sizeof(m_obj_settings_t));
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1709 ret[ret_n].name = strdup(str);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1710 ret[ret_n].attribs = plist;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1711
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1712 *_ret = ret;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1713 return 1;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1714 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1715
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
1716 static int obj_settings_list_del(const char *opt_name,const char *param,void* dst, int src) {
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1717 char** str_list = NULL;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1718 int r,i,idx_max = 0;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1719 char* rem_id = "_removed_marker_";
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1720 const m_option_t list_opt = {opt_name , NULL, CONF_TYPE_STRING_LIST,
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1721 0, 0, 0, NULL };
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1722 m_obj_settings_t* obj_list = dst ? VAL(dst) : NULL;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1723
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1724 if(dst && !obj_list) {
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1725 mp_msg(MSGT_CFGPARSER, MSGL_WARN, "Option %s: the list is empty.\n",opt_name);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1726 return 1;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1727 } else if(obj_list) {
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1728 for(idx_max = 0 ; obj_list[idx_max].name != NULL ; idx_max++)
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1729 /* NOP */;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1730 }
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1731
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1732 r = m_option_parse(&list_opt,opt_name,param,&str_list,src);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1733 if(r < 0 || !str_list)
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1734 return r;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1735
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1736 for(r = 0 ; str_list[r] ; r++) {
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1737 int id;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1738 char* endptr;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1739 id = strtol(str_list[r],&endptr,0);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1740 if(endptr == str_list[r]) {
10660
8f168a4128c5 a 100l and another typo
diego
parents: 10641
diff changeset
1741 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: invalid parameter. We need a list of integers which are the indices of the elements to remove.\n",opt_name);
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1742 m_option_free(&list_opt,&str_list);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1743 return M_OPT_INVALID;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1744 }
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1745 if(!obj_list) continue;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1746 if(id >= idx_max || id < -idx_max) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
1747 mp_msg(MSGT_CFGPARSER, MSGL_WARN, "Option %s: Index %d is out of range.\n",opt_name,id);
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1748 continue;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1749 }
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1750 if(id < 0)
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1751 id = idx_max + id;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1752 free(obj_list[id].name);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1753 free_str_list(&(obj_list[id].attribs));
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1754 obj_list[id].name = rem_id;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1755 }
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1756
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1757 if(!dst) {
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1758 m_option_free(&list_opt,&str_list);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1759 return 1;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1760 }
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1761
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1762 for(i = 0 ; obj_list[i].name ; i++) {
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1763 while(obj_list[i].name == rem_id) {
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1764 memmove(&obj_list[i],&obj_list[i+1],sizeof(m_obj_settings_t)*(idx_max - i));
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1765 idx_max--;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1766 }
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1767 }
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1768 obj_list = realloc(obj_list,sizeof(m_obj_settings_t)*(idx_max+1));
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1769 VAL(dst) = obj_list;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1770
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1771 return 1;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1772 }
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1773
32335
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1774 static void free_obj_settings_list(void* dst) {
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1775 int n;
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1776 m_obj_settings_t *d;
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1777
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1778 if (!dst || !VAL(dst)) return;
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1779
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1780 d = VAL(dst);
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1781 #ifndef NO_FREE
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1782 for (n = 0 ; d[n].name ; n++) {
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1783 free(d[n].name);
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1784 free_str_list(&(d[n].attribs));
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1785 }
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1786 free(d);
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1787 #endif
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1788 VAL(dst) = NULL;
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1789 }
fdf3f93c2828 Move some code around to avoid forward declarations in top-level .c files.
diego
parents: 31834
diff changeset
1790
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1791 static int parse_obj_settings_list(const m_option_t* opt,const char *name,
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
1792 const char *param, void* dst, int src) {
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1793 int n = 0,r,len = strlen(opt->name);
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1794 char *str;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1795 char *ptr, *last_ptr;
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1796 m_obj_settings_t *res = NULL,*queue = NULL,*head = NULL;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1797 int op = OP_NONE;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1798
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1799 // We need the objects list
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1800 if(!opt->priv)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1801 return M_OPT_INVALID;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1802
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1803 if(opt->name[len-1] == '*' && ((int)strlen(name) > len - 1)) {
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1804 const char* n = &name[len-1];
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1805 if(strcasecmp(n,"-add") == 0)
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1806 op = OP_ADD;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1807 else if(strcasecmp(n,"-pre") == 0)
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1808 op = OP_PRE;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1809 else if(strcasecmp(n,"-del") == 0)
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1810 op = OP_DEL;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1811 else if(strcasecmp(n,"-clr") == 0)
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1812 op = OP_CLR;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1813 else {
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1814 char prefix[len];
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1815 strncpy(prefix,opt->name,len-1);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1816 prefix[len-1] = '\0';
10608
2cae82f2ab02 Spelling police:
diego
parents: 10597
diff changeset
1817 mp_msg(MSGT_VFILTER,MSGL_ERR, "Option %s: unknown postfix %s\n"
2cae82f2ab02 Spelling police:
diego
parents: 10597
diff changeset
1818 "Supported postfixes are:\n"
12653
b40f21d9a43c degccify
alex
parents: 11950
diff changeset
1819 " %s-add\n"
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1820 " Append the given list to the current list\n\n"
12653
b40f21d9a43c degccify
alex
parents: 11950
diff changeset
1821 " %s-pre\n"
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1822 " Prepend the given list to the current list\n\n"
12653
b40f21d9a43c degccify
alex
parents: 11950
diff changeset
1823 " %s-del x,y,...\n"
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1824 " Remove the given elements. Take the list element index (starting from 0).\n"
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
1825 " Negative index can be used (i.e. -1 is the last element)\n\n"
12653
b40f21d9a43c degccify
alex
parents: 11950
diff changeset
1826 " %s-clr\n"
b40f21d9a43c degccify
alex
parents: 11950
diff changeset
1827 " Clear the current list.\n",name,n,prefix,prefix,prefix,prefix);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1828
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
1829 return M_OPT_UNKNOWN;
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1830 }
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1831 }
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1832
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1833 // Clear the list ??
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1834 if(op == OP_CLR) {
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1835 if(dst)
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1836 free_obj_settings_list(dst);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1837 return 0;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1838 }
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1839
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1840 if (param == NULL || strlen(param) == 0)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1841 return M_OPT_MISSING_PARAM;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1842
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1843 switch(op) {
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1844 case OP_ADD:
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1845 if(dst) head = VAL(dst);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1846 break;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1847 case OP_PRE:
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1848 if(dst) queue = VAL(dst);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1849 break;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1850 case OP_DEL:
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1851 return obj_settings_list_del(name,param,dst,src);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1852 case OP_NONE:
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1853 if(dst && VAL(dst))
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1854 free_obj_settings_list(dst);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1855 break;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1856 default:
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1857 mp_msg(MSGT_VFILTER,MSGL_ERR, "Option %s: FIXME\n",name);
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
1858 return M_OPT_UNKNOWN;
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1859 }
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1860
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1861 if(!strcmp(param,"help")) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1862 m_obj_list_t* ol = opt->priv;
14085
a56f68304ea2 Add "Available video filters:" line to -vf help.
diego
parents: 12999
diff changeset
1863 mp_msg(MSGT_VFILTER,MSGL_INFO,"Available video filters:\n");
18237
4231482179b6 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
reynaldo
parents: 17874
diff changeset
1864 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_FILTERS\n");
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1865 for(n = 0 ; ol->list[n] ; n++)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1866 mp_msg(MSGT_VFILTER,MSGL_INFO," %-15s: %s\n",
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1867 M_ST_MB(char*,ol->list[n],ol->name_off),
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1868 M_ST_MB(char*,ol->list[n],ol->info_off));
17727
096cb1dfb591 Make -xy help output consistent, output an empty line before and after.
diego
parents: 17667
diff changeset
1869 mp_msg(MSGT_VFILTER,MSGL_INFO,"\n");
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 15789
diff changeset
1870 return M_OPT_EXIT - 1;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1871 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1872 ptr = str = strdup(param);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1873
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1874 while(ptr[0] != '\0') {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1875 last_ptr = ptr;
22133
66fa884c46cd str_list separator backslash-escaping
reimar
parents: 22106
diff changeset
1876 ptr = get_nextsep(ptr, LIST_SEPARATOR, 1);
20314
9bd929836c15 \, escaping
michael
parents: 20101
diff changeset
1877
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1878 if(!ptr) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1879 r = parse_obj_settings(name,last_ptr,opt->priv,dst ? &res : NULL,n);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1880 if(r < 0) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1881 free(str);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1882 return r;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1883 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1884 n++;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1885 break;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1886 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1887 ptr[0] = '\0';
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1888 r = parse_obj_settings(name,last_ptr,opt->priv,dst ? &res : NULL,n);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1889 if(r < 0) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1890 free(str);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1891 return r;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1892 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1893 ptr++;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1894 n++;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1895 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1896 free(str);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1897 if(n == 0)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1898 return M_OPT_INVALID;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1899
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1900 if( ((opt->flags & M_OPT_MIN) && (n < opt->min)) ||
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1901 ((opt->flags & M_OPT_MAX) && (n > opt->max)) )
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1902 return M_OPT_OUT_OF_RANGE;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1903
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1904 if(dst) {
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1905 if(queue) {
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1906 int qsize;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1907 for(qsize = 0 ; queue[qsize].name ; qsize++)
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1908 /* NOP */;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1909 res = realloc(res,(qsize+n+1)*sizeof(m_obj_settings_t));
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1910 memcpy(&res[n],queue,(qsize+1)*sizeof(m_obj_settings_t));
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1911 n += qsize;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1912 free(queue);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1913 }
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1914 if(head) {
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1915 int hsize;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1916 for(hsize = 0 ; head[hsize].name ; hsize++)
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1917 /* NOP */;
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1918 head = realloc(head,(hsize+n+1)*sizeof(m_obj_settings_t));
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1919 memcpy(&head[hsize],res,(n+1)*sizeof(m_obj_settings_t));
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1920 free(res);
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1921 res = head;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1922 }
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1923 VAL(dst) = res;
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1924 }
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1925 return 1;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1926 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1927
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
1928 static void copy_obj_settings_list(const m_option_t* opt,void* dst, const void* src) {
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1929 m_obj_settings_t *d,*s;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1930 int n;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1931
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1932 if(!(dst && src))
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1933 return;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1934
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1935 s = VAL(src);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1936
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1937 if(VAL(dst))
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1938 free_obj_settings_list(dst);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1939 if(!s) return;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1940
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1941
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1942
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1943 for(n = 0 ; s[n].name ; n++)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1944 /* NOP */;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1945 d = malloc((n+1)*sizeof(m_obj_settings_t));
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1946 for(n = 0 ; s[n].name ; n++) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1947 d[n].name = strdup(s[n].name);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1948 d[n].attribs = NULL;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1949 copy_str_list(NULL,&(d[n].attribs),&(s[n].attribs));
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1950 }
10236
4640f25fef12 warning fixes by Dominik
alex
parents: 9913
diff changeset
1951 d[n].name = NULL;
4640f25fef12 warning fixes by Dominik
alex
parents: 9913
diff changeset
1952 d[n].attribs = NULL;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1953 VAL(dst) = d;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1954 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1955
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1956 const m_option_type_t m_option_type_obj_settings_list = {
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1957 "Object settings list",
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1958 "",
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1959 sizeof(m_obj_settings_t*),
9913
88fe89b46786 Add suffix support to the object list type.
albeu
parents: 9848
diff changeset
1960 M_OPT_TYPE_DYNAMIC|M_OPT_TYPE_ALLOW_WILDCARD,
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1961 parse_obj_settings_list,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1962 NULL,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1963 copy_obj_settings_list,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1964 copy_obj_settings_list,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1965 copy_obj_settings_list,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1966 free_obj_settings_list,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1967 };
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1968
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1969
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1970
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
1971 static int parse_obj_presets(const m_option_t* opt,const char *name,
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
1972 const char *param, void* dst, int src) {
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1973 m_obj_presets_t* obj_p = (m_obj_presets_t*)opt->priv;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1974 m_struct_t *in_desc,*out_desc;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1975 int s,i;
20097
7a82d0a0d526 Fix variable dereference before NULL check.
reimar
parents: 20003
diff changeset
1976 unsigned char* pre;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1977 char* pre_name = NULL;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1978
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1979 if(!obj_p) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
1980 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Presets need a pointer to a m_obj_presets_t in the priv field.\n",name);
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1981 return M_OPT_PARSER_ERR;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1982 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1983
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1984 if(!param)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1985 return M_OPT_MISSING_PARAM;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1986
20097
7a82d0a0d526 Fix variable dereference before NULL check.
reimar
parents: 20003
diff changeset
1987 pre = obj_p->presets;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1988 in_desc = obj_p->in_desc;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1989 out_desc = obj_p->out_desc ? obj_p->out_desc : obj_p->in_desc;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1990 s = in_desc->size;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1991
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1992 if(!strcmp(param,"help")) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
1993 mp_msg(MSGT_CFGPARSER, MSGL_INFO, "Available presets for %s->%s:",out_desc->name,name);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1994 for(pre = obj_p->presets;(pre_name = M_ST_MB(char*,pre,obj_p->name_off)) ;
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
1995 pre += s)
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1996 mp_msg(MSGT_CFGPARSER, MSGL_ERR, " %s",pre_name);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1997 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "\n");
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 15789
diff changeset
1998 return M_OPT_EXIT - 1;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
1999 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2000
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2001 for(pre_name = M_ST_MB(char*,pre,obj_p->name_off) ; pre_name ;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2002 pre += s, pre_name = M_ST_MB(char*,pre,obj_p->name_off)) {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2003 if(!strcmp(pre_name,param)) break;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2004 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2005 if(!pre_name) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2006 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: There is no preset named %s\n"
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2007 "Available presets are:",name,param);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
2008 for(pre = obj_p->presets;(pre_name = M_ST_MB(char*,pre,obj_p->name_off)) ;
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
2009 pre += s)
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2010 mp_msg(MSGT_CFGPARSER, MSGL_ERR, " %s",pre_name);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2011 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "\n");
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2012 return M_OPT_INVALID;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2013 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2014
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2015 if(!dst) return 1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
2016
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2017 for(i = 0 ; in_desc->fields[i].name ; i++) {
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
2018 const m_option_t* out_opt = m_option_list_find(out_desc->fields,
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2019 in_desc->fields[i].name);
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2020 if(!out_opt) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2021 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Unable to find the target option for field %s.\nPlease report this to the developers.\n",name,in_desc->fields[i].name);
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2022 return M_OPT_PARSER_ERR;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2023 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2024 m_option_copy(out_opt,M_ST_MB_P(dst,out_opt->p),M_ST_MB_P(pre,in_desc->fields[i].p));
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2025 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2026 return 1;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2027 }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2028
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2029
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
2030 const m_option_type_t m_option_type_obj_presets = {
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2031 "Object presets",
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2032 "",
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2033 0,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2034 0,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2035 parse_obj_presets,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2036 NULL,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2037 NULL,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2038 NULL,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2039 NULL,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2040 NULL
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2041 };
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9177
diff changeset
2042
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
2043 static int parse_custom_url(const m_option_t* opt,const char *name,
30695
a26f6577d338 Make more option-parsing related function arguments const.
reimar
parents: 30429
diff changeset
2044 const char *url, void* dst, int src) {
11771
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11688
diff changeset
2045 int pos1, pos2, r, v6addr = 0;
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11688
diff changeset
2046 char *ptr1=NULL, *ptr2=NULL, *ptr3=NULL, *ptr4=NULL;
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2047 m_struct_t* desc = opt->priv;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
2048
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2049 if(!desc) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2050 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Custom URL needs a pointer to a m_struct_t in the priv field.\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2051 return M_OPT_PARSER_ERR;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2052 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2053
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2054 // extract the protocol
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2055 ptr1 = strstr(url, "://");
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2056 if( ptr1==NULL ) {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2057 // Filename only
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2058 if(m_option_list_find(desc->fields,"filename")) {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2059 m_struct_set(desc,dst,"filename",url);
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2060 return 1;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2061 }
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2062 mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Option %s: URL doesn't have a valid protocol!\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2063 return M_OPT_INVALID;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2064 }
15460
fa8c3f5b7ec2 introduced -string- parameter to match everything after :// syntax
nicodvb
parents: 14246
diff changeset
2065 if(m_option_list_find(desc->fields,"string")) {
fa8c3f5b7ec2 introduced -string- parameter to match everything after :// syntax
nicodvb
parents: 14246
diff changeset
2066 if(strlen(ptr1)>3) {
fa8c3f5b7ec2 introduced -string- parameter to match everything after :// syntax
nicodvb
parents: 14246
diff changeset
2067 m_struct_set(desc,dst,"string",ptr1+3);
fa8c3f5b7ec2 introduced -string- parameter to match everything after :// syntax
nicodvb
parents: 14246
diff changeset
2068 return 1;
fa8c3f5b7ec2 introduced -string- parameter to match everything after :// syntax
nicodvb
parents: 14246
diff changeset
2069 }
fa8c3f5b7ec2 introduced -string- parameter to match everything after :// syntax
nicodvb
parents: 14246
diff changeset
2070 }
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2071 pos1 = ptr1-url;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2072 if(dst && m_option_list_find(desc->fields,"protocol")) {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2073 ptr1[0] = '\0';
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2074 r = m_struct_set(desc,dst,"protocol",url);
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2075 ptr1[0] = ':';
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2076 if(r < 0) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2077 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while setting protocol.\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2078 return r;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2079 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2080 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2081
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2082 // jump the "://"
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2083 ptr1 += 3;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2084 pos1 += 3;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2085
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2086 // check if a username:password is given
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2087 ptr2 = strstr(ptr1, "@");
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2088 ptr3 = strstr(ptr1, "/");
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2089 if( ptr3!=NULL && ptr3<ptr2 ) {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2090 // it isn't really a username but rather a part of the path
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2091 ptr2 = NULL;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2092 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2093 if( ptr2!=NULL ) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
2094
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2095 // We got something, at least a username...
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2096 if(!m_option_list_find(desc->fields,"username")) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2097 mp_msg(MSGT_CFGPARSER, MSGL_WARN, "Option %s: This URL doesn't have a username part.\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2098 // skip
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2099 } else {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2100 ptr3 = strstr(ptr1, ":");
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2101 if( ptr3!=NULL && ptr3<ptr2 ) {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2102 // We also have a password
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2103 if(!m_option_list_find(desc->fields,"password")) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2104 mp_msg(MSGT_CFGPARSER, MSGL_WARN, "Option %s: This URL doesn't have a password part.\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2105 // skip
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
2106 } else { // Username and password
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2107 if(dst) {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2108 ptr3[0] = '\0';
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2109 r = m_struct_set(desc,dst,"username",ptr1);
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2110 ptr3[0] = ':';
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2111 if(r < 0) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2112 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while setting username.\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2113 return r;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2114 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2115 ptr2[0] = '\0';
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2116 r = m_struct_set(desc,dst,"password",ptr3+1);
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2117 ptr2[0] = '@';
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2118 if(r < 0) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2119 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while setting password.\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2120 return r;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2121 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2122 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2123 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2124 } else { // User name only
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2125 ptr2[0] = '\0';
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2126 r = m_struct_set(desc,dst,"username",ptr1);
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2127 ptr2[0] = '@';
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2128 if(r < 0) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2129 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while setting username.\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2130 return r;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2131 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2132 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2133 }
10592
98c885b1ff06 Fix a 10l and add escaped filename support. Needed by ftp.
albeu
parents: 10397
diff changeset
2134 ptr1 = ptr2+1;
98c885b1ff06 Fix a 10l and add escaped filename support. Needed by ftp.
albeu
parents: 10397
diff changeset
2135 pos1 = ptr1-url;
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2136 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2137
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2138 // before looking for a port number check if we have an IPv6 type numeric address
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2139 // in an IPv6 URL the numeric address should be inside square braces.
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2140 ptr2 = strstr(ptr1, "[");
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2141 ptr3 = strstr(ptr1, "]");
11771
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11688
diff changeset
2142 // If the [] is after the first it isn't the hostname
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11688
diff changeset
2143 ptr4 = strstr(ptr1, "/");
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11688
diff changeset
2144 if( ptr2!=NULL && ptr3!=NULL && (ptr2 < ptr3) && (!ptr4 || ptr4 > ptr3)) {
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2145 // we have an IPv6 numeric address
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2146 ptr1++;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2147 pos1++;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2148 ptr2 = ptr3;
11771
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11688
diff changeset
2149 v6addr = 1;
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2150 } else {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
2151 ptr2 = ptr1;
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2152 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2153
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2154 // look if the port is given
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2155 ptr2 = strstr(ptr2, ":");
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2156 // If the : is after the first / it isn't the port
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2157 ptr3 = strstr(ptr1, "/");
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2158 if(ptr3 && ptr3 - ptr2 < 0) ptr2 = NULL;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2159 if( ptr2==NULL ) {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2160 // No port is given
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2161 // Look if a path is given
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2162 if( ptr3==NULL ) {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2163 // No path/filename
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2164 // So we have an URL like http://www.hostname.com
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2165 pos2 = strlen(url);
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2166 } else {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2167 // We have an URL like http://www.hostname.com/file.txt
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2168 pos2 = ptr3-url;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2169 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2170 } else {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2171 // We have an URL beginning like http://www.hostname.com:1212
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2172 // Get the port number
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2173 if(!m_option_list_find(desc->fields,"port")) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2174 mp_msg(MSGT_CFGPARSER, MSGL_WARN, "Option %s: This URL doesn't have a port part.\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2175 // skip
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2176 } else {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2177 if(dst) {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2178 int p = atoi(ptr2+1);
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2179 char tmp[100];
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2180 snprintf(tmp,99,"%d",p);
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2181 r = m_struct_set(desc,dst,"port",tmp);
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2182 if(r < 0) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2183 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while setting port.\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2184 return r;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2185 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2186 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2187 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2188 pos2 = ptr2-url;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2189 }
11771
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11688
diff changeset
2190 if( v6addr ) pos2--;
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2191 // Get the hostname
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2192 if(pos2-pos1 > 0) {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2193 if(!m_option_list_find(desc->fields,"hostname")) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2194 mp_msg(MSGT_CFGPARSER, MSGL_WARN, "Option %s: This URL doesn't have a hostname part.\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2195 // skip
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2196 } else {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2197 char tmp[pos2-pos1+1];
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2198 strncpy(tmp,ptr1, pos2-pos1);
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2199 tmp[pos2-pos1] = '\0';
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2200 r = m_struct_set(desc,dst,"hostname",tmp);
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2201 if(r < 0) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2202 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while setting hostname.\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2203 return r;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2204 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2205 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2206 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2207 // Look if a path is given
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2208 ptr2 = strstr(ptr1, "/");
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2209 if( ptr2!=NULL ) {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2210 // A path/filename is given
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2211 // check if it's not a trailing '/'
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2212 if( strlen(ptr2)>1 ) {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2213 // copy the path/filename in the URL container
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2214 if(!m_option_list_find(desc->fields,"filename")) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2215 mp_msg(MSGT_CFGPARSER, MSGL_WARN, "Option %s: This URL doesn't have a hostname part.\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2216 // skip
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2217 } else {
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2218 if(dst) {
10592
98c885b1ff06 Fix a 10l and add escaped filename support. Needed by ftp.
albeu
parents: 10397
diff changeset
2219 int l = strlen(ptr2+1) + 1;
98c885b1ff06 Fix a 10l and add escaped filename support. Needed by ftp.
albeu
parents: 10397
diff changeset
2220 char* fname = ptr2+1;
98c885b1ff06 Fix a 10l and add escaped filename support. Needed by ftp.
albeu
parents: 10397
diff changeset
2221 if(l > 1) {
98c885b1ff06 Fix a 10l and add escaped filename support. Needed by ftp.
albeu
parents: 10397
diff changeset
2222 fname = malloc(l);
98c885b1ff06 Fix a 10l and add escaped filename support. Needed by ftp.
albeu
parents: 10397
diff changeset
2223 url_unescape_string(fname,ptr2+1);
98c885b1ff06 Fix a 10l and add escaped filename support. Needed by ftp.
albeu
parents: 10397
diff changeset
2224 }
98c885b1ff06 Fix a 10l and add escaped filename support. Needed by ftp.
albeu
parents: 10397
diff changeset
2225 r = m_struct_set(desc,dst,"filename",fname);
98c885b1ff06 Fix a 10l and add escaped filename support. Needed by ftp.
albeu
parents: 10397
diff changeset
2226 if(fname != ptr2+1)
98c885b1ff06 Fix a 10l and add escaped filename support. Needed by ftp.
albeu
parents: 10397
diff changeset
2227 free(fname);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2228 if(r < 0) {
10641
649669755efa spelling and grammar fixes galore
diego
parents: 10608
diff changeset
2229 mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while setting filename.\n",name);
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2230 return r;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2231 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2232 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2233 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2234 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2235 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2236 return 1;
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2237 }
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2238
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2239 /// TODO : Write the other needed funcs for 'normal' options
24966
cc170348a763 correct const usage in the option handling code so that tables can be
rfelker
parents: 23703
diff changeset
2240 const m_option_type_t m_option_type_custom_url = {
9791
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2241 "Custom URL",
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2242 "",
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2243 0,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2244 0,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2245 parse_custom_url,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2246 NULL,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2247 NULL,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2248 NULL,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2249 NULL,
c5b63e88253d Fix some 10L typo in header (m_struct_s instead of m_struct_st).
albeu
parents: 9600
diff changeset
2250 NULL
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28768
diff changeset
2251 };