Merge branch 'master' into subs

[dcpomatic.git] / src / lib / film.cc

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 00d37c097aec72e676f2cfc485bdf57c3960900d..95dc7b82590946cc353ca2699d0c459f86d3c97c 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -217,6 +217,7 @@ Film::set_content (string c)
        _state.audio_channels = d->audio_channels ();
        _state.audio_sample_rate = d->audio_sample_rate ();
        _state.audio_sample_format = d->audio_sample_format ();
+       _state.has_subtitles = d->has_subtitles ();
 
        _state.content_digest = md5_digest (s->content_path ());
        _state.content = c;
@@ -660,3 +661,10 @@ Film::encoded_frames () const
 
        return N;
 }
+
+void
+Film::set_with_subtitles (bool w)
+{
+       _state.with_subtitles = w;
+       signal_changed (WITH_SUBTITLES);
+}