summaryrefslogtreecommitdiffstats
path: root/player/command.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-21 19:36:33 +0100
committerwm4 <wm4@nowhere>2013-12-21 21:04:21 +0100
commita2d144fc8f146f96e4fe97b1b2c15828e24f8494 (patch)
tree669fa5944dc2be0e829139fb63794474f7b39f14 /player/command.c
parented71606e65e697ea6bc9fc78caf2dd4089dc0aeb (diff)
downloadmpv-a2d144fc8f146f96e4fe97b1b2c15828e24f8494.tar.bz2
mpv-a2d144fc8f146f96e4fe97b1b2c15828e24f8494.tar.xz
m_property: mp_msg conversions
Includes some semi-crappy hacks to avoid changing too much code for this conversion (allowing NULL log argument for m_property_do()).
Diffstat (limited to 'player/command.c')
-rw-r--r--player/command.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/player/command.c b/player/command.c
index 9247887c31..9951eb1293 100644
--- a/player/command.c
+++ b/player/command.c
@@ -2040,7 +2040,7 @@ const struct m_option *mp_get_property_list(void)
int mp_property_do(const char *name, int action, void *val,
struct MPContext *ctx)
{
- return m_property_do(mp_properties, name, action, val, ctx);
+ return m_property_do(ctx->log, mp_properties, name, action, val, ctx);
}
char *mp_property_expand_string(struct MPContext *mpctx, const char *str)
@@ -2048,9 +2048,9 @@ char *mp_property_expand_string(struct MPContext *mpctx, const char *str)
return m_properties_expand_string(mp_properties, str, mpctx);
}
-void property_print_help(void)
+void property_print_help(struct mp_log *log)
{
- m_properties_print_help_list(mp_properties);
+ m_properties_print_help_list(log, mp_properties);
}