From a2d144fc8f146f96e4fe97b1b2c15828e24f8494 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 21 Dec 2013 19:36:33 +0100
Subject: 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()).
---
 player/command.c | 6 +++---
 player/command.h | 3 ++-
 player/main.c    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'player')

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);
 }
 
 
diff --git a/player/command.h b/player/command.h
index d3469fc131..56eb30f859 100644
--- a/player/command.h
+++ b/player/command.h
@@ -21,13 +21,14 @@
 
 struct MPContext;
 struct mp_cmd;
+struct mp_log;
 
 void command_init(struct MPContext *mpctx);
 void command_uninit(struct MPContext *mpctx);
 
 void run_command(struct MPContext *mpctx, struct mp_cmd *cmd);
 char *mp_property_expand_string(struct MPContext *mpctx, const char *str);
-void property_print_help(void);
+void property_print_help(struct mp_log *log);
 int mp_property_do(const char* name, int action, void* val,
                    struct MPContext *mpctx);
 
diff --git a/player/main.c b/player/main.c
index dfcc45cf44..056f7c16e5 100644
--- a/player/main.c
+++ b/player/main.c
@@ -223,7 +223,7 @@ static bool handle_help_options(struct MPContext *mpctx)
         opt_exit = 1;
     }
     if (opts->list_properties) {
-        property_print_help();
+        property_print_help(log);
         opt_exit = 1;
     }
 #if HAVE_ENCODING
-- 
cgit v1.2.3