summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--player/command.c2
-rw-r--r--player/core.h2
-rw-r--r--player/sub.c8
-rw-r--r--sub/osd.c7
-rw-r--r--sub/osd.h1
5 files changed, 7 insertions, 13 deletions
diff --git a/player/command.c b/player/command.c
index c69e058ae2..2cf91cfd68 100644
--- a/player/command.c
+++ b/player/command.c
@@ -3989,7 +3989,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
if (!mpctx->num_sources)
return -1;
struct osd_sub_state state;
- osd_get_sub(mpctx->osd, OSDTYPE_SUB, &state);
+ get_osd_sub_state(mpctx, 0, &state);
if (state.dec_sub && mpctx->video_pts != MP_NOPTS_VALUE) {
double a[2];
a[0] = mpctx->video_pts - state.video_offset - opts->sub_delay;
diff --git a/player/core.h b/player/core.h
index 631e5c75e0..de21757cb1 100644
--- a/player/core.h
+++ b/player/core.h
@@ -475,6 +475,8 @@ void update_osd_msg(struct MPContext *mpctx);
void update_subtitles(struct MPContext *mpctx);
void init_sub_renderer(struct MPContext *mpctx);
void uninit_sub_renderer(struct MPContext *mpctx);
+void get_osd_sub_state(struct MPContext *mpctx, int order,
+ struct osd_sub_state *out_state);
// timeline/tl_matroska.c
void build_ordered_chapter_timeline(struct MPContext *mpctx);
diff --git a/player/sub.c b/player/sub.c
index 09da80f1ae..f694296c90 100644
--- a/player/sub.c
+++ b/player/sub.c
@@ -193,8 +193,8 @@ void reset_subtitle_state(struct MPContext *mpctx)
reset_subtitles(mpctx, 1);
}
-static void update_sub_state(struct MPContext *mpctx, int order,
- struct osd_sub_state *out_state)
+void get_osd_sub_state(struct MPContext *mpctx, int order,
+ struct osd_sub_state *out_state)
{
struct MPOpts *opts = mpctx->opts;
struct track *track = mpctx->current_track[order][STREAM_SUB];
@@ -242,7 +242,7 @@ static void update_subtitle(struct MPContext *mpctx, int order)
}
struct osd_sub_state state;
- update_sub_state(mpctx, order, &state);
+ get_osd_sub_state(mpctx, order, &state);
double refpts_s = mpctx->playback_pts - state.video_offset;
double curpts_s = refpts_s - opts->sub_delay;
@@ -339,5 +339,5 @@ void reinit_subs(struct MPContext *mpctx, int order)
struct dec_sub *dec_sub = mpctx->d_sub[order];
reinit_subdec(mpctx, track, dec_sub);
- update_sub_state(mpctx, order, NULL);
+ get_osd_sub_state(mpctx, order, NULL);
}
diff --git a/sub/osd.c b/sub/osd.c
index 8eac7feb03..1a9e7f5d23 100644
--- a/sub/osd.c
+++ b/sub/osd.c
@@ -146,13 +146,6 @@ void osd_set_sub(struct osd_state *osd, int obj, struct osd_sub_state *substate)
pthread_mutex_unlock(&osd->lock);
}
-void osd_get_sub(struct osd_state *osd, int obj, struct osd_sub_state *substate)
-{
- pthread_mutex_lock(&osd->lock);
- *substate = osd->objs[obj]->sub_state;
- pthread_mutex_unlock(&osd->lock);
-}
-
bool osd_get_render_subs_in_filter(struct osd_state *osd)
{
pthread_mutex_lock(&osd->lock);
diff --git a/sub/osd.h b/sub/osd.h
index e1da9bccd2..015bae29e5 100644
--- a/sub/osd.h
+++ b/sub/osd.h
@@ -157,7 +157,6 @@ struct osd_sub_state {
bool render_bitmap_subs;
};
void osd_set_sub(struct osd_state *osd, int obj, struct osd_sub_state *substate);
-void osd_get_sub(struct osd_state *osd, int obj, struct osd_sub_state *substate);
bool osd_get_render_subs_in_filter(struct osd_state *osd);
void osd_set_render_subs_in_filter(struct osd_state *osd, bool s);