summaryrefslogtreecommitdiffstats
path: root/options/m_property.h
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 /options/m_property.h
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 'options/m_property.h')
-rw-r--r--options/m_property.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/options/m_property.h b/options/m_property.h
index 8398ad321f..ae4b7716b6 100644
--- a/options/m_property.h
+++ b/options/m_property.h
@@ -23,6 +23,7 @@
#include <stdint.h>
struct m_option;
+struct mp_log;
extern const struct m_option_type m_option_type_dummy;
@@ -106,11 +107,12 @@ enum mp_property_return {
// action: one of m_property_action
// ctx: opaque value passed through to property implementation
// returns: one of mp_property_return
-int m_property_do(const struct m_option* prop_list, const char* property_name,
- int action, void* arg, void *ctx);
+int m_property_do(struct mp_log *log, const struct m_option* prop_list,
+ const char* property_name, int action, void* arg, void *ctx);
// Print a list of properties.
-void m_properties_print_help_list(const struct m_option* list);
+void m_properties_print_help_list(struct mp_log *log,
+ const struct m_option* list);
// Expand a property string.
// This function allows to print strings containing property values.