annotate m_option.c @ 32676:db882cd69776

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