I think fix_conflicting_settings is now not required.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 68ebddba2c5edb597ac0d74b32f7e3eb86346674..386f456b51317e909f5fefabf300bf82d2a2b2fb 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1520,42 +1520,6 @@ Film::content_summary (DCPTimePeriod period) const
        return _playlist->content_summary (period);
 }
 
-list<string>
-Film::fix_conflicting_settings ()
-{
-       list<string> notes;
-
-       list<boost::filesystem::path> was_referencing;
-       BOOST_FOREACH (shared_ptr<Content> i, content()) {
-               shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent> (i);
-               if (d) {
-                       list<string> reasons;
-                       bool was = false;
-                       if (!d->can_reference_video(reasons) && d->reference_video()) {
-                               d->set_reference_video (false);
-                               was = true;
-                       }
-                       if (!d->can_reference_audio(reasons) && d->reference_audio()) {
-                               d->set_reference_audio (false);
-                               was = true;
-                       }
-                       if (!d->can_reference_subtitle(reasons) && d->reference_subtitle()) {
-                               d->set_reference_subtitle (false);
-                               was = true;
-                       }
-                       if (was) {
-                               was_referencing.push_back (d->path(0).parent_path().filename());
-                       }
-               }
-       }
-
-       BOOST_FOREACH (boost::filesystem::path d, was_referencing) {
-               notes.push_back (String::compose (_("The DCP %1 was being referred to by this film.  This not now possible because the reel sizes in the film no longer agree with those in the imported DCP.\n\nSetting the 'Reel type' to 'split by video content' will probably help.\n\nAfter doing that you would need to re-tick the appropriate 'refer to existing DCP' checkboxes."), d.string()));
-       }
-
-       return notes;
-}
-
 void
 Film::use_template (string name)
 {

diff --git a/src/lib/film.h b/src/lib/film.h
index bce2c3b54e8237d77194459ff236f0c1757ac4af..a1dfc60940bfd917ed0365d9ccda6838d4a2f07e 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -165,8 +165,6 @@ public:
 
        std::string content_summary (DCPTimePeriod period) const;
 
-       std::list<std::string> fix_conflicting_settings ();
-
        bool references_dcp_video () const;
        bool references_dcp_audio () const;
 

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 7dd7e4ef3827f5f1b03e3e74bd26bf41925fdc82..5380cbd9bed582cd7716ade2096b7c5c34dc2065 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -76,11 +76,6 @@ FilmEditor::film_changed (Film::Property p)
                return;
        }
 
-       list<string> notes = _film->fix_conflicting_settings ();
-       BOOST_FOREACH (string i, notes) {
-               message_dialog (this, std_to_wx (i));
-       }
-
        _content_panel->film_changed (p);
        _dcp_panel->film_changed (p);