From 6659de707b45ea96e6b8cad142c825929aa926e7 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 27 Dec 2014 12:23:00 +0100 Subject: [PATCH] player: cosmetics: rename a function Something which has this many important sideffects shouldn't start have a "get" prefix. --- player/command.c | 2 +- player/core.h | 4 ++-- player/sub.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/player/command.c b/player/command.c index 4a5dda6590..2a7ac5b82b 100644 --- a/player/command.c +++ b/player/command.c @@ -4248,7 +4248,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd) if (!mpctx->num_sources) return -1; struct osd_sub_state state; - get_osd_sub_state(mpctx, 0, &state); + update_osd_sub_state(mpctx, 0, &state); double refpts = get_current_time(mpctx); if (state.dec_sub && refpts != MP_NOPTS_VALUE) { double a[2]; diff --git a/player/core.h b/player/core.h index c03fedef33..bb310e0975 100644 --- a/player/core.h +++ b/player/core.h @@ -475,8 +475,8 @@ void uninit_sub_all(struct MPContext *mpctx); void update_osd_msg(struct MPContext *mpctx); void update_subtitles(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); +void update_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 62fcaeabe2..26c25b5f10 100644 --- a/player/sub.c +++ b/player/sub.c @@ -191,8 +191,8 @@ static bool is_interleaved(struct MPContext *mpctx, struct track *track) return track->demuxer == mpctx->demuxer; } -void get_osd_sub_state(struct MPContext *mpctx, int order, - struct osd_sub_state *out_state) +void update_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]; @@ -237,7 +237,7 @@ static void update_subtitle(struct MPContext *mpctx, int order) } struct osd_sub_state state; - get_osd_sub_state(mpctx, order, &state); + update_osd_sub_state(mpctx, order, &state); double refpts_s = mpctx->playback_pts - state.video_offset; double curpts_s = refpts_s - opts->sub_delay; @@ -341,5 +341,5 @@ void reinit_subs(struct MPContext *mpctx, int order) struct dec_sub *dec_sub = mpctx->d_sub[order]; reinit_subdec(mpctx, track, dec_sub); - get_osd_sub_state(mpctx, order, NULL); + update_osd_sub_state(mpctx, order, NULL); }