Merge svn changes up to r29752

As part of merging subtitle-in-terminal changes make
update_subtitles() only clear existing subtitles if called with the
reset argument, and not try to set new ones. Later calls should set
the needed new subtitles, and this change avoids some problems with
trying to set subtitles when mp_property_sub() in command.c gets
called from initialization code before full initialization.

1 files changed, 5 insertions, 2 deletions

diff --git a/mpcommon.h b/mpcommon.h
index 211145abfc..bbec3113a6 100644
--- a/mpcommon.h
+++ b/mpcommon.h
@@ -9,11 +9,14 @@ extern double sub_last_pts;
 extern struct ass_track *ass_track;
 extern subtitle *vo_sub_last;
 
+struct MPContext;
 void print_version(const char* name);
-void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub,
-                      double video_offset, int reset);
+void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts,
+                      sh_video_t *sh_video, double refpts, double sub_offset,
+                      demux_stream_t *d_dvdsub, int reset);
 void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset);
 int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang);
+void set_osd_subtitle(struct MPContext *mpctx, subtitle *subs);
 
 extern int disable_system_conf;
 extern int disable_user_conf;