diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
| commit | 0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2 (patch) | |
| tree | b70f214f8c3fc802d6d6edbf8395273c854ac0fd /options/parse_commandline.h | |
| parent | a4fe95b0d8d339ba5afbdb5346ad8fd367a4a1c1 (diff) | |
| parent | 245e5b844177e9ad9a9c07eff5efab7c3fccdebc (diff) | |
| download | mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.bz2 mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.xz | |
Merge branch 'msg_refactor'
This branch changes mp_msg() so that it doesn't require global context.
The changes are pretty violent.
Diffstat (limited to 'options/parse_commandline.h')
| -rw-r--r-- | options/parse_commandline.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/options/parse_commandline.h b/options/parse_commandline.h index 256bc514b2..39512ca51a 100644 --- a/options/parse_commandline.h +++ b/options/parse_commandline.h @@ -23,11 +23,12 @@ struct playlist; struct m_config; +struct mpv_global; -int m_config_parse_mp_command_line(struct m_config *config, - struct playlist *files, +int m_config_parse_mp_command_line(m_config_t *config, struct playlist *files, + struct mpv_global *global, int argc, char **argv); -void m_config_preparse_command_line(struct m_config *config, +void m_config_preparse_command_line(m_config_t *config, struct mpv_global *global, int argc, char **argv); #endif /* MPLAYER_PARSER_MPCMD_H */ |