2010-01-30 23:24:23 +00:00
|
|
|
/*
|
|
|
|
* This file is part of MPlayer.
|
|
|
|
*
|
|
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
2006-04-24 19:20:04 +00:00
|
|
|
|
|
|
|
/// \file
|
|
|
|
/// \ingroup Config
|
|
|
|
|
2002-11-12 01:56:42 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <string.h>
|
2014-07-10 06:28:03 +00:00
|
|
|
#include <strings.h>
|
2002-11-12 01:56:42 +00:00
|
|
|
#include <assert.h>
|
2011-07-27 17:59:44 +00:00
|
|
|
#include <stdbool.h>
|
|
|
|
|
2014-02-24 19:39:51 +00:00
|
|
|
#include "libmpv/client.h"
|
|
|
|
|
2011-07-27 17:59:44 +00:00
|
|
|
#include "talloc.h"
|
2002-11-12 01:56:42 +00:00
|
|
|
|
|
|
|
#include "m_config.h"
|
2013-12-17 01:02:25 +00:00
|
|
|
#include "options/m_option.h"
|
2013-12-17 01:39:45 +00:00
|
|
|
#include "common/msg.h"
|
2002-11-12 01:56:42 +00:00
|
|
|
|
2013-10-24 20:20:16 +00:00
|
|
|
static const union m_option_value default_value;
|
|
|
|
|
2013-07-31 18:43:31 +00:00
|
|
|
// Profiles allow to predefine some sets of options that can then
|
|
|
|
// be applied later on with the internal -profile option.
|
2006-01-24 11:16:13 +00:00
|
|
|
#define MAX_PROFILE_DEPTH 20
|
|
|
|
|
2013-07-31 18:43:31 +00:00
|
|
|
struct m_profile {
|
|
|
|
struct m_profile *next;
|
|
|
|
char *name;
|
|
|
|
char *desc;
|
|
|
|
int num_opts;
|
|
|
|
// Option/value pair array.
|
|
|
|
char **opts;
|
|
|
|
};
|
|
|
|
|
2013-07-31 18:44:16 +00:00
|
|
|
// In the file local case, this contains the old global value.
|
|
|
|
struct m_opt_backup {
|
|
|
|
struct m_opt_backup *next;
|
|
|
|
struct m_config_option *co;
|
|
|
|
void *backup;
|
|
|
|
};
|
|
|
|
|
2013-08-02 15:59:43 +00:00
|
|
|
static int parse_include(struct m_config *config, struct bstr param, bool set,
|
|
|
|
int flags)
|
2012-05-07 23:10:39 +00:00
|
|
|
{
|
|
|
|
if (param.len == 0)
|
|
|
|
return M_OPT_MISSING_PARAM;
|
|
|
|
if (!set)
|
|
|
|
return 1;
|
|
|
|
char *filename = bstrdup0(NULL, param);
|
2013-12-21 18:27:19 +00:00
|
|
|
config->includefunc(config->includefunc_ctx, filename, flags);
|
2012-05-07 23:10:39 +00:00
|
|
|
talloc_free(filename);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_profile(struct m_config *config, const struct m_option *opt,
|
2013-08-02 15:59:43 +00:00
|
|
|
struct bstr name, struct bstr param, bool set, int flags)
|
2010-09-27 12:10:59 +00:00
|
|
|
{
|
2011-07-28 08:07:47 +00:00
|
|
|
if (!bstrcmp0(param, "help")) {
|
2011-07-05 19:31:44 +00:00
|
|
|
struct m_profile *p;
|
2010-09-27 12:10:59 +00:00
|
|
|
if (!config->profiles) {
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, "No profiles have been defined.\n");
|
2011-07-05 19:31:44 +00:00
|
|
|
return M_OPT_EXIT - 1;
|
2010-09-27 12:10:59 +00:00
|
|
|
}
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, "Available profiles:\n");
|
2010-09-27 12:10:59 +00:00
|
|
|
for (p = config->profiles; p; p = p->next)
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, "\t%s\t%s\n", p->name, p->desc ? p->desc : "");
|
|
|
|
MP_INFO(config, "\n");
|
2011-07-05 19:31:44 +00:00
|
|
|
return M_OPT_EXIT - 1;
|
2010-09-27 12:10:59 +00:00
|
|
|
}
|
2006-01-24 11:16:13 +00:00
|
|
|
|
2012-05-07 23:10:39 +00:00
|
|
|
char **list = NULL;
|
2013-12-21 18:45:42 +00:00
|
|
|
int r = m_option_type_string_list.parse(config->log, opt, name, param, &list);
|
2010-09-27 12:10:59 +00:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
if (!list || !list[0])
|
|
|
|
return M_OPT_INVALID;
|
2012-05-07 23:10:39 +00:00
|
|
|
for (int i = 0; list[i]; i++) {
|
2013-07-27 19:26:00 +00:00
|
|
|
struct m_profile *p = m_config_get_profile0(config, list[i]);
|
2012-05-07 23:10:39 +00:00
|
|
|
if (!p) {
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_WARN(config, "Unknown profile '%s'.\n", list[i]);
|
2010-09-27 12:10:59 +00:00
|
|
|
r = M_OPT_INVALID;
|
2012-05-07 23:10:39 +00:00
|
|
|
} else if (set)
|
2013-08-02 15:59:43 +00:00
|
|
|
m_config_set_profile(config, p, flags);
|
2010-09-27 12:10:59 +00:00
|
|
|
}
|
|
|
|
m_option_free(opt, &list);
|
2012-05-07 23:10:39 +00:00
|
|
|
return r;
|
2010-09-27 12:10:59 +00:00
|
|
|
}
|
2006-01-24 11:16:13 +00:00
|
|
|
|
2013-07-27 19:26:00 +00:00
|
|
|
static int show_profile(struct m_config *config, bstr param)
|
2010-09-27 12:10:59 +00:00
|
|
|
{
|
2011-07-05 19:31:44 +00:00
|
|
|
struct m_profile *p;
|
2010-09-27 12:10:59 +00:00
|
|
|
int i, j;
|
2013-07-27 19:26:00 +00:00
|
|
|
if (!param.len)
|
2010-09-27 12:10:59 +00:00
|
|
|
return M_OPT_MISSING_PARAM;
|
|
|
|
if (!(p = m_config_get_profile(config, param))) {
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_ERR(config, "Unknown profile '%.*s'.\n", BSTR_P(param));
|
2010-09-27 12:10:59 +00:00
|
|
|
return M_OPT_EXIT - 1;
|
|
|
|
}
|
|
|
|
if (!config->profile_depth)
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, "Profile %s: %s\n", p->name,
|
2010-09-27 12:10:59 +00:00
|
|
|
p->desc ? p->desc : "");
|
|
|
|
config->profile_depth++;
|
|
|
|
for (i = 0; i < p->num_opts; i++) {
|
|
|
|
char spc[config->profile_depth + 1];
|
|
|
|
for (j = 0; j < config->profile_depth; j++)
|
|
|
|
spc[j] = ' ';
|
|
|
|
spc[config->profile_depth] = '\0';
|
|
|
|
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, "%s%s=%s\n", spc, p->opts[2 * i], p->opts[2 * i + 1]);
|
2010-09-27 12:10:59 +00:00
|
|
|
|
|
|
|
if (config->profile_depth < MAX_PROFILE_DEPTH
|
|
|
|
&& !strcmp(p->opts[2*i], "profile")) {
|
|
|
|
char *e, *list = p->opts[2 * i + 1];
|
|
|
|
while ((e = strchr(list, ','))) {
|
2011-07-05 19:31:44 +00:00
|
|
|
int l = e - list;
|
2010-09-27 12:10:59 +00:00
|
|
|
char tmp[l+1];
|
|
|
|
if (!l)
|
|
|
|
continue;
|
|
|
|
memcpy(tmp, list, l);
|
|
|
|
tmp[l] = '\0';
|
2013-07-27 19:26:00 +00:00
|
|
|
show_profile(config, bstr0(tmp));
|
2011-07-05 19:31:44 +00:00
|
|
|
list = e + 1;
|
2010-09-27 12:10:59 +00:00
|
|
|
}
|
|
|
|
if (list[0] != '\0')
|
2013-07-27 19:26:00 +00:00
|
|
|
show_profile(config, bstr0(list));
|
2010-09-27 12:10:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
config->profile_depth--;
|
|
|
|
if (!config->profile_depth)
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, "\n");
|
2010-09-27 12:10:59 +00:00
|
|
|
return M_OPT_EXIT - 1;
|
|
|
|
}
|
2006-01-24 11:16:13 +00:00
|
|
|
|
2013-07-27 19:26:00 +00:00
|
|
|
static int list_options(struct m_config *config)
|
2010-09-27 12:10:59 +00:00
|
|
|
{
|
|
|
|
m_config_print_option_list(config);
|
|
|
|
return M_OPT_EXIT;
|
|
|
|
}
|
2006-01-24 11:34:24 +00:00
|
|
|
|
2013-10-24 20:20:16 +00:00
|
|
|
// The memcpys are supposed to work around the strict aliasing violation,
|
2012-08-06 15:45:17 +00:00
|
|
|
// that would result if we just dereferenced a void** (where the void** is
|
2014-09-12 23:26:26 +00:00
|
|
|
// actually casted from struct some_type* ). The dummy struct type is in
|
|
|
|
// theory needed, because void* and struct pointers could have different
|
|
|
|
// representations, while pointers to different struct types don't.
|
2013-10-24 20:20:16 +00:00
|
|
|
static void *substruct_read_ptr(const void *ptr)
|
2008-03-31 03:19:29 +00:00
|
|
|
{
|
2014-09-12 23:26:26 +00:00
|
|
|
struct mp_dummy_ *res;
|
|
|
|
memcpy(&res, ptr, sizeof(res));
|
2012-08-06 15:45:17 +00:00
|
|
|
return res;
|
2008-03-31 03:19:29 +00:00
|
|
|
}
|
2012-08-06 15:45:17 +00:00
|
|
|
static void substruct_write_ptr(void *ptr, void *val)
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
{
|
2014-09-12 23:26:26 +00:00
|
|
|
struct mp_dummy_ *src = val;
|
|
|
|
memcpy(ptr, &src, sizeof(src));
|
2008-03-31 03:19:29 +00:00
|
|
|
}
|
|
|
|
|
2013-07-27 19:26:00 +00:00
|
|
|
static void add_options(struct m_config *config,
|
2013-10-24 17:49:39 +00:00
|
|
|
const char *parent_name,
|
2013-10-24 18:18:09 +00:00
|
|
|
void *optstruct,
|
|
|
|
const void *optstruct_def,
|
2013-07-27 19:26:00 +00:00
|
|
|
const struct m_option *defs);
|
|
|
|
|
2013-10-12 23:16:30 +00:00
|
|
|
static void config_destroy(void *p)
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
{
|
|
|
|
struct m_config *config = p;
|
2013-08-02 15:59:43 +00:00
|
|
|
m_config_restore_backups(config);
|
2013-10-24 18:00:00 +00:00
|
|
|
for (int n = 0; n < config->num_opts; n++)
|
|
|
|
m_option_free(config->opts[n].opt, config->opts[n].data);
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
}
|
|
|
|
|
2013-12-21 18:45:42 +00:00
|
|
|
struct m_config *m_config_new(void *talloc_ctx, struct mp_log *log,
|
|
|
|
size_t size, const void *defaults,
|
2013-10-24 20:20:16 +00:00
|
|
|
const struct m_option *options)
|
2012-08-04 09:33:24 +00:00
|
|
|
{
|
2013-11-01 16:33:11 +00:00
|
|
|
struct m_config *config = talloc(talloc_ctx, struct m_config);
|
2012-08-04 09:33:24 +00:00
|
|
|
talloc_set_destructor(config, config_destroy);
|
2014-10-06 19:20:10 +00:00
|
|
|
*config = (struct m_config)
|
|
|
|
{.log = log, .size = size, .defaults = defaults, .options = options};
|
2013-10-25 13:31:47 +00:00
|
|
|
// size==0 means a dummy object is created
|
|
|
|
if (size) {
|
2013-07-27 19:26:00 +00:00
|
|
|
config->optstruct = talloc_zero_size(config, size);
|
|
|
|
if (defaults)
|
|
|
|
memcpy(config->optstruct, defaults, size);
|
|
|
|
}
|
2013-10-25 13:31:47 +00:00
|
|
|
if (options)
|
|
|
|
add_options(config, "", config->optstruct, defaults, options);
|
2012-08-04 09:33:24 +00:00
|
|
|
return config;
|
|
|
|
}
|
|
|
|
|
2013-12-21 18:45:42 +00:00
|
|
|
struct m_config *m_config_from_obj_desc(void *talloc_ctx, struct mp_log *log,
|
options: use m_config for options instead of m_struct
For some reason, both m_config and m_struct are somewhat similar, except
that m_config is much more powerful. m_config is used for VOs and some
other things, so to unify them. We plan to kick out m_struct and use
m_config for everything. (Unfortunately, m_config is also a bit more
bloated, so this commit isn't all that great, but it will allow to
reduce the option parser mess somewhat.)
This commit also switches all video filters to use the option macros.
One reason is that m_struct and m_config, even though they both use
m_option, store the offsets of the option fields differently (sigh...),
meaning the options defined for either are incompatible. It's easier to
switch everything in one go.
This commit will allow using the -vf option parser for other things,
like VOs and AOs.
2013-07-21 17:33:08 +00:00
|
|
|
struct m_obj_desc *desc)
|
|
|
|
{
|
2013-12-21 18:45:42 +00:00
|
|
|
return m_config_new(talloc_ctx, log, desc->priv_size, desc->priv_defaults,
|
2013-10-24 20:20:16 +00:00
|
|
|
desc->options);
|
options: use m_config for options instead of m_struct
For some reason, both m_config and m_struct are somewhat similar, except
that m_config is much more powerful. m_config is used for VOs and some
other things, so to unify them. We plan to kick out m_struct and use
m_config for everything. (Unfortunately, m_config is also a bit more
bloated, so this commit isn't all that great, but it will allow to
reduce the option parser mess somewhat.)
This commit also switches all video filters to use the option macros.
One reason is that m_struct and m_config, even though they both use
m_option, store the offsets of the option fields differently (sigh...),
meaning the options defined for either are incompatible. It's easier to
switch everything in one go.
This commit will allow using the -vf option parser for other things,
like VOs and AOs.
2013-07-21 17:33:08 +00:00
|
|
|
}
|
|
|
|
|
2013-10-25 13:31:47 +00:00
|
|
|
// Like m_config_from_obj_desc(), but don't allocate option struct.
|
2013-11-01 16:33:11 +00:00
|
|
|
struct m_config *m_config_from_obj_desc_noalloc(void *talloc_ctx,
|
2013-12-21 18:45:42 +00:00
|
|
|
struct mp_log *log,
|
2013-10-25 13:31:47 +00:00
|
|
|
struct m_obj_desc *desc)
|
|
|
|
{
|
2013-12-21 18:45:42 +00:00
|
|
|
return m_config_new(talloc_ctx, log, 0, desc->priv_defaults, desc->options);
|
2013-10-25 13:31:47 +00:00
|
|
|
}
|
|
|
|
|
options: use m_config for options instead of m_struct
For some reason, both m_config and m_struct are somewhat similar, except
that m_config is much more powerful. m_config is used for VOs and some
other things, so to unify them. We plan to kick out m_struct and use
m_config for everything. (Unfortunately, m_config is also a bit more
bloated, so this commit isn't all that great, but it will allow to
reduce the option parser mess somewhat.)
This commit also switches all video filters to use the option macros.
One reason is that m_struct and m_config, even though they both use
m_option, store the offsets of the option fields differently (sigh...),
meaning the options defined for either are incompatible. It's easier to
switch everything in one go.
This commit will allow using the -vf option parser for other things,
like VOs and AOs.
2013-07-21 17:33:08 +00:00
|
|
|
int m_config_set_obj_params(struct m_config *conf, char **args)
|
|
|
|
{
|
|
|
|
for (int n = 0; args && args[n * 2 + 0]; n++) {
|
|
|
|
int r = m_config_set_option(conf, bstr0(args[n * 2 + 0]),
|
|
|
|
bstr0(args[n * 2 + 1]));
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-11-30 23:12:10 +00:00
|
|
|
int m_config_apply_defaults(struct m_config *config, const char *name,
|
|
|
|
struct m_obj_settings *defaults)
|
|
|
|
{
|
|
|
|
int r = 0;
|
|
|
|
for (int n = 0; defaults && defaults[n].name; n++) {
|
|
|
|
struct m_obj_settings *entry = &defaults[n];
|
|
|
|
if (name && strcmp(entry->name, name) == 0) {
|
|
|
|
r = m_config_set_obj_params(config, entry->attribs);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
static void ensure_backup(struct m_config *config, struct m_config_option *co)
|
2012-05-17 00:31:11 +00:00
|
|
|
{
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
if (co->opt->type->flags & M_OPT_TYPE_HAS_CHILD)
|
|
|
|
return;
|
2012-08-04 09:39:23 +00:00
|
|
|
if (co->opt->flags & M_OPT_GLOBAL)
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
return;
|
2013-07-31 18:44:16 +00:00
|
|
|
if (!co->data)
|
mplayer: turn playtree into a list, and change per-file option handling
Summary:
- There is no playtree anymore. It's reduced to a simple list.
- Options are now always global. You can still have per-file options,
but these are optional and require special syntax.
- The slave command pt_step has been removed, and playlist_next
and playlist_prev added. (See etc/input.conf changes.)
This is a user visible incompatible change, and will break slave-mode
applications.
- The pt_clear slave command is renamed to playlist_clear.
- Playtree entries could have multiple files. This is not the case
anymore, and playlist entries have always exactly one entry. Whenever
something adds more than one file (like ASX playlists or dvd:// or
dvdnav:// on the command line), all files are added as separate
playlist entries.
Note that some of the changes are quite deep and violent. Expect
regressions.
The playlist parsing code in particular is of low quality. I didn't try
to improve it, and merely spent to least effort necessary to keep it
somehow working. (Especially ASX playlist handling.)
The playtree code was complicated and bloated. It was also barely used.
Most users don't even know that mplayer manages the playlist as tree,
or how to use it. The most obscure features was probably specifying a
tree on command line (with '{' and '}' to create/close tree nodes). It
filled the player code with complexity and confused users with weird
slave commands like pt_up.
Replace the playtree with a simple flat playlist. Playlist parsers that
actually return trees are changed to append all files to the playlist
pre-order.
It used to be the responsibility of the playtree code to change per-file
config options. Now this is done by the player core, and the playlist
code is free of such details.
Options are not per-file by default anymore. This was a very obscure and
complicated feature that confused even experienced users. Consider the
following command line:
mplayer file1.mkv file2.mkv --no-audio file3.mkv
This will disable the audio for file2.mkv only, because options are
per-file by default. To make the option affect all files, you're
supposed to put it before the first file.
This is bad, because normally you don't need per-file options. They are
very rarely needed, and the only reasonable use cases I can imagine are
use of the encode backend (mplayer encode branch), or for debugging. The
normal use case is made harder, and the feature is perceived as bug.
Even worse, correct usage is hard to explain for users.
Make all options global by default. The position of an option isn't
significant anymore (except for options that compensate each other,
consider --shuffle --no-shuffle).
One other important change is that no options are reset anymore if a
new file is started. If you change settings with slave mode commands,
they will not be changed by playing a new file. (Exceptions include
settings that are too file specific, like audio/subtitle stream
selection.)
There is still some need for per-file options. Debugging and encoding
are use cases that profit from per-file options. Per-file profiles (as
well as per-protocol and per-VO/AO options) need the implementation
related mechanisms to backup and restore options when the playback file
changes.
Simplify the save-slot stuff, which is possible because there is no
hierarchical play tree anymore. Now there's a simple backup field.
Add a way to specify per-file options on command line. Example:
mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3
will have the following options per file set:
f1.mkv, f4.mkv: -o0 -o3
f2.mkv, f3.mkv: -o0 -o3 -o1 -o2
The options --{ and --} start and end per-file options. All files inside
the { } will be affected by the options equally (similar to how global
options and multiple files are handled). When playback of a file starts,
the per-file options are set according to the command line. When
playback ends, the per-file options are restored to the values when
playback started.
2012-07-31 19:33:26 +00:00
|
|
|
return;
|
2013-07-31 18:44:16 +00:00
|
|
|
for (struct m_opt_backup *cur = config->backup_opts; cur; cur = cur->next) {
|
|
|
|
if (cur->co->data == co->data) // comparing data ptr catches aliases
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
struct m_opt_backup *bc = talloc_ptrtype(NULL, bc);
|
|
|
|
*bc = (struct m_opt_backup) {
|
|
|
|
.co = co,
|
|
|
|
.backup = talloc_zero_size(bc, co->opt->type->size),
|
|
|
|
};
|
|
|
|
m_option_copy(co->opt, bc->backup, co->data);
|
|
|
|
bc->next = config->backup_opts;
|
|
|
|
config->backup_opts = bc;
|
2012-05-17 00:31:11 +00:00
|
|
|
}
|
|
|
|
|
2013-08-02 15:59:43 +00:00
|
|
|
void m_config_restore_backups(struct m_config *config)
|
2011-07-05 19:31:44 +00:00
|
|
|
{
|
2013-07-31 18:44:16 +00:00
|
|
|
while (config->backup_opts) {
|
|
|
|
struct m_opt_backup *bc = config->backup_opts;
|
|
|
|
config->backup_opts = bc->next;
|
|
|
|
|
|
|
|
m_option_copy(bc->co->opt, bc->co->data, bc->backup);
|
|
|
|
m_option_free(bc->co->opt, bc->backup);
|
|
|
|
talloc_free(bc);
|
2002-11-12 01:56:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-02 15:59:43 +00:00
|
|
|
void m_config_backup_opt(struct m_config *config, const char *opt)
|
2013-04-10 19:06:00 +00:00
|
|
|
{
|
|
|
|
struct m_config_option *co = m_config_get_co(config, bstr0(opt));
|
|
|
|
if (co) {
|
|
|
|
ensure_backup(config, co);
|
|
|
|
} else {
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_ERR(config, "Option %s not found.\n", opt);
|
2013-04-10 19:06:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-02 15:59:43 +00:00
|
|
|
void m_config_backup_all_opts(struct m_config *config)
|
2013-04-10 19:06:00 +00:00
|
|
|
{
|
2013-10-24 18:00:00 +00:00
|
|
|
for (int n = 0; n < config->num_opts; n++)
|
|
|
|
ensure_backup(config, &config->opts[n]);
|
2013-10-24 17:49:39 +00:00
|
|
|
}
|
|
|
|
|
options: change handling of "no-" options yet again
Commit 4a40eed "options: change handling of "no-" options" generally
improved the handling of automatically added negation options
(recognizing "--no-opt", even though only "--opt" is declared in the
option list).
Unfortunately, one corner case was missed, which broke the option
"--input=no-default-bindings" (other suboptions, e.g. VO suboptions,
were not affected, and this is the only option where this mattered).
Instead of increasing the complexity further, use a completely different
approach: add the "--no-" options at runtime, and make them behave like
real options. This approach could be considered slightly less elegant,
because the code now has to worry about some option implementation
details rather than leaving it to the parser, but all in all the new
code is simpler and there are less weird corner cases to worry about.
2013-02-16 18:57:57 +00:00
|
|
|
// Given an option --opt, add --no-opt (if applicable).
|
|
|
|
static void add_negation_option(struct m_config *config,
|
2013-10-24 17:49:39 +00:00
|
|
|
struct m_config_option *orig,
|
|
|
|
const char *parent_name)
|
options: change handling of "no-" options yet again
Commit 4a40eed "options: change handling of "no-" options" generally
improved the handling of automatically added negation options
(recognizing "--no-opt", even though only "--opt" is declared in the
option list).
Unfortunately, one corner case was missed, which broke the option
"--input=no-default-bindings" (other suboptions, e.g. VO suboptions,
were not affected, and this is the only option where this mattered).
Instead of increasing the complexity further, use a completely different
approach: add the "--no-" options at runtime, and make them behave like
real options. This approach could be considered slightly less elegant,
because the code now has to worry about some option implementation
details rather than leaving it to the parser, but all in all the new
code is simpler and there are less weird corner cases to worry about.
2013-02-16 18:57:57 +00:00
|
|
|
{
|
2013-10-24 17:49:39 +00:00
|
|
|
const struct m_option *opt = orig->opt;
|
options: change handling of "no-" options yet again
Commit 4a40eed "options: change handling of "no-" options" generally
improved the handling of automatically added negation options
(recognizing "--no-opt", even though only "--opt" is declared in the
option list).
Unfortunately, one corner case was missed, which broke the option
"--input=no-default-bindings" (other suboptions, e.g. VO suboptions,
were not affected, and this is the only option where this mattered).
Instead of increasing the complexity further, use a completely different
approach: add the "--no-" options at runtime, and make them behave like
real options. This approach could be considered slightly less elegant,
because the code now has to worry about some option implementation
details rather than leaving it to the parser, but all in all the new
code is simpler and there are less weird corner cases to worry about.
2013-02-16 18:57:57 +00:00
|
|
|
int value;
|
|
|
|
if (opt->type == CONF_TYPE_FLAG) {
|
2014-06-13 00:08:48 +00:00
|
|
|
value = 0;
|
options: change handling of "no-" options yet again
Commit 4a40eed "options: change handling of "no-" options" generally
improved the handling of automatically added negation options
(recognizing "--no-opt", even though only "--opt" is declared in the
option list).
Unfortunately, one corner case was missed, which broke the option
"--input=no-default-bindings" (other suboptions, e.g. VO suboptions,
were not affected, and this is the only option where this mattered).
Instead of increasing the complexity further, use a completely different
approach: add the "--no-" options at runtime, and make them behave like
real options. This approach could be considered slightly less elegant,
because the code now has to worry about some option implementation
details rather than leaving it to the parser, but all in all the new
code is simpler and there are less weird corner cases to worry about.
2013-02-16 18:57:57 +00:00
|
|
|
} else if (opt->type == CONF_TYPE_CHOICE) {
|
|
|
|
// Find out whether there's a "no" choice.
|
|
|
|
// m_option_parse() should be used for this, but it prints
|
|
|
|
// unsilenceable error messages.
|
|
|
|
struct m_opt_choice_alternatives *alt = opt->priv;
|
|
|
|
for ( ; alt->name; alt++) {
|
|
|
|
if (strcmp(alt->name, "no") == 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!alt->name)
|
|
|
|
return;
|
|
|
|
value = alt->value;
|
|
|
|
} else {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
struct m_option *no_opt = talloc_ptrtype(config, no_opt);
|
|
|
|
*no_opt = (struct m_option) {
|
2013-10-24 17:49:39 +00:00
|
|
|
.name = opt->name,
|
options: change handling of "no-" options yet again
Commit 4a40eed "options: change handling of "no-" options" generally
improved the handling of automatically added negation options
(recognizing "--no-opt", even though only "--opt" is declared in the
option list).
Unfortunately, one corner case was missed, which broke the option
"--input=no-default-bindings" (other suboptions, e.g. VO suboptions,
were not affected, and this is the only option where this mattered).
Instead of increasing the complexity further, use a completely different
approach: add the "--no-" options at runtime, and make them behave like
real options. This approach could be considered slightly less elegant,
because the code now has to worry about some option implementation
details rather than leaving it to the parser, but all in all the new
code is simpler and there are less weird corner cases to worry about.
2013-02-16 18:57:57 +00:00
|
|
|
.type = CONF_TYPE_STORE,
|
2013-08-02 15:59:43 +00:00
|
|
|
.flags = opt->flags & (M_OPT_NOCFG | M_OPT_GLOBAL | M_OPT_PRE_PARSE),
|
options: change handling of "no-" options yet again
Commit 4a40eed "options: change handling of "no-" options" generally
improved the handling of automatically added negation options
(recognizing "--no-opt", even though only "--opt" is declared in the
option list).
Unfortunately, one corner case was missed, which broke the option
"--input=no-default-bindings" (other suboptions, e.g. VO suboptions,
were not affected, and this is the only option where this mattered).
Instead of increasing the complexity further, use a completely different
approach: add the "--no-" options at runtime, and make them behave like
real options. This approach could be considered slightly less elegant,
because the code now has to worry about some option implementation
details rather than leaving it to the parser, but all in all the new
code is simpler and there are less weird corner cases to worry about.
2013-02-16 18:57:57 +00:00
|
|
|
.offset = opt->offset,
|
|
|
|
.max = value,
|
|
|
|
};
|
2013-10-24 17:49:39 +00:00
|
|
|
// Add --no-sub-opt
|
2013-10-24 18:00:00 +00:00
|
|
|
struct m_config_option co = *orig;
|
|
|
|
co.name = talloc_asprintf(config, "no-%s", orig->name);
|
|
|
|
co.opt = no_opt;
|
|
|
|
co.is_generated = true;
|
|
|
|
MP_TARRAY_APPEND(config, config->opts, config->num_opts, co);
|
2013-10-24 17:49:39 +00:00
|
|
|
// Add --sub-no-opt (unfortunately needed for: "--sub=...:no-opt")
|
|
|
|
if (parent_name[0]) {
|
2013-10-24 18:00:00 +00:00
|
|
|
co.name = talloc_asprintf(config, "%s-no-%s", parent_name, opt->name);
|
|
|
|
MP_TARRAY_APPEND(config, config->opts, config->num_opts, co);
|
options: drop --opt:subopt option names
For all suboptions, "flat" options were available by separating the
parent option and the sub option with ":", e.g. "--rawvideo:w=123". Drop
this syntax and use "-" as separator. This means even suboptions are
available as normal options now, e.g. "--rawvideo-w=123". The old syntax
doesn't work anymore.
Note that this is completely separate from actual suboptions. For
example, "-rawvideo w=123:h=123" still works. (Not that this syntax is
worth supporting, but it's needed anyway, for for other things like vf
and vo suboptions.)
As a consequence of this change, we also have to add new "no-" prefixed
options for flag suboptions, so that "--no-input-default-bindings"
works. ("--input-no-default-bindings" also works as a consequence of
allowing "-input no-default-bindings" - they are handled by the same
underlying option.)
For --input, always use the full syntax in the manpage. There exist
suboptions other than --input (like --tv, --rawvideo, etc.), but since
they might be handled differently in the future, don't touch these yet.
M_OPT_PREFIXED becomes the default, so remove it. As a minor unrelated
cleanup, get rid of M_OPT_MERGE too and use the OPT_SUBSTRUCT() macro in
some places.
Unrelated: remove the duplicated --tv:buffersize option, fix a typo in
changes.rst.
2013-02-21 21:10:21 +00:00
|
|
|
}
|
options: change handling of "no-" options yet again
Commit 4a40eed "options: change handling of "no-" options" generally
improved the handling of automatically added negation options
(recognizing "--no-opt", even though only "--opt" is declared in the
option list).
Unfortunately, one corner case was missed, which broke the option
"--input=no-default-bindings" (other suboptions, e.g. VO suboptions,
were not affected, and this is the only option where this mattered).
Instead of increasing the complexity further, use a completely different
approach: add the "--no-" options at runtime, and make them behave like
real options. This approach could be considered slightly less elegant,
because the code now has to worry about some option implementation
details rather than leaving it to the parser, but all in all the new
code is simpler and there are less weird corner cases to worry about.
2013-02-16 18:57:57 +00:00
|
|
|
}
|
|
|
|
|
2013-10-24 17:49:39 +00:00
|
|
|
static void m_config_add_option(struct m_config *config,
|
|
|
|
const char *parent_name,
|
2013-10-24 18:18:09 +00:00
|
|
|
void *optstruct,
|
|
|
|
const void *optstruct_def,
|
2013-10-24 17:49:39 +00:00
|
|
|
const struct m_option *arg);
|
|
|
|
|
2012-08-06 15:42:53 +00:00
|
|
|
static void add_options(struct m_config *config,
|
2013-10-24 17:49:39 +00:00
|
|
|
const char *parent_name,
|
2013-10-24 18:18:09 +00:00
|
|
|
void *optstruct,
|
|
|
|
const void *optstruct_def,
|
2012-08-06 15:42:53 +00:00
|
|
|
const struct m_option *defs)
|
2011-09-04 11:34:45 +00:00
|
|
|
{
|
2013-10-24 17:49:39 +00:00
|
|
|
for (int i = 0; defs && defs[i].name; i++)
|
2013-10-24 18:18:09 +00:00
|
|
|
m_config_add_option(config, parent_name, optstruct, optstruct_def, &defs[i]);
|
options: drop --opt:subopt option names
For all suboptions, "flat" options were available by separating the
parent option and the sub option with ":", e.g. "--rawvideo:w=123". Drop
this syntax and use "-" as separator. This means even suboptions are
available as normal options now, e.g. "--rawvideo-w=123". The old syntax
doesn't work anymore.
Note that this is completely separate from actual suboptions. For
example, "-rawvideo w=123:h=123" still works. (Not that this syntax is
worth supporting, but it's needed anyway, for for other things like vf
and vo suboptions.)
As a consequence of this change, we also have to add new "no-" prefixed
options for flag suboptions, so that "--no-input-default-bindings"
works. ("--input-no-default-bindings" also works as a consequence of
allowing "-input no-default-bindings" - they are handled by the same
underlying option.)
For --input, always use the full syntax in the manpage. There exist
suboptions other than --input (like --tv, --rawvideo, etc.), but since
they might be handled differently in the future, don't touch these yet.
M_OPT_PREFIXED becomes the default, so remove it. As a minor unrelated
cleanup, get rid of M_OPT_MERGE too and use the OPT_SUBSTRUCT() macro in
some places.
Unrelated: remove the duplicated --tv:buffersize option, fix a typo in
changes.rst.
2013-02-21 21:10:21 +00:00
|
|
|
}
|
|
|
|
|
2013-10-24 17:49:39 +00:00
|
|
|
static void m_config_add_option(struct m_config *config,
|
|
|
|
const char *parent_name,
|
2013-10-24 18:18:09 +00:00
|
|
|
void *optstruct,
|
|
|
|
const void *optstruct_def,
|
2013-10-24 17:49:39 +00:00
|
|
|
const struct m_option *arg)
|
2011-07-05 19:31:44 +00:00
|
|
|
{
|
|
|
|
assert(config != NULL);
|
|
|
|
assert(arg != NULL);
|
|
|
|
|
2013-10-24 18:00:00 +00:00
|
|
|
struct m_config_option co = {
|
|
|
|
.opt = arg,
|
2013-10-25 13:58:01 +00:00
|
|
|
.name = arg->name,
|
2013-10-24 18:00:00 +00:00
|
|
|
};
|
2011-07-05 19:31:44 +00:00
|
|
|
|
2014-06-13 00:16:47 +00:00
|
|
|
if (arg->offset >= 0) {
|
2013-10-24 20:20:16 +00:00
|
|
|
if (optstruct)
|
|
|
|
co.data = (char *)optstruct + arg->offset;
|
|
|
|
if (optstruct_def)
|
|
|
|
co.default_data = (char *)optstruct_def + arg->offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (arg->defval)
|
|
|
|
co.default_data = arg->defval;
|
|
|
|
|
2013-10-25 13:31:47 +00:00
|
|
|
if (!co.default_data)
|
2013-10-24 20:20:16 +00:00
|
|
|
co.default_data = &default_value;
|
2012-08-06 15:45:17 +00:00
|
|
|
|
2011-07-05 19:31:44 +00:00
|
|
|
// Fill in the full name
|
2013-10-25 13:58:01 +00:00
|
|
|
if (!co.name[0]) {
|
|
|
|
co.name = parent_name;
|
|
|
|
} else if (parent_name[0]) {
|
2013-10-24 18:00:00 +00:00
|
|
|
co.name = talloc_asprintf(config, "%s-%s", parent_name, co.name);
|
2013-10-25 13:58:01 +00:00
|
|
|
}
|
2011-07-05 19:31:44 +00:00
|
|
|
|
|
|
|
// Option with children -> add them
|
|
|
|
if (arg->type->flags & M_OPT_TYPE_HAS_CHILD) {
|
2014-06-13 00:17:31 +00:00
|
|
|
const struct m_sub_options *subopts = arg->priv;
|
2013-10-24 20:20:16 +00:00
|
|
|
|
2014-06-13 00:17:31 +00:00
|
|
|
void *new_optstruct = NULL;
|
|
|
|
if (co.data) {
|
|
|
|
new_optstruct = m_config_alloc_struct(config, subopts);
|
|
|
|
substruct_write_ptr(co.data, new_optstruct);
|
|
|
|
}
|
2013-10-24 20:20:16 +00:00
|
|
|
|
2014-06-13 00:17:31 +00:00
|
|
|
const void *new_optstruct_def = substruct_read_ptr(co.default_data);
|
|
|
|
if (!new_optstruct_def)
|
|
|
|
new_optstruct_def = subopts->defaults;
|
2013-10-24 18:18:09 +00:00
|
|
|
|
2014-06-13 00:17:31 +00:00
|
|
|
add_options(config, co.name, new_optstruct,
|
|
|
|
new_optstruct_def, subopts->opts);
|
2011-07-05 19:31:44 +00:00
|
|
|
} else {
|
2013-07-31 18:44:34 +00:00
|
|
|
// Initialize options
|
2013-10-24 20:20:16 +00:00
|
|
|
if (co.data && co.default_data) {
|
|
|
|
if (arg->type->flags & M_OPT_TYPE_DYNAMIC) {
|
|
|
|
// Would leak memory by overwriting *co.data repeatedly.
|
2013-10-24 18:00:00 +00:00
|
|
|
for (int i = 0; i < config->num_opts; i++) {
|
|
|
|
if (co.data == config->opts[i].data)
|
2013-10-24 17:11:27 +00:00
|
|
|
assert(0);
|
2011-07-05 19:31:44 +00:00
|
|
|
}
|
2008-04-30 16:34:26 +00:00
|
|
|
}
|
2013-10-24 20:20:16 +00:00
|
|
|
// In case this is dynamic data, it has to be allocated and copied.
|
|
|
|
union m_option_value temp = {0};
|
|
|
|
memcpy(&temp, co.default_data, arg->type->size);
|
|
|
|
memset(co.data, 0, arg->type->size);
|
|
|
|
m_option_copy(arg, co.data, &temp);
|
2008-04-30 16:20:01 +00:00
|
|
|
}
|
|
|
|
}
|
2012-08-06 15:42:53 +00:00
|
|
|
|
2013-10-25 13:58:01 +00:00
|
|
|
if (arg->name[0]) // no own name -> hidden
|
2013-10-24 18:00:00 +00:00
|
|
|
MP_TARRAY_APPEND(config, config->opts, config->num_opts, co);
|
options: change handling of "no-" options yet again
Commit 4a40eed "options: change handling of "no-" options" generally
improved the handling of automatically added negation options
(recognizing "--no-opt", even though only "--opt" is declared in the
option list).
Unfortunately, one corner case was missed, which broke the option
"--input=no-default-bindings" (other suboptions, e.g. VO suboptions,
were not affected, and this is the only option where this mattered).
Instead of increasing the complexity further, use a completely different
approach: add the "--no-" options at runtime, and make them behave like
real options. This approach could be considered slightly less elegant,
because the code now has to worry about some option implementation
details rather than leaving it to the parser, but all in all the new
code is simpler and there are less weird corner cases to worry about.
2013-02-16 18:57:57 +00:00
|
|
|
|
2013-10-24 18:00:00 +00:00
|
|
|
add_negation_option(config, &co, parent_name);
|
2014-12-11 22:23:50 +00:00
|
|
|
|
|
|
|
if (co.opt->type == &m_option_type_alias) {
|
|
|
|
co.is_generated = true; // hide it
|
|
|
|
const char *alias = (const char *)co.opt->priv;
|
|
|
|
char no_alias[40];
|
|
|
|
snprintf(no_alias, sizeof(no_alias), "no-%s", alias);
|
|
|
|
if (m_config_get_co(config, bstr0(no_alias))) {
|
|
|
|
struct m_option *new = talloc_zero(config, struct m_option);
|
|
|
|
new->name = talloc_asprintf(config, "no-%s", co.name);
|
|
|
|
new->priv = talloc_strdup(config, no_alias);
|
|
|
|
new->type = &m_option_type_alias;
|
|
|
|
new->offset = -1;
|
|
|
|
m_config_add_option(config, "", NULL, NULL, new);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (co.opt->type == &m_option_type_removed)
|
|
|
|
co.is_generated = true; // hide it
|
2002-11-12 01:56:42 +00:00
|
|
|
}
|
|
|
|
|
2012-09-18 18:07:24 +00:00
|
|
|
struct m_config_option *m_config_get_co(const struct m_config *config,
|
|
|
|
struct bstr name)
|
2011-07-05 19:31:44 +00:00
|
|
|
{
|
2014-12-11 00:04:15 +00:00
|
|
|
const char *prefix = config->is_toplevel ? "--" : "";
|
2013-10-24 18:00:00 +00:00
|
|
|
for (int n = 0; n < config->num_opts; n++) {
|
|
|
|
struct m_config_option *co = &config->opts[n];
|
2012-07-28 21:47:42 +00:00
|
|
|
struct bstr coname = bstr0(co->name);
|
2014-12-11 00:04:15 +00:00
|
|
|
bool matches = false;
|
2011-07-28 08:07:47 +00:00
|
|
|
if ((co->opt->type->flags & M_OPT_TYPE_ALLOW_WILDCARD)
|
|
|
|
&& bstr_endswith0(coname, "*")) {
|
|
|
|
coname.len--;
|
2013-05-15 13:28:29 +00:00
|
|
|
if (bstrcmp(bstr_splice(name, 0, coname.len), coname) == 0)
|
2014-12-11 00:04:15 +00:00
|
|
|
matches = true;
|
2013-05-15 13:28:29 +00:00
|
|
|
} else if (bstrcmp(coname, name) == 0)
|
2014-12-11 00:04:15 +00:00
|
|
|
matches = true;
|
|
|
|
if (matches) {
|
|
|
|
if (co->opt->type == &m_option_type_alias) {
|
2014-12-11 22:23:50 +00:00
|
|
|
const char *alias = (const char *)co->opt->priv;
|
2014-12-11 00:04:15 +00:00
|
|
|
if (!co->warning_was_printed) {
|
|
|
|
MP_WARN(config, "Warning: option %s%s was replaced with "
|
|
|
|
"%s%s and might be removed in the future.\n",
|
2014-12-11 22:23:50 +00:00
|
|
|
prefix, co->name, prefix, alias);
|
2014-12-11 00:04:15 +00:00
|
|
|
co->warning_was_printed = true;
|
|
|
|
}
|
2014-12-11 22:23:50 +00:00
|
|
|
return m_config_get_co(config, bstr0(alias));
|
2014-12-11 00:04:15 +00:00
|
|
|
} else if (co->opt->type == &m_option_type_removed) {
|
|
|
|
if (!co->warning_was_printed) {
|
|
|
|
char *msg = co->opt->priv;
|
|
|
|
if (msg) {
|
|
|
|
MP_FATAL(config, "Option %s%s was removed: %s\n",
|
|
|
|
prefix, co->name, msg);
|
|
|
|
} else {
|
|
|
|
MP_FATAL(config, "Option %s%s was removed.\n",
|
|
|
|
prefix, co->name);
|
|
|
|
}
|
|
|
|
co->warning_was_printed = true;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
2011-07-05 19:31:44 +00:00
|
|
|
return co;
|
2014-12-11 00:04:15 +00:00
|
|
|
}
|
2011-07-05 19:31:44 +00:00
|
|
|
}
|
|
|
|
return NULL;
|
2002-11-12 01:56:42 +00:00
|
|
|
}
|
|
|
|
|
2013-11-01 11:27:04 +00:00
|
|
|
const char *m_config_get_positional_option(const struct m_config *config, int p)
|
options: use m_config for options instead of m_struct
For some reason, both m_config and m_struct are somewhat similar, except
that m_config is much more powerful. m_config is used for VOs and some
other things, so to unify them. We plan to kick out m_struct and use
m_config for everything. (Unfortunately, m_config is also a bit more
bloated, so this commit isn't all that great, but it will allow to
reduce the option parser mess somewhat.)
This commit also switches all video filters to use the option macros.
One reason is that m_struct and m_config, even though they both use
m_option, store the offsets of the option fields differently (sigh...),
meaning the options defined for either are incompatible. It's easier to
switch everything in one go.
This commit will allow using the -vf option parser for other things,
like VOs and AOs.
2013-07-21 17:33:08 +00:00
|
|
|
{
|
2013-07-27 19:30:00 +00:00
|
|
|
int pos = 0;
|
2013-10-24 18:00:00 +00:00
|
|
|
for (int n = 0; n < config->num_opts; n++) {
|
|
|
|
struct m_config_option *co = &config->opts[n];
|
2013-07-27 19:30:00 +00:00
|
|
|
if (!co->is_generated) {
|
2013-11-01 11:27:04 +00:00
|
|
|
if (pos == p)
|
2013-07-27 19:30:00 +00:00
|
|
|
return co->name;
|
|
|
|
pos++;
|
|
|
|
}
|
options: use m_config for options instead of m_struct
For some reason, both m_config and m_struct are somewhat similar, except
that m_config is much more powerful. m_config is used for VOs and some
other things, so to unify them. We plan to kick out m_struct and use
m_config for everything. (Unfortunately, m_config is also a bit more
bloated, so this commit isn't all that great, but it will allow to
reduce the option parser mess somewhat.)
This commit also switches all video filters to use the option macros.
One reason is that m_struct and m_config, even though they both use
m_option, store the offsets of the option fields differently (sigh...),
meaning the options defined for either are incompatible. It's easier to
switch everything in one go.
This commit will allow using the -vf option parser for other things,
like VOs and AOs.
2013-07-21 17:33:08 +00:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-05-18 16:57:02 +00:00
|
|
|
// return: <0: M_OPT_ error, 0: skip, 1: check, 2: set
|
|
|
|
static int handle_set_opt_flags(struct m_config *config,
|
|
|
|
struct m_config_option *co, int flags)
|
|
|
|
{
|
|
|
|
int optflags = co->opt->flags;
|
|
|
|
bool set = !(flags & M_SETOPT_CHECK_ONLY);
|
|
|
|
|
|
|
|
if ((flags & M_SETOPT_PRE_PARSE_ONLY) && !(optflags & M_OPT_PRE_PARSE))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if ((flags & M_SETOPT_PRESERVE_CMDLINE) && co->is_set_from_cmdline)
|
|
|
|
set = false;
|
|
|
|
|
|
|
|
if ((flags & M_SETOPT_NO_FIXED) && (optflags & M_OPT_FIXED))
|
|
|
|
return M_OPT_INVALID;
|
|
|
|
|
|
|
|
if ((flags & M_SETOPT_NO_PRE_PARSE) && (optflags & M_OPT_PRE_PARSE))
|
|
|
|
return M_OPT_INVALID;
|
|
|
|
|
|
|
|
// Check if this option isn't forbidden in the current mode
|
|
|
|
if ((flags & M_SETOPT_FROM_CONFIG_FILE) && (optflags & M_OPT_NOCFG)) {
|
|
|
|
MP_ERR(config, "The %s option can't be used in a config file.\n",
|
|
|
|
co->name);
|
|
|
|
return M_OPT_INVALID;
|
|
|
|
}
|
|
|
|
if (flags & M_SETOPT_BACKUP) {
|
|
|
|
if (optflags & M_OPT_GLOBAL) {
|
|
|
|
MP_ERR(config, "The %s option is global and can't be set per-file.\n",
|
|
|
|
co->name);
|
|
|
|
return M_OPT_INVALID;
|
|
|
|
}
|
|
|
|
if (set)
|
|
|
|
ensure_backup(config, co);
|
|
|
|
}
|
|
|
|
|
|
|
|
return set ? 2 : 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_set_from_cmdline(struct m_config *config,
|
|
|
|
struct m_config_option *co)
|
|
|
|
{
|
|
|
|
co->is_set_from_cmdline = true;
|
|
|
|
// Mark aliases too
|
|
|
|
if (co->data) {
|
|
|
|
for (int n = 0; n < config->num_opts; n++) {
|
|
|
|
struct m_config_option *co2 = &config->opts[n];
|
|
|
|
if (co2->data == co->data)
|
|
|
|
co2->is_set_from_cmdline = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// The type data points to is as in: m_config_get_co(config, name)->opt
|
|
|
|
int m_config_set_option_raw(struct m_config *config, struct m_config_option *co,
|
|
|
|
void *data, int flags)
|
|
|
|
{
|
|
|
|
if (!co)
|
|
|
|
return M_OPT_UNKNOWN;
|
|
|
|
|
|
|
|
// This affects some special options like "include", "profile". Maybe these
|
|
|
|
// should work, or maybe not. For now they would require special code.
|
|
|
|
if (!co->data)
|
|
|
|
return M_OPT_UNKNOWN;
|
|
|
|
|
|
|
|
int r = handle_set_opt_flags(config, co, flags);
|
|
|
|
if (r <= 1)
|
|
|
|
return r;
|
|
|
|
|
|
|
|
m_option_copy(co->opt, co->data, data);
|
|
|
|
if (flags & M_SETOPT_FROM_CMDLINE)
|
|
|
|
handle_set_from_cmdline(config, co);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-08-02 15:06:43 +00:00
|
|
|
static int parse_subopts(struct m_config *config, char *name, char *prefix,
|
|
|
|
struct bstr param, int flags);
|
2012-05-17 00:31:11 +00:00
|
|
|
|
2013-08-02 15:06:43 +00:00
|
|
|
static int m_config_parse_option(struct m_config *config, struct bstr name,
|
|
|
|
struct bstr param, int flags)
|
2011-07-05 19:31:44 +00:00
|
|
|
{
|
|
|
|
assert(config != NULL);
|
2011-07-28 08:07:47 +00:00
|
|
|
assert(name.len != 0);
|
2011-07-05 19:31:44 +00:00
|
|
|
|
2012-05-07 23:10:39 +00:00
|
|
|
struct m_config_option *co = m_config_get_co(config, name);
|
2014-12-11 00:04:15 +00:00
|
|
|
if (!co)
|
2011-07-05 19:31:44 +00:00
|
|
|
return M_OPT_UNKNOWN;
|
2002-11-12 01:56:42 +00:00
|
|
|
|
2011-07-05 19:31:44 +00:00
|
|
|
// This is the only mandatory function
|
|
|
|
assert(co->opt->type->parse);
|
2002-11-12 01:56:42 +00:00
|
|
|
|
2014-05-18 16:57:02 +00:00
|
|
|
int r = handle_set_opt_flags(config, co, flags);
|
|
|
|
if (r <= 0)
|
|
|
|
return r;
|
|
|
|
bool set = r == 2;
|
2013-10-25 20:52:54 +00:00
|
|
|
|
2013-12-23 16:30:19 +00:00
|
|
|
if (set) {
|
|
|
|
MP_VERBOSE(config, "Setting option '%.*s' = '%.*s' (flags = %d)\n",
|
|
|
|
BSTR_P(name), BSTR_P(param), flags);
|
|
|
|
}
|
|
|
|
|
2013-07-27 19:26:00 +00:00
|
|
|
if (config->includefunc && bstr_equals0(name, "include"))
|
2013-08-02 15:59:43 +00:00
|
|
|
return parse_include(config, param, set, flags);
|
2013-07-27 19:26:00 +00:00
|
|
|
if (config->use_profiles && bstr_equals0(name, "profile"))
|
2013-08-02 15:59:43 +00:00
|
|
|
return parse_profile(config, co->opt, name, param, set, flags);
|
2013-07-27 19:26:00 +00:00
|
|
|
if (config->use_profiles && bstr_equals0(name, "show-profile"))
|
|
|
|
return show_profile(config, param);
|
|
|
|
if (bstr_equals0(name, "list-options"))
|
|
|
|
return list_options(config);
|
2012-05-07 23:10:39 +00:00
|
|
|
|
2011-07-05 19:31:44 +00:00
|
|
|
// Option with children are a bit different to parse
|
|
|
|
if (co->opt->type->flags & M_OPT_TYPE_HAS_CHILD) {
|
2012-05-17 00:31:11 +00:00
|
|
|
char prefix[110];
|
|
|
|
assert(strlen(co->name) < 100);
|
options: drop --opt:subopt option names
For all suboptions, "flat" options were available by separating the
parent option and the sub option with ":", e.g. "--rawvideo:w=123". Drop
this syntax and use "-" as separator. This means even suboptions are
available as normal options now, e.g. "--rawvideo-w=123". The old syntax
doesn't work anymore.
Note that this is completely separate from actual suboptions. For
example, "-rawvideo w=123:h=123" still works. (Not that this syntax is
worth supporting, but it's needed anyway, for for other things like vf
and vo suboptions.)
As a consequence of this change, we also have to add new "no-" prefixed
options for flag suboptions, so that "--no-input-default-bindings"
works. ("--input-no-default-bindings" also works as a consequence of
allowing "-input no-default-bindings" - they are handled by the same
underlying option.)
For --input, always use the full syntax in the manpage. There exist
suboptions other than --input (like --tv, --rawvideo, etc.), but since
they might be handled differently in the future, don't touch these yet.
M_OPT_PREFIXED becomes the default, so remove it. As a minor unrelated
cleanup, get rid of M_OPT_MERGE too and use the OPT_SUBSTRUCT() macro in
some places.
Unrelated: remove the duplicated --tv:buffersize option, fix a typo in
changes.rst.
2013-02-21 21:10:21 +00:00
|
|
|
sprintf(prefix, "%s-", co->name);
|
2013-10-25 13:58:01 +00:00
|
|
|
return parse_subopts(config, (char *)co->name, prefix, param, flags);
|
2012-05-07 23:10:39 +00:00
|
|
|
}
|
2011-07-05 19:31:44 +00:00
|
|
|
|
2014-05-18 16:57:02 +00:00
|
|
|
r = m_option_parse(config->log, co->opt, name, param, set ? co->data : NULL);
|
|
|
|
|
|
|
|
if (r >= 0 && set && (flags & M_SETOPT_FROM_CMDLINE))
|
|
|
|
handle_set_from_cmdline(config, co);
|
2013-10-25 20:52:54 +00:00
|
|
|
|
|
|
|
return r;
|
2002-11-12 01:56:42 +00:00
|
|
|
}
|
|
|
|
|
2013-08-02 15:06:43 +00:00
|
|
|
static int parse_subopts(struct m_config *config, char *name, char *prefix,
|
|
|
|
struct bstr param, int flags)
|
2012-05-17 00:31:11 +00:00
|
|
|
{
|
|
|
|
char **lst = NULL;
|
|
|
|
// Split the argument into child options
|
2013-12-21 18:45:42 +00:00
|
|
|
int r = m_option_type_subconfig.parse(config->log, NULL, bstr0(""), param, &lst);
|
2012-05-17 00:31:11 +00:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
// Parse the child options
|
|
|
|
for (int i = 0; lst && lst[2 * i]; i++) {
|
|
|
|
// Build the full name
|
|
|
|
char n[110];
|
|
|
|
if (snprintf(n, 110, "%s%s", prefix, lst[2 * i]) > 100)
|
|
|
|
abort();
|
2013-08-02 15:06:43 +00:00
|
|
|
r = m_config_parse_option(config,bstr0(n), bstr0(lst[2 * i + 1]), flags);
|
2012-09-21 07:22:25 +00:00
|
|
|
if (r < 0) {
|
|
|
|
if (r > M_OPT_EXIT) {
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_ERR(config, "Error parsing suboption %s/%s (%s)\n",
|
|
|
|
name, lst[2 * i], m_option_strerror(r));
|
2012-05-17 00:31:11 +00:00
|
|
|
r = M_OPT_INVALID;
|
2012-09-21 07:22:25 +00:00
|
|
|
}
|
2012-05-17 00:31:11 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
talloc_free(lst);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2012-09-21 07:22:25 +00:00
|
|
|
int m_config_parse_suboptions(struct m_config *config, char *name,
|
|
|
|
char *subopts)
|
2011-07-05 19:31:44 +00:00
|
|
|
{
|
2012-09-21 07:22:25 +00:00
|
|
|
if (!subopts || !*subopts)
|
|
|
|
return 0;
|
2013-08-02 15:06:43 +00:00
|
|
|
int r = parse_subopts(config, name, "", bstr0(subopts), 0);
|
2012-09-21 07:22:25 +00:00
|
|
|
if (r < 0 && r > M_OPT_EXIT) {
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_ERR(config, "Error parsing suboption %s (%s)\n",
|
|
|
|
name, m_option_strerror(r));
|
2012-09-21 07:22:25 +00:00
|
|
|
r = M_OPT_INVALID;
|
|
|
|
}
|
|
|
|
return r;
|
2002-11-12 01:56:42 +00:00
|
|
|
}
|
|
|
|
|
2012-09-21 07:22:25 +00:00
|
|
|
int m_config_set_option_ext(struct m_config *config, struct bstr name,
|
|
|
|
struct bstr param, int flags)
|
2011-07-05 19:31:44 +00:00
|
|
|
{
|
2013-08-02 15:06:43 +00:00
|
|
|
int r = m_config_parse_option(config, name, param, flags);
|
2012-09-21 07:22:25 +00:00
|
|
|
if (r < 0 && r > M_OPT_EXIT) {
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_ERR(config, "Error parsing option %.*s (%s)\n",
|
|
|
|
BSTR_P(name), m_option_strerror(r));
|
2012-09-21 07:22:25 +00:00
|
|
|
r = M_OPT_INVALID;
|
2011-07-05 19:31:44 +00:00
|
|
|
}
|
|
|
|
return r;
|
2002-11-12 01:56:42 +00:00
|
|
|
}
|
|
|
|
|
2012-09-21 07:22:25 +00:00
|
|
|
int m_config_set_option(struct m_config *config, struct bstr name,
|
|
|
|
struct bstr param)
|
2012-05-17 00:31:11 +00:00
|
|
|
{
|
2012-09-21 07:22:25 +00:00
|
|
|
return m_config_set_option_ext(config, name, param, 0);
|
2012-05-17 00:31:11 +00:00
|
|
|
}
|
|
|
|
|
2014-02-24 19:39:51 +00:00
|
|
|
int m_config_set_option_node(struct m_config *config, bstr name,
|
2014-05-18 16:57:02 +00:00
|
|
|
struct mpv_node *data, int flags)
|
2014-02-24 19:39:51 +00:00
|
|
|
{
|
client API: make mpv_set_option set options natively
This should fix some issues, such as not being able to set the
"no-video" option with MPV_FORMAT_FLAG.
Note that this changes semantics a bit. Now setting an option strictly
overwrite it, even if the corresponding command line option does not.
For example, if we change --sub to append by default, then setting the
"sub" option via the client API would still never append. (Oddly, this
also applies to --vf-add, which will overwrite the old value when using
the client API.)
I'm doing this because there's no proper separation between the command
line parser and setting an option using the MPV_FORMAT_STRING format.
Maybe the solution to this mess would be adding format aware code (i.e.
m_option_set_node) to every option type, and falling back to strings
only if needed - but this would mean that you couldn't set e.g. an
integer option using MPV_FORMAT_STRING, which doesn't seem to be ideal
either.
In conclusion, the current approach seems to be most robust, but I'm
open to suggestions should someone find that these semantics are a
problem.
2014-04-21 21:52:14 +00:00
|
|
|
struct m_config_option *co = m_config_get_co(config, name);
|
|
|
|
if (!co)
|
|
|
|
return M_OPT_UNKNOWN;
|
|
|
|
|
2014-02-24 19:39:51 +00:00
|
|
|
int r;
|
client API: make mpv_set_option set options natively
This should fix some issues, such as not being able to set the
"no-video" option with MPV_FORMAT_FLAG.
Note that this changes semantics a bit. Now setting an option strictly
overwrite it, even if the corresponding command line option does not.
For example, if we change --sub to append by default, then setting the
"sub" option via the client API would still never append. (Oddly, this
also applies to --vf-add, which will overwrite the old value when using
the client API.)
I'm doing this because there's no proper separation between the command
line parser and setting an option using the MPV_FORMAT_STRING format.
Maybe the solution to this mess would be adding format aware code (i.e.
m_option_set_node) to every option type, and falling back to strings
only if needed - but this would mean that you couldn't set e.g. an
integer option using MPV_FORMAT_STRING, which doesn't seem to be ideal
either.
In conclusion, the current approach seems to be most robust, but I'm
open to suggestions should someone find that these semantics are a
problem.
2014-04-21 21:52:14 +00:00
|
|
|
|
|
|
|
// Do this on an "empty" type to make setting the option strictly overwrite
|
|
|
|
// the old value, as opposed to e.g. appending to lists.
|
|
|
|
union m_option_value val = {0};
|
|
|
|
|
|
|
|
if (data->format == MPV_FORMAT_STRING) {
|
|
|
|
bstr param = bstr0(data->u.string);
|
|
|
|
r = m_option_parse(mp_null_log, co->opt, name, param, &val);
|
2014-02-24 19:39:51 +00:00
|
|
|
} else {
|
client API: make mpv_set_option set options natively
This should fix some issues, such as not being able to set the
"no-video" option with MPV_FORMAT_FLAG.
Note that this changes semantics a bit. Now setting an option strictly
overwrite it, even if the corresponding command line option does not.
For example, if we change --sub to append by default, then setting the
"sub" option via the client API would still never append. (Oddly, this
also applies to --vf-add, which will overwrite the old value when using
the client API.)
I'm doing this because there's no proper separation between the command
line parser and setting an option using the MPV_FORMAT_STRING format.
Maybe the solution to this mess would be adding format aware code (i.e.
m_option_set_node) to every option type, and falling back to strings
only if needed - but this would mean that you couldn't set e.g. an
integer option using MPV_FORMAT_STRING, which doesn't seem to be ideal
either.
In conclusion, the current approach seems to be most robust, but I'm
open to suggestions should someone find that these semantics are a
problem.
2014-04-21 21:52:14 +00:00
|
|
|
r = m_option_set_node(co->opt, &val, data);
|
2014-02-24 19:39:51 +00:00
|
|
|
}
|
client API: make mpv_set_option set options natively
This should fix some issues, such as not being able to set the
"no-video" option with MPV_FORMAT_FLAG.
Note that this changes semantics a bit. Now setting an option strictly
overwrite it, even if the corresponding command line option does not.
For example, if we change --sub to append by default, then setting the
"sub" option via the client API would still never append. (Oddly, this
also applies to --vf-add, which will overwrite the old value when using
the client API.)
I'm doing this because there's no proper separation between the command
line parser and setting an option using the MPV_FORMAT_STRING format.
Maybe the solution to this mess would be adding format aware code (i.e.
m_option_set_node) to every option type, and falling back to strings
only if needed - but this would mean that you couldn't set e.g. an
integer option using MPV_FORMAT_STRING, which doesn't seem to be ideal
either.
In conclusion, the current approach seems to be most robust, but I'm
open to suggestions should someone find that these semantics are a
problem.
2014-04-21 21:52:14 +00:00
|
|
|
|
|
|
|
if (r >= 0)
|
2014-05-18 16:57:02 +00:00
|
|
|
r = m_config_set_option_raw(config, co, &val, flags);
|
client API: make mpv_set_option set options natively
This should fix some issues, such as not being able to set the
"no-video" option with MPV_FORMAT_FLAG.
Note that this changes semantics a bit. Now setting an option strictly
overwrite it, even if the corresponding command line option does not.
For example, if we change --sub to append by default, then setting the
"sub" option via the client API would still never append. (Oddly, this
also applies to --vf-add, which will overwrite the old value when using
the client API.)
I'm doing this because there's no proper separation between the command
line parser and setting an option using the MPV_FORMAT_STRING format.
Maybe the solution to this mess would be adding format aware code (i.e.
m_option_set_node) to every option type, and falling back to strings
only if needed - but this would mean that you couldn't set e.g. an
integer option using MPV_FORMAT_STRING, which doesn't seem to be ideal
either.
In conclusion, the current approach seems to be most robust, but I'm
open to suggestions should someone find that these semantics are a
problem.
2014-04-21 21:52:14 +00:00
|
|
|
|
2015-02-16 19:04:31 +00:00
|
|
|
if (mp_msg_test(config->log, MSGL_V)) {
|
|
|
|
char *s = m_option_type_node.print(NULL, data);
|
|
|
|
MP_VERBOSE(config, "Setting option '%.*s' = %s (flags = %d) -> %d\n",
|
|
|
|
BSTR_P(name), s ? s : "?", flags, r);
|
|
|
|
talloc_free(s);
|
|
|
|
}
|
|
|
|
|
client API: make mpv_set_option set options natively
This should fix some issues, such as not being able to set the
"no-video" option with MPV_FORMAT_FLAG.
Note that this changes semantics a bit. Now setting an option strictly
overwrite it, even if the corresponding command line option does not.
For example, if we change --sub to append by default, then setting the
"sub" option via the client API would still never append. (Oddly, this
also applies to --vf-add, which will overwrite the old value when using
the client API.)
I'm doing this because there's no proper separation between the command
line parser and setting an option using the MPV_FORMAT_STRING format.
Maybe the solution to this mess would be adding format aware code (i.e.
m_option_set_node) to every option type, and falling back to strings
only if needed - but this would mean that you couldn't set e.g. an
integer option using MPV_FORMAT_STRING, which doesn't seem to be ideal
either.
In conclusion, the current approach seems to be most robust, but I'm
open to suggestions should someone find that these semantics are a
problem.
2014-04-21 21:52:14 +00:00
|
|
|
m_option_free(co->opt, &val);
|
2014-02-24 19:39:51 +00:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2011-07-05 19:31:44 +00:00
|
|
|
const struct m_option *m_config_get_option(const struct m_config *config,
|
2011-07-28 08:07:47 +00:00
|
|
|
struct bstr name)
|
2011-07-05 19:31:44 +00:00
|
|
|
{
|
|
|
|
assert(config != NULL);
|
2002-11-12 01:56:42 +00:00
|
|
|
|
2013-10-24 17:10:10 +00:00
|
|
|
struct m_config_option *co = m_config_get_co(config, name);
|
|
|
|
return co ? co->opt : NULL;
|
2002-11-12 01:56:42 +00:00
|
|
|
}
|
|
|
|
|
options: change handling of "no-" options yet again
Commit 4a40eed "options: change handling of "no-" options" generally
improved the handling of automatically added negation options
(recognizing "--no-opt", even though only "--opt" is declared in the
option list).
Unfortunately, one corner case was missed, which broke the option
"--input=no-default-bindings" (other suboptions, e.g. VO suboptions,
were not affected, and this is the only option where this mattered).
Instead of increasing the complexity further, use a completely different
approach: add the "--no-" options at runtime, and make them behave like
real options. This approach could be considered slightly less elegant,
because the code now has to worry about some option implementation
details rather than leaving it to the parser, but all in all the new
code is simpler and there are less weird corner cases to worry about.
2013-02-16 18:57:57 +00:00
|
|
|
int m_config_option_requires_param(struct m_config *config, bstr name)
|
2012-09-20 01:32:01 +00:00
|
|
|
{
|
options: change handling of "no-" options yet again
Commit 4a40eed "options: change handling of "no-" options" generally
improved the handling of automatically added negation options
(recognizing "--no-opt", even though only "--opt" is declared in the
option list).
Unfortunately, one corner case was missed, which broke the option
"--input=no-default-bindings" (other suboptions, e.g. VO suboptions,
were not affected, and this is the only option where this mattered).
Instead of increasing the complexity further, use a completely different
approach: add the "--no-" options at runtime, and make them behave like
real options. This approach could be considered slightly less elegant,
because the code now has to worry about some option implementation
details rather than leaving it to the parser, but all in all the new
code is simpler and there are less weird corner cases to worry about.
2013-02-16 18:57:57 +00:00
|
|
|
const struct m_option *opt = m_config_get_option(config, name);
|
2012-09-21 07:22:25 +00:00
|
|
|
if (opt) {
|
options: change handling of "no-" options yet again
Commit 4a40eed "options: change handling of "no-" options" generally
improved the handling of automatically added negation options
(recognizing "--no-opt", even though only "--opt" is declared in the
option list).
Unfortunately, one corner case was missed, which broke the option
"--input=no-default-bindings" (other suboptions, e.g. VO suboptions,
were not affected, and this is the only option where this mattered).
Instead of increasing the complexity further, use a completely different
approach: add the "--no-" options at runtime, and make them behave like
real options. This approach could be considered slightly less elegant,
because the code now has to worry about some option implementation
details rather than leaving it to the parser, but all in all the new
code is simpler and there are less weird corner cases to worry about.
2013-02-16 18:57:57 +00:00
|
|
|
if (bstr_endswith0(name, "-clr"))
|
|
|
|
return 0;
|
2013-04-21 01:18:32 +00:00
|
|
|
return m_option_required_params(opt);
|
2012-09-21 07:22:25 +00:00
|
|
|
}
|
options: change handling of "no-" options yet again
Commit 4a40eed "options: change handling of "no-" options" generally
improved the handling of automatically added negation options
(recognizing "--no-opt", even though only "--opt" is declared in the
option list).
Unfortunately, one corner case was missed, which broke the option
"--input=no-default-bindings" (other suboptions, e.g. VO suboptions,
were not affected, and this is the only option where this mattered).
Instead of increasing the complexity further, use a completely different
approach: add the "--no-" options at runtime, and make them behave like
real options. This approach could be considered slightly less elegant,
because the code now has to worry about some option implementation
details rather than leaving it to the parser, but all in all the new
code is simpler and there are less weird corner cases to worry about.
2013-02-16 18:57:57 +00:00
|
|
|
return M_OPT_UNKNOWN;
|
2012-09-20 01:32:01 +00:00
|
|
|
}
|
|
|
|
|
2014-04-10 23:39:30 +00:00
|
|
|
static int sort_opt_compare(const void *pa, const void *pb)
|
|
|
|
{
|
|
|
|
const struct m_config_option *a = pa;
|
|
|
|
const struct m_config_option *b = pb;
|
|
|
|
return strcasecmp(a->name, b->name);
|
|
|
|
}
|
|
|
|
|
2011-07-05 19:31:44 +00:00
|
|
|
void m_config_print_option_list(const struct m_config *config)
|
|
|
|
{
|
|
|
|
char min[50], max[50];
|
|
|
|
int count = 0;
|
2013-11-23 20:35:03 +00:00
|
|
|
const char *prefix = config->is_toplevel ? "--" : "";
|
2002-11-12 01:56:42 +00:00
|
|
|
|
2014-04-10 23:39:30 +00:00
|
|
|
struct m_config_option *sorted =
|
|
|
|
talloc_memdup(NULL, config->opts, config->num_opts * sizeof(sorted[0]));
|
2014-04-12 09:38:00 +00:00
|
|
|
if (config->is_toplevel)
|
|
|
|
qsort(sorted, config->num_opts, sizeof(sorted[0]), sort_opt_compare);
|
2014-04-10 23:39:30 +00:00
|
|
|
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, "Options:\n\n");
|
2013-10-24 18:00:00 +00:00
|
|
|
for (int i = 0; i < config->num_opts; i++) {
|
2014-04-10 23:39:30 +00:00
|
|
|
struct m_config_option *co = &sorted[i];
|
2011-07-05 19:31:44 +00:00
|
|
|
const struct m_option *opt = co->opt;
|
|
|
|
if (opt->type->flags & M_OPT_TYPE_HAS_CHILD)
|
|
|
|
continue;
|
2013-07-27 19:30:00 +00:00
|
|
|
if (co->is_generated)
|
|
|
|
continue;
|
2015-01-24 23:36:40 +00:00
|
|
|
if (opt->type == &m_option_type_alias ||
|
|
|
|
opt->type == &m_option_type_removed)
|
|
|
|
continue;
|
2015-01-06 06:01:07 +00:00
|
|
|
MP_INFO(config, " %s%-30s", prefix, co->name);
|
2013-07-21 18:16:46 +00:00
|
|
|
if (opt->type == &m_option_type_choice) {
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, " Choices:");
|
2013-07-21 18:16:46 +00:00
|
|
|
struct m_opt_choice_alternatives *alt = opt->priv;
|
|
|
|
for (int n = 0; alt[n].name; n++)
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, " %s", alt[n].name);
|
2013-07-21 18:16:46 +00:00
|
|
|
if (opt->flags & (M_OPT_MIN | M_OPT_MAX))
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, " (or an integer)");
|
2013-07-21 18:16:46 +00:00
|
|
|
} else {
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, " %s", co->opt->type->name);
|
2013-07-21 18:16:46 +00:00
|
|
|
}
|
|
|
|
if (opt->flags & (M_OPT_MIN | M_OPT_MAX)) {
|
|
|
|
snprintf(min, sizeof(min), "any");
|
|
|
|
snprintf(max, sizeof(max), "any");
|
|
|
|
if (opt->flags & M_OPT_MIN)
|
2013-07-27 19:31:04 +00:00
|
|
|
snprintf(min, sizeof(min), "%.14g", opt->min);
|
2013-07-21 18:16:46 +00:00
|
|
|
if (opt->flags & M_OPT_MAX)
|
2013-07-27 19:31:04 +00:00
|
|
|
snprintf(max, sizeof(max), "%.14g", opt->max);
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, " (%s to %s)", min, max);
|
2013-07-21 18:16:46 +00:00
|
|
|
}
|
2013-10-24 20:20:16 +00:00
|
|
|
char *def = NULL;
|
|
|
|
if (co->default_data)
|
|
|
|
def = m_option_print(co->opt, co->default_data);
|
2013-07-27 19:27:08 +00:00
|
|
|
if (def) {
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, " (default: %s)", def);
|
2013-07-27 19:27:08 +00:00
|
|
|
talloc_free(def);
|
|
|
|
}
|
2014-02-26 19:40:28 +00:00
|
|
|
if (opt->flags & M_OPT_GLOBAL)
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, " [global]");
|
2014-02-26 19:40:28 +00:00
|
|
|
if (opt->flags & M_OPT_NOCFG)
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, " [nocfg]");
|
2014-08-13 21:24:46 +00:00
|
|
|
if (opt->flags & M_OPT_FILE)
|
|
|
|
MP_INFO(config, " [file]");
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, "\n");
|
2011-07-05 19:31:44 +00:00
|
|
|
count++;
|
|
|
|
}
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_INFO(config, "\nTotal: %d options\n", count);
|
2014-04-10 23:39:30 +00:00
|
|
|
talloc_free(sorted);
|
2002-11-12 01:56:42 +00:00
|
|
|
}
|
2006-01-24 11:16:13 +00:00
|
|
|
|
2014-02-24 20:18:53 +00:00
|
|
|
char **m_config_list_options(void *ta_parent, const struct m_config *config)
|
|
|
|
{
|
|
|
|
char **list = talloc_new(ta_parent);
|
|
|
|
int count = 0;
|
|
|
|
for (int i = 0; i < config->num_opts; i++) {
|
|
|
|
struct m_config_option *co = &config->opts[i];
|
|
|
|
const struct m_option *opt = co->opt;
|
|
|
|
if (opt->type->flags & M_OPT_TYPE_HAS_CHILD)
|
|
|
|
continue;
|
|
|
|
if (co->is_generated)
|
|
|
|
continue;
|
|
|
|
// For use with CONF_TYPE_STRING_LIST, it's important not to set list
|
|
|
|
// as allocation parent.
|
|
|
|
char *s = talloc_strdup(ta_parent, co->name);
|
|
|
|
MP_TARRAY_APPEND(ta_parent, list, count, s);
|
|
|
|
}
|
|
|
|
MP_TARRAY_APPEND(ta_parent, list, count, NULL);
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
2013-07-27 19:26:00 +00:00
|
|
|
struct m_profile *m_config_get_profile(const struct m_config *config, bstr name)
|
2011-07-05 19:31:44 +00:00
|
|
|
{
|
2013-07-27 19:26:00 +00:00
|
|
|
for (struct m_profile *p = config->profiles; p; p = p->next) {
|
|
|
|
if (bstr_equals0(name, p->name))
|
2011-07-05 19:31:44 +00:00
|
|
|
return p;
|
2013-07-27 19:26:00 +00:00
|
|
|
}
|
2011-07-05 19:31:44 +00:00
|
|
|
return NULL;
|
2006-01-24 11:16:13 +00:00
|
|
|
}
|
|
|
|
|
2013-07-27 19:26:00 +00:00
|
|
|
struct m_profile *m_config_get_profile0(const struct m_config *config,
|
|
|
|
char *name)
|
|
|
|
{
|
|
|
|
return m_config_get_profile(config, bstr0(name));
|
|
|
|
}
|
|
|
|
|
2011-07-05 19:31:44 +00:00
|
|
|
struct m_profile *m_config_add_profile(struct m_config *config, char *name)
|
|
|
|
{
|
2014-04-19 20:05:17 +00:00
|
|
|
if (!name || !name[0] || strcmp(name, "default") == 0)
|
|
|
|
return NULL; // never a real profile
|
2013-07-27 19:26:00 +00:00
|
|
|
struct m_profile *p = m_config_get_profile0(config, name);
|
2011-07-05 19:31:44 +00:00
|
|
|
if (p)
|
|
|
|
return p;
|
|
|
|
p = talloc_zero(config, struct m_profile);
|
|
|
|
p->name = talloc_strdup(p, name);
|
|
|
|
p->next = config->profiles;
|
|
|
|
config->profiles = p;
|
|
|
|
return p;
|
2006-01-24 11:16:13 +00:00
|
|
|
}
|
|
|
|
|
2013-10-14 21:37:58 +00:00
|
|
|
void m_profile_set_desc(struct m_profile *p, bstr desc)
|
2011-07-05 19:31:44 +00:00
|
|
|
{
|
2008-04-25 12:59:30 +00:00
|
|
|
talloc_free(p->desc);
|
2013-10-14 21:37:58 +00:00
|
|
|
p->desc = bstrdup0(p, desc);
|
2006-01-24 11:16:13 +00:00
|
|
|
}
|
|
|
|
|
2011-07-05 19:31:44 +00:00
|
|
|
int m_config_set_profile_option(struct m_config *config, struct m_profile *p,
|
2012-09-21 07:22:25 +00:00
|
|
|
bstr name, bstr val)
|
2011-07-05 19:31:44 +00:00
|
|
|
{
|
2012-09-21 07:22:25 +00:00
|
|
|
int i = m_config_set_option_ext(config, name, val,
|
|
|
|
M_SETOPT_CHECK_ONLY |
|
|
|
|
M_SETOPT_FROM_CONFIG_FILE);
|
2011-07-05 19:31:44 +00:00
|
|
|
if (i < 0)
|
|
|
|
return i;
|
|
|
|
p->opts = talloc_realloc(p, p->opts, char *, 2 * (p->num_opts + 2));
|
2012-09-21 07:22:25 +00:00
|
|
|
p->opts[p->num_opts * 2] = bstrdup0(p, name);
|
|
|
|
p->opts[p->num_opts * 2 + 1] = bstrdup0(p, val);
|
2011-07-05 19:31:44 +00:00
|
|
|
p->num_opts++;
|
|
|
|
p->opts[p->num_opts * 2] = p->opts[p->num_opts * 2 + 1] = NULL;
|
|
|
|
return 1;
|
2006-01-24 11:16:13 +00:00
|
|
|
}
|
|
|
|
|
2013-08-02 15:59:43 +00:00
|
|
|
void m_config_set_profile(struct m_config *config, struct m_profile *p,
|
|
|
|
int flags)
|
2011-07-05 19:31:44 +00:00
|
|
|
{
|
|
|
|
if (config->profile_depth > MAX_PROFILE_DEPTH) {
|
2013-12-21 18:45:42 +00:00
|
|
|
MP_WARN(config, "WARNING: Profile inclusion too deep.\n");
|
2011-07-05 19:31:44 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
config->profile_depth++;
|
2012-09-21 07:22:25 +00:00
|
|
|
for (int i = 0; i < p->num_opts; i++) {
|
|
|
|
m_config_set_option_ext(config,
|
|
|
|
bstr0(p->opts[2 * i]),
|
|
|
|
bstr0(p->opts[2 * i + 1]),
|
2013-08-02 15:59:43 +00:00
|
|
|
flags | M_SETOPT_FROM_CONFIG_FILE);
|
2012-09-21 07:22:25 +00:00
|
|
|
}
|
2011-07-05 19:31:44 +00:00
|
|
|
config->profile_depth--;
|
2006-01-24 11:16:13 +00:00
|
|
|
}
|
2012-08-06 15:45:17 +00:00
|
|
|
|
2013-11-01 16:33:11 +00:00
|
|
|
void *m_config_alloc_struct(void *talloc_ctx,
|
2012-08-06 15:45:17 +00:00
|
|
|
const struct m_sub_options *subopts)
|
|
|
|
{
|
2013-11-01 16:33:11 +00:00
|
|
|
void *substruct = talloc_zero_size(talloc_ctx, subopts->size);
|
2012-08-06 15:45:17 +00:00
|
|
|
if (subopts->defaults)
|
|
|
|
memcpy(substruct, subopts->defaults, subopts->size);
|
|
|
|
return substruct;
|
|
|
|
}
|
2014-05-05 21:53:06 +00:00
|
|
|
|
2014-06-09 21:46:53 +00:00
|
|
|
struct dtor_info {
|
|
|
|
const struct m_sub_options *opts;
|
|
|
|
void *ptr;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void free_substruct(void *ptr)
|
|
|
|
{
|
|
|
|
struct dtor_info *d = ptr;
|
|
|
|
for (int n = 0; d->opts->opts && d->opts->opts[n].type; n++) {
|
|
|
|
const struct m_option *opt = &d->opts->opts[n];
|
|
|
|
void *dst = (char *)d->ptr + opt->offset;
|
|
|
|
m_option_free(opt, dst);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void *m_sub_options_copy(void *talloc_ctx, const struct m_sub_options *opts,
|
|
|
|
const void *ptr)
|
|
|
|
{
|
|
|
|
void *new = talloc_zero_size(talloc_ctx, opts->size);
|
|
|
|
struct dtor_info *dtor = talloc_ptrtype(new, dtor);
|
|
|
|
*dtor = (struct dtor_info){opts, new};
|
|
|
|
talloc_set_destructor(dtor, free_substruct);
|
|
|
|
// also fill/initialize members not described by opts
|
|
|
|
if (opts->defaults)
|
|
|
|
memcpy(new, opts->defaults, opts->size);
|
|
|
|
for (int n = 0; opts->opts && opts->opts[n].type; n++) {
|
|
|
|
const struct m_option *opt = &opts->opts[n];
|
|
|
|
// not implemented, because it adds lots of complexity
|
|
|
|
assert(!(opt->type->flags & M_OPT_TYPE_HAS_CHILD));
|
|
|
|
void *src = (char *)ptr + opt->offset;
|
|
|
|
void *dst = (char *)new + opt->offset;
|
|
|
|
memset(dst, 0, opt->type->size);
|
|
|
|
m_option_copy(opt, dst, src);
|
|
|
|
}
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
2014-10-06 19:20:10 +00:00
|
|
|
struct m_config *m_config_dup(void *talloc_ctx, struct m_config *config)
|
|
|
|
{
|
|
|
|
struct m_config *new = m_config_new(talloc_ctx, config->log, config->size,
|
|
|
|
config->defaults, config->options);
|
|
|
|
assert(new->num_opts == config->num_opts);
|
|
|
|
for (int n = 0; n < new->num_opts; n++) {
|
|
|
|
assert(new->opts[n].opt->type == config->opts[n].opt->type);
|
|
|
|
m_option_copy(new->opts[n].opt, new->opts[n].data, config->opts[n].data);
|
|
|
|
}
|
|
|
|
return new;
|
|
|
|
}
|