Remove some unused methods.

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 66f1de868bd8c6307eb208337e92f478afeff605..dbb73303c853b9b38a20e16b6cd1f06146b2fc74 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -128,7 +128,6 @@ Film::Film (boost::filesystem::path dir, bool log)
        , _three_d (false)
        , _sequence_video (true)
        , _interop (false)
-       , _burn_subtitles (false)
        , _audio_processor (0)
        , _state_version (current_state_version)
        , _dirty (false)
@@ -199,10 +198,6 @@ Film::video_identifier () const
                s << "_S";
        }
 
-       if (_burn_subtitles) {
-               s << "_B";
-       }
-
        if (_three_d) {
                s << "_3D";
        }
@@ -232,22 +227,6 @@ Film::internal_video_asset_filename () const
        return video_identifier() + ".mxf";
 }
 
-string
-Film::filename_safe_name () const
-{
-       string const n = name ();
-       string o;
-       for (size_t i = 0; i < n.length(); ++i) {
-               if (isalnum (n[i])) {
-                       o += n[i];
-               } else {
-                       o += "_";
-               }
-       }
-
-       return o;
-}
-
 boost::filesystem::path
 Film::audio_analysis_path () const
 {
@@ -277,17 +256,16 @@ Film::audio_analysis_path () const
 void
 Film::make_dcp ()
 {
-       set_isdcf_date_today ();
-
        if (dcp_name().find ("/") != string::npos) {
                throw BadSettingError (_("name"), _("cannot contain slashes"));
        }
 
+       set_isdcf_date_today ();
+
        environment_info (log ());
 
-       ContentList cl = content ();
-       for (ContentList::const_iterator i = cl.begin(); i != cl.end(); ++i) {
-               LOG_GENERAL ("Content: %1", (*i)->technical_summary());
+       BOOST_FOREACH (shared_ptr<const Content> i, content ()) {
+               LOG_GENERAL ("Content: %1", i->technical_summary());
        }
        LOG_GENERAL ("DCP video rate %1 fps", video_frame_rate());
        LOG_GENERAL ("%1 threads", Config::instance()->num_local_encoding_threads());
@@ -347,7 +325,6 @@ Film::metadata () const
        root->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
        root->add_child("SequenceVideo")->add_child_text (_sequence_video ? "1" : "0");
        root->add_child("Interop")->add_child_text (_interop ? "1" : "0");
-       root->add_child("BurnSubtitles")->add_child_text (_burn_subtitles ? "1" : "0");
        root->add_child("Signed")->add_child_text (_signed ? "1" : "0");
        root->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0");
        root->add_child("Key")->add_child_text (_key.hex ());
@@ -429,9 +406,6 @@ Film::read_metadata ()
        _sequence_video = f.bool_child ("SequenceVideo");
        _three_d = f.bool_child ("ThreeD");
        _interop = f.bool_child ("Interop");
-       if (_state_version >= 32) {
-               _burn_subtitles = f.bool_child ("BurnSubtitles");
-       }
        _key = dcp::Key (f.string_child ("Key"));
 
        if (f.optional_string_child ("AudioProcessor")) {
@@ -806,13 +780,6 @@ Film::set_interop (bool i)
        signal_changed (INTEROP);
 }
 
-void
-Film::set_burn_subtitles (bool b)
-{
-       _burn_subtitles = b;
-       signal_changed (BURN_SUBTITLES);
-}
-
 void
 Film::set_audio_processor (AudioProcessor const * processor)
 {