diff options
| -rw-r--r-- | common/encode_lavc.c | 1 | ||||
| -rw-r--r-- | common/msg.c | 3 | ||||
| -rw-r--r-- | common/msg.h | 12 | ||||
| -rw-r--r-- | common/msg_control.h | 18 | ||||
| -rw-r--r-- | options/m_option.c | 1 | ||||
| -rw-r--r-- | options/parse_commandline.c | 1 | ||||
| -rw-r--r-- | player/command.c | 2 | ||||
| -rw-r--r-- | player/main.c | 1 | ||||
| -rw-r--r-- | player/osd.c | 1 |
9 files changed, 27 insertions, 13 deletions
diff --git a/common/encode_lavc.c b/common/encode_lavc.c index 2cf549e538..39787430bf 100644 --- a/common/encode_lavc.c +++ b/common/encode_lavc.c @@ -25,6 +25,7 @@ #include "encode_lavc.h" #include "common/global.h" #include "common/msg.h" +#include "common/msg_control.h" #include "video/vfcap.h" #include "options/options.h" #include "osdep/timer.h" diff --git a/common/msg.c b/common/msg.c index 32bbe8e89e..7a4b78b266 100644 --- a/common/msg.c +++ b/common/msg.c @@ -34,7 +34,8 @@ #include "osdep/terminal.h" #include "osdep/io.h" -#include "common/msg.h" +#include "msg.h" +#include "msg_control.h" /* maximum message length of mp_msg */ #define MSGSIZE_MAX 6144 diff --git a/common/msg.h b/common/msg.h index 50420c9044..0ca449cb49 100644 --- a/common/msg.h +++ b/common/msg.h @@ -76,16 +76,4 @@ bool mp_msg_test(struct mp_log *log, int lev); #define MP_TRACE(obj, ...) MP_MSG(obj, MSGL_TRACE, __VA_ARGS__) #define MP_SMODE(obj, ...) MP_MSG(obj, MSGL_SMODE, __VA_ARGS__) -struct mpv_global; -void mp_msg_init(struct mpv_global *global); -void mp_msg_uninit(struct mpv_global *global); -void mp_msg_update_msglevels(struct mpv_global *global); -void mp_msg_mute(struct mpv_global *global, bool mute); -void mp_msg_force_stderr(struct mpv_global *global, bool force_stderr); -void mp_msg_flush_status_line(struct mpv_global *global); -bool mp_msg_has_status_line(struct mpv_global *global); - -struct bstr; -int mp_msg_split_msglevel(struct bstr *s, struct bstr *out_mod, int *out_level); - #endif /* MPLAYER_MP_MSG_H */ diff --git a/common/msg_control.h b/common/msg_control.h new file mode 100644 index 0000000000..3ff53971b7 --- /dev/null +++ b/common/msg_control.h @@ -0,0 +1,18 @@ +#ifndef MP_MSG_CONTROL_H +#define MP_MSG_CONTROL_H + +#include <stdbool.h> + +struct mpv_global; +void mp_msg_init(struct mpv_global *global); +void mp_msg_uninit(struct mpv_global *global); +void mp_msg_update_msglevels(struct mpv_global *global); +void mp_msg_mute(struct mpv_global *global, bool mute); +void mp_msg_force_stderr(struct mpv_global *global, bool force_stderr); +void mp_msg_flush_status_line(struct mpv_global *global); +bool mp_msg_has_status_line(struct mpv_global *global); + +struct bstr; +int mp_msg_split_msglevel(struct bstr *s, struct bstr *out_mod, int *out_level); + +#endif diff --git a/options/m_option.c b/options/m_option.c index 7754c830d1..36e0678593 100644 --- a/options/m_option.c +++ b/options/m_option.c @@ -38,6 +38,7 @@ #include "talloc.h" #include "common/common.h" #include "common/msg.h" +#include "common/msg_control.h" #include "m_option.h" #include "m_config.h" diff --git a/options/parse_commandline.c b/options/parse_commandline.c index 11ef85a871..6cd27eb282 100644 --- a/options/parse_commandline.c +++ b/options/parse_commandline.c @@ -27,6 +27,7 @@ #include "common/global.h" #include "common/msg.h" +#include "common/msg_control.h" #include "m_option.h" #include "m_config.h" #include "options.h" diff --git a/player/command.c b/player/command.c index 9761c33176..adcf9daa17 100644 --- a/player/command.c +++ b/player/command.c @@ -30,6 +30,8 @@ #include "config.h" #include "talloc.h" +#include "common/msg.h" +#include "common/msg_control.h" #include "command.h" #include "osdep/timer.h" #include "common/common.h" diff --git a/player/main.c b/player/main.c index 75cad76b80..b23ff3ed5f 100644 --- a/player/main.c +++ b/player/main.c @@ -41,6 +41,7 @@ #include "options/m_property.h" #include "common/common.h" #include "common/msg.h" +#include "common/msg_control.h" #include "common/global.h" #include "options/parse_configfile.h" #include "options/parse_commandline.h" diff --git a/player/osd.c b/player/osd.c index 06253df7ee..6c12f2d16d 100644 --- a/player/osd.c +++ b/player/osd.c @@ -27,6 +27,7 @@ #include "talloc.h" #include "common/msg.h" +#include "common/msg_control.h" #include "options/options.h" #include "common/common.h" #include "options/m_property.h" |