From 4c3f0427775273fe3925f631ea46891af56020aa Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 1 Jan 2015 20:37:49 +0100 Subject: command: make the "run" command work on Windows too Do so by using mp_subprocess(). Although this uses completely different code on Unix too, you shouldn't notice a difference. A less ncie thing is that this reserves an entire thread while the command is running (which wastes some memory for stack, at least). But this is probably still the simplest way, and the fork() trick is apparently not implementable with posix_subprocess(). --- common/msg.c | 5 +++-- common/msg_control.h | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'common') diff --git a/common/msg.c b/common/msg.c index 4a4ad80884..e117589873 100644 --- a/common/msg.c +++ b/common/msg.c @@ -185,10 +185,11 @@ static void flush_status_line(struct mp_log_root *root) root->blank_lines = 0; } -void mp_msg_flush_status_line(struct mpv_global *global) +void mp_msg_flush_status_line(struct mp_log *log) { pthread_mutex_lock(&mp_msg_lock); - flush_status_line(global->log->root); + if (log->root) + flush_status_line(log->root); pthread_mutex_unlock(&mp_msg_lock); } diff --git a/common/msg_control.h b/common/msg_control.h index b0ceef01df..57a7d85368 100644 --- a/common/msg_control.h +++ b/common/msg_control.h @@ -9,9 +9,10 @@ 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); +void mp_msg_flush_status_line(struct mp_log *log); + struct mp_log_buffer_entry { char *prefix; int level; -- cgit v1.2.3