diff options
| author | wm4 <wm4@nowhere> | 2013-09-07 20:19:57 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-09-07 20:34:49 +0200 |
| commit | c4b935adf74aa8d08030df89554f32d054d376da (patch) | |
| tree | fbb37ea6ce9dcf65956d715fc17a7e6ac47b0317 /mpvcore | |
| parent | 8894a4b0d2b38781d9ab110a18e27fef99d956f1 (diff) | |
| download | mpv-c4b935adf74aa8d08030df89554f32d054d376da.tar.bz2 mpv-c4b935adf74aa8d08030df89554f32d054d376da.tar.xz | |
mplayer: remove unused mp_add_subtitles() parameter
Diffstat (limited to 'mpvcore')
| -rw-r--r-- | mpvcore/command.c | 4 | ||||
| -rw-r--r-- | mpvcore/mp_core.h | 2 | ||||
| -rw-r--r-- | mpvcore/mplayer.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mpvcore/command.c b/mpvcore/command.c index 3e217dd5d7..f7bed60713 100644 --- a/mpvcore/command.c +++ b/mpvcore/command.c @@ -2575,7 +2575,7 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd) case MP_CMD_SUB_ADD: if (sh_video) { - mp_add_subtitles(mpctx, cmd->args[0].v.s, 0); + mp_add_subtitles(mpctx, cmd->args[0].v.s); } break; @@ -2590,7 +2590,7 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd) struct track *sub = mp_track_by_tid(mpctx, STREAM_SUB, cmd->args[0].v.i); if (sh_video && sub && sub->is_external && sub->external_filename) { - struct track *nsub = mp_add_subtitles(mpctx, sub->external_filename, 0); + struct track *nsub = mp_add_subtitles(mpctx, sub->external_filename); if (nsub) { mp_remove_track(mpctx, sub); mp_switch_track(mpctx, nsub->type, nsub); diff --git a/mpvcore/mp_core.h b/mpvcore/mp_core.h index 6e601c88ba..04756c9efd 100644 --- a/mpvcore/mp_core.h +++ b/mpvcore/mp_core.h @@ -306,7 +306,7 @@ extern int forced_subs_only; void uninit_player(struct MPContext *mpctx, unsigned int mask); void reinit_audio_chain(struct MPContext *mpctx); double playing_audio_pts(struct MPContext *mpctx); -struct track *mp_add_subtitles(struct MPContext *mpctx, char *filename, int noerr); +struct track *mp_add_subtitles(struct MPContext *mpctx, char *filename); int reinit_video_chain(struct MPContext *mpctx); int reinit_video_filters(struct MPContext *mpctx); int reinit_audio_filters(struct MPContext *mpctx); diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c index c6eff97338..d811bd8207 100644 --- a/mpvcore/mplayer.c +++ b/mpvcore/mplayer.c @@ -3951,13 +3951,13 @@ static void open_subtitles_from_options(struct MPContext *mpctx) // check .sub if (mpctx->opts->sub_name) { for (int i = 0; mpctx->opts->sub_name[i] != NULL; ++i) - mp_add_subtitles(mpctx, mpctx->opts->sub_name[i], 0); + mp_add_subtitles(mpctx, mpctx->opts->sub_name[i]); } if (mpctx->opts->sub_auto) { // auto load sub file ... char **tmp = find_text_subtitles(mpctx->opts, mpctx->filename); int nsub = MP_TALLOC_ELEMS(tmp); for (int i = 0; i < nsub; i++) { - struct track *track = mp_add_subtitles(mpctx, tmp[i], 1); + struct track *track = mp_add_subtitles(mpctx, tmp[i]); if (track) track->auto_loaded = true; } @@ -4025,7 +4025,7 @@ static void open_audiofiles_from_options(struct MPContext *mpctx) opts->audio_stream_cache, STREAM_AUDIO); } -struct track *mp_add_subtitles(struct MPContext *mpctx, char *filename, int noerr) +struct track *mp_add_subtitles(struct MPContext *mpctx, char *filename) { struct MPOpts *opts = mpctx->opts; return open_external_file(mpctx, filename, opts->sub_demuxer_name, 0, |