summaryrefslogtreecommitdiffstats
path: root/mpvcore/m_property.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-09-20 23:33:38 +0200
committerwm4 <wm4@nowhere>2013-09-21 00:07:42 +0200
commit897d4b58a175bb4383b9df0ff59d908c63a372b4 (patch)
treedd3708c2331d0eca4a37297996c64936ed88f24f /mpvcore/m_property.c
parentf988c6300344492c4a8d8db11c47a4ebed4e858b (diff)
downloadmpv-897d4b58a175bb4383b9df0ff59d908c63a372b4.tar.bz2
mpv-897d4b58a175bb4383b9df0ff59d908c63a372b4.tar.xz
command: when changing a property, allow showing an extra OSD message
This is for properties that normally show a bar, and thus do not show an OSD message (as per classic mplayer behavior). Setting an extra_msg allows showing an OSD message anyway, except if OSD messages are explicitly suppressed. This refactors the whole show_property_osd() function a bit, and replaces the weird sep field with a more general method.
Diffstat (limited to 'mpvcore/m_property.c')
-rw-r--r--mpvcore/m_property.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mpvcore/m_property.c b/mpvcore/m_property.c
index 6e25bf4e43..4ae33c9d1e 100644
--- a/mpvcore/m_property.c
+++ b/mpvcore/m_property.c
@@ -245,8 +245,8 @@ static int expand_property(const m_option_t *prop_list, char **ret, int *ret_len
return skip;
}
-char *m_properties_expand_string(const m_option_t *prop_list, char *str0,
- void *ctx)
+char *m_properties_expand_string(const m_option_t *prop_list,
+ const char *str0, void *ctx)
{
char *ret = NULL;
int ret_len = 0;