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.

1 files changed, 4 insertions, 5 deletions

diff --git a/mplayer.c b/mplayer.c
index 4e59dd397e..13ce3c5ecc 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2172,10 +2172,9 @@ static void vo_update_window_title(struct MPContext *mpctx)
 {
     if (!mpctx->video_out)
         return;
-    char *title = property_expand_string(mpctx, mpctx->opts.vo_wintitle);
+    char *title = mp_property_expand_string(mpctx, mpctx->opts.vo_wintitle);
     talloc_free(mpctx->video_out->window_title);
-    mpctx->video_out->window_title = talloc_strdup(mpctx->video_out, title);
-    free(title);
+    mpctx->video_out->window_title = talloc_steal(mpctx, title);
 }
 
 int reinit_video_chain(struct MPContext *mpctx)
@@ -3876,9 +3875,9 @@ goto_enable_cache:
 #endif
 
     if (opts->playing_msg) {
-        char *msg = property_expand_string(mpctx, opts->playing_msg);
+        char *msg = mp_property_expand_string(mpctx, opts->playing_msg);
         mp_msg(MSGT_CPLAYER, MSGL_INFO, "%s", msg);
-        free(msg);
+        talloc_free(msg);
     }
 
     // Disable the term OSD in verbose mode