diff options
| -rw-r--r-- | player/sub.c | 7 | ||||
| -rw-r--r-- | sub/dec_sub.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/player/sub.c b/player/sub.c index a4b4baddc8..0de6c2bbf1 100644 --- a/player/sub.c +++ b/player/sub.c @@ -144,15 +144,10 @@ static void update_subtitle(struct MPContext *mpctx, int order) // Handle displaying subtitles on terminal; never done for secondary subs if (order == 0) { - if (!state.render_bitmap_subs || !mpctx->video_out) { - sub_lock(dec_sub); + if (!state.render_bitmap_subs || !mpctx->video_out) set_osd_subtitle(mpctx, sub_get_text(dec_sub, curpts_s)); - sub_unlock(dec_sub); - } } else if (order == 1) { - sub_lock(dec_sub); osd_set_text(mpctx->osd, obj, sub_get_text(dec_sub, curpts_s)); - sub_unlock(dec_sub); } } diff --git a/sub/dec_sub.c b/sub/dec_sub.c index 79884576b0..cc608c3ca5 100644 --- a/sub/dec_sub.c +++ b/sub/dec_sub.c @@ -531,6 +531,8 @@ bool sub_has_get_text(struct dec_sub *sub) } // See sub_get_bitmaps() for locking requirements. +// It can be called unlocked too, but then only 1 thread must call this function +// at a time (unless exclusive access is guaranteed). char *sub_get_text(struct dec_sub *sub, double pts) { pthread_mutex_lock(&sub->lock); |