summaryrefslogtreecommitdiffstats
path: root/core/mplayer.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-02-16 22:14:33 +0100
committerwm4 <wm4@nowhere>2013-02-16 22:31:29 +0100
commit6b3e7740f1d6aa22ac518d53a77cae0b010ef04e (patch)
tree76ae4776b29261b399098f448c6d2b5b36a93aa2 /core/mplayer.c
parentbd835cdeeaa50295f0cf7aad65a48da462231b66 (diff)
downloadmpv-6b3e7740f1d6aa22ac518d53a77cae0b010ef04e.tar.bz2
mpv-6b3e7740f1d6aa22ac518d53a77cae0b010ef04e.tar.xz
osd: add --osd-status-msg option for custom OSD status
Diffstat (limited to 'core/mplayer.c')
-rw-r--r--core/mplayer.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index 9eb81115fc..e873410aa5 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -1437,11 +1437,18 @@ static void sadd_osd_status(char **buffer, struct MPContext *mpctx, bool full)
}
}
saddf_osd_function_sym(buffer, sym);
- sadd_hhmmssff(buffer, get_current_time(mpctx), fractions);
- if (full) {
- saddf(buffer, " / ");
- sadd_hhmmssff(buffer, get_time_length(mpctx), fractions);
- sadd_percentage(buffer, get_percent_pos(mpctx));
+ char *custom_msg = mpctx->opts.osd_status_msg;
+ if (custom_msg && full) {
+ char *text = mp_property_expand_string(mpctx, custom_msg);
+ *buffer = talloc_strdup_append(*buffer, text);
+ talloc_free(text);
+ } else {
+ sadd_hhmmssff(buffer, get_current_time(mpctx), fractions);
+ if (full) {
+ saddf(buffer, " / ");
+ sadd_hhmmssff(buffer, get_time_length(mpctx), fractions);
+ sadd_percentage(buffer, get_percent_pos(mpctx));
+ }
}
}