summaryrefslogtreecommitdiffstats
path: root/command.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-23 23:00:54 +0200
committerwm4 <wm4@nowhere>2012-10-12 10:10:32 +0200
commit32c5a87a0131e33e592a2986a8d2d98f2ca963b9 (patch)
treed9917a9fe65b691c2472cf557b1602a8234855b1 /command.h
parentdf2b0f99485e065224af89b910370c394d0ef8d0 (diff)
downloadmpv-32c5a87a0131e33e592a2986a8d2d98f2ca963b9.tar.bz2
mpv-32c5a87a0131e33e592a2986a8d2d98f2ca963b9.tar.xz
commands: change property expansion format string
This affects property format strings like they are used in the "show_text" input command, for --playing-msg, and other places. To quote the documentation comment on m_properties_expand_string(): ${NAME} is expanded to the value of property NAME. If NAME starts with '=', use the raw value of the property. ${NAME:STR} expands to the property, or STR if the property is not available. ${?NAME:STR} expands to STR if the property is available. ${!NAME:STR} expands to STR if the property is not available. STR is recursively expanded using the same rules. "$$" can be used to escape "$", and "$}" to escape "}". "$>" disables parsing of "$" for the rest of the string. Most importantly, "?(property:str)" becomes "${?property:str}". Make the simple fallback case easier, e.g. "${property:fallback}" instead of "${property}?(!property:fallback)". Add the ability to escape the format meta characters. "$" is used for escaping, because escaping with "\" is taken by the commands parser in the layer below. "$>" can be used to disable interpretation of format strings (of course escapes by the commands parser can't be canceled). By default, properties which are unavailable or don't exist are turned into a string signaling the status (e.g. "(unavailable)"), instead of an empty string. If an empty string is desired, this has to be done explicitly: "${property:}" (the fallback part is an empty string). Raw properties still return an empty string on error. m_properties_expand_string() now returns a talloc'ed pointer, instead of a malloc'ed one.
Diffstat (limited to 'command.h')
-rw-r--r--command.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/command.h b/command.h
index df419c8e02..0a339c5705 100644
--- a/command.h
+++ b/command.h
@@ -23,7 +23,7 @@ struct MPContext;
struct mp_cmd;
void run_command(struct MPContext *mpctx, struct mp_cmd *cmd);
-char *property_expand_string(struct MPContext *mpctx, char *str);
+char *mp_property_expand_string(struct MPContext *mpctx, char *str);
void property_print_help(void);
int mp_property_do(const char* name, int action, void* val,
struct MPContext *mpctx);