diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
| commit | 5d74fa7dc0fa1617d1d11b69769423b1387ec785 (patch) | |
| tree | 882752015b3500c91b8ab3a4d669696f23feb817 /player/command.h | |
| parent | c226bc7616ab2ae9de6172660e9cf727f07dc374 (diff) | |
| parent | a2fa0d0b68ce200598122145254f56ae1adff91e (diff) | |
| download | mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.bz2 mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'player/command.h')
| -rw-r--r-- | player/command.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/player/command.h b/player/command.h index 9ffa5c1340..27a4d39913 100644 --- a/player/command.h +++ b/player/command.h @@ -24,6 +24,7 @@ struct MPContext; struct mp_cmd; struct mp_log; struct mpv_node; +struct m_config_option; void command_init(struct MPContext *mpctx); void command_uninit(struct MPContext *mpctx); @@ -31,16 +32,19 @@ void command_uninit(struct MPContext *mpctx); int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *res); char *mp_property_expand_string(struct MPContext *mpctx, const char *str); char *mp_property_expand_escaped_string(struct MPContext *mpctx, const char *str); -void property_print_help(struct mp_log *log); +void property_print_help(struct MPContext *mpctx); int mp_property_do(const char* name, int action, void* val, struct MPContext *mpctx); +int mp_on_set_option(void *ctx, struct m_config_option *co, void *data, int flags); +void mp_option_change_callback(void *ctx, struct m_config_option *co, int flags); + void mp_notify(struct MPContext *mpctx, int event, void *arg); void mp_notify_property(struct MPContext *mpctx, const char *property); void handle_command_updates(struct MPContext *mpctx); -int mp_get_property_id(const char *name); +int mp_get_property_id(struct MPContext *mpctx, const char *name); uint64_t mp_get_property_event_mask(const char *name); enum { |