diff options
Diffstat (limited to 'player/osd.c')
| -rw-r--r-- | player/osd.c | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/player/osd.c b/player/osd.c index e2606829be..4dbdfe4024 100644 --- a/player/osd.c +++ b/player/osd.c @@ -115,17 +115,16 @@ void term_osd_set_subs(struct MPContext *mpctx, const char *text) term_osd_update(mpctx); } -static void term_osd_set_text(struct MPContext *mpctx, const char *text) +static void term_osd_set_text_lazy(struct MPContext *mpctx, const char *text) { - if ((mpctx->video_out && mpctx->opts->term_osd != 1) || - !mpctx->opts->term_osd || !text) + bool video_osd = mpctx->video_out && mpctx->opts->video_osd; + if ((video_osd && mpctx->opts->term_osd != 1) || !text) text = ""; // disable talloc_free(mpctx->term_osd_text); mpctx->term_osd_text = talloc_strdup(mpctx, text); - term_osd_update(mpctx); } -static void term_osd_set_status(struct MPContext *mpctx, const char *text) +static void term_osd_set_status_lazy(struct MPContext *mpctx, const char *text) { talloc_free(mpctx->term_osd_status); mpctx->term_osd_status = talloc_strdup(mpctx, text); @@ -134,8 +133,6 @@ static void term_osd_set_status(struct MPContext *mpctx, const char *text) terminal_get_size(&w, &h); if (strlen(mpctx->term_osd_status) > w && !strchr(mpctx->term_osd_status, '\n')) mpctx->term_osd_status[w] = '\0'; - - term_osd_update(mpctx); } static void add_term_osd_bar(struct MPContext *mpctx, char **line, int width) @@ -167,7 +164,7 @@ static bool is_busy(struct MPContext *mpctx) return !mpctx->restart_complete && mp_time_sec() - mpctx->start_timestamp > 0.3; } -static void print_status(struct MPContext *mpctx) +static void term_osd_print_status_lazy(struct MPContext *mpctx) { struct MPOpts *opts = mpctx->opts; @@ -179,13 +176,13 @@ static void print_status(struct MPContext *mpctx) if (opts->quiet || !mpctx->playback_initialized || !mpctx->playing_msg_shown) { - term_osd_set_status(mpctx, ""); + term_osd_set_status_lazy(mpctx, ""); return; } if (opts->status_msg) { char *r = mp_property_expand_escaped_string(mpctx, opts->status_msg); - term_osd_set_status(mpctx, r); + term_osd_set_status_lazy(mpctx, r); talloc_free(r); return; } @@ -292,7 +289,7 @@ static void print_status(struct MPContext *mpctx) } // end - term_osd_set_status(mpctx, line); + term_osd_set_status_lazy(mpctx, line); talloc_free(line); } @@ -307,7 +304,7 @@ static bool set_osd_msg_va(struct MPContext *mpctx, int level, int time, mpctx->osd_show_pos = false; mpctx->osd_msg_next_duration = time / 1000.0; mpctx->osd_force_update = true; - mpctx->sleeptime = 0; + mp_wakeup_core(mpctx); if (mpctx->osd_msg_next_duration <= 0) mpctx->osd_msg_visible = mp_time_sec(); return true; @@ -328,11 +325,11 @@ void set_osd_bar(struct MPContext *mpctx, int type, double min, double max, double neutral, double val) { struct MPOpts *opts = mpctx->opts; - if (opts->osd_level < 1 || !opts->osd_bar_visible || !mpctx->video_out) + bool video_osd = mpctx->video_out && mpctx->opts->video_osd; + if (opts->osd_level < 1 || !opts->osd_bar_visible || !video_osd) return; mpctx->osd_visible = mp_time_sec() + opts->osd_duration / 1000.0; - mpctx->sleeptime = 0; mpctx->osd_progbar.type = type; mpctx->osd_progbar.value = (val - min) / (max - min); mpctx->osd_progbar.num_stops = 0; @@ -342,6 +339,7 @@ void set_osd_bar(struct MPContext *mpctx, int type, mpctx->osd_progbar.num_stops, pos); } osd_set_progbar(mpctx->osd, &mpctx->osd_progbar); + mp_wakeup_core(mpctx); } // Update a currently displayed bar of the same type, without resetting the @@ -389,6 +387,7 @@ void set_osd_bar_chapters(struct MPContext *mpctx, int type) } } osd_set_progbar(mpctx->osd, &mpctx->osd_progbar); + mp_wakeup_core(mpctx); } // osd_function is the symbol appearing in the video status, such as OSD_PLAY @@ -399,7 +398,7 @@ void set_osd_function(struct MPContext *mpctx, int osd_function) mpctx->osd_function = osd_function; mpctx->osd_function_visible = mp_time_sec() + opts->osd_duration / 1000.0; mpctx->osd_force_update = true; - mpctx->sleeptime = 0; + mp_wakeup_core(mpctx); } void get_current_osd_sym(struct MPContext *mpctx, char *buf, size_t buf_size) @@ -463,7 +462,8 @@ static void add_seek_osd_messages(struct MPContext *mpctx) } if (mpctx->add_osd_seek_info & OSD_SEEK_INFO_TEXT) { // Never in term-osd mode - if (mpctx->video_out && mpctx->opts->term_osd != 1) { + bool video_osd = mpctx->video_out && mpctx->opts->video_osd; + if (video_osd && mpctx->opts->term_osd != 1) { if (set_osd_msg(mpctx, 1, mpctx->opts->osd_duration, "")) mpctx->osd_show_pos = true; } @@ -505,7 +505,7 @@ void update_osd_msg(struct MPContext *mpctx) double delay = 0.050; // update the OSD at most this often double diff = now - mpctx->osd_last_update; if (diff < delay) { - mpctx->sleeptime = MPMIN(mpctx->sleeptime, delay - diff); + mp_set_timeout(mpctx, delay - diff); return; } } @@ -516,7 +516,7 @@ void update_osd_msg(struct MPContext *mpctx) if (mpctx->osd_visible) { double sleep = mpctx->osd_visible - now; if (sleep > 0) { - mpctx->sleeptime = MPMIN(mpctx->sleeptime, sleep); + mp_set_timeout(mpctx, sleep); mpctx->osd_idle_update = true; } else { mpctx->osd_visible = 0; @@ -528,7 +528,7 @@ void update_osd_msg(struct MPContext *mpctx) if (mpctx->osd_function_visible) { double sleep = mpctx->osd_function_visible - now; if (sleep > 0) { - mpctx->sleeptime = MPMIN(mpctx->sleeptime, sleep); + mp_set_timeout(mpctx, sleep); mpctx->osd_idle_update = true; } else { mpctx->osd_function_visible = 0; @@ -546,7 +546,7 @@ void update_osd_msg(struct MPContext *mpctx) if (mpctx->osd_msg_visible) { double sleep = mpctx->osd_msg_visible - now; if (sleep > 0) { - mpctx->sleeptime = MPMIN(mpctx->sleeptime, sleep); + mp_set_timeout(mpctx, sleep); mpctx->osd_idle_update = true; } else { talloc_free(mpctx->osd_msg_text); @@ -563,8 +563,12 @@ void update_osd_msg(struct MPContext *mpctx) update_osd_bar(mpctx, OSD_BAR_SEEK, 0, 1, MPCLAMP(pos, 0, 1)); } - term_osd_set_text(mpctx, mpctx->osd_msg_text); - print_status(mpctx); + term_osd_set_text_lazy(mpctx, mpctx->osd_msg_text); + term_osd_print_status_lazy(mpctx); + term_osd_update(mpctx); + + if (!opts->video_osd) + return; int osd_level = opts->osd_level; if (mpctx->osd_show_pos) |