Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / wx / film_editor.cc

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index b67c9612dbb765e4eeaa67070f1e0693712e89d3..edf5d3bd71fe9cfabb13ef37e86a6300bba8dc3a 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -31,10 +32,12 @@
 #include "content_panel.h"
 #include <wx/wx.h>
 #include <wx/notebook.h>
+#include <boost/foreach.hpp>
 #include <iostream>
 
 using std::cout;
 using std::string;
+using std::list;
 using boost::shared_ptr;
 using boost::optional;
 
@@ -53,7 +56,7 @@ FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
        _main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
 
        JobManager::instance()->ActiveJobsChanged.connect (
-               bind (&FilmEditor::active_jobs_changed, this, _1)
+               bind (&FilmEditor::active_jobs_changed, this, _2)
                );
 
        set_film (shared_ptr<Film> ());
@@ -74,6 +77,11 @@ 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);
 
@@ -119,8 +127,8 @@ FilmEditor::set_film (shared_ptr<Film> film)
                _film->ContentChanged.connect (bind (&FilmEditor::film_content_changed, this, _2));
        }
 
-       if (_film) {
-               FileChanged (_film->directory ());
+       if (_film && _film->directory()) {
+               FileChanged (_film->directory().get());
        } else {
                FileChanged ("");
        }