projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp for asdcplib Debian unstable build fix.
[dcpomatic.git]
/
src
/
wx
/
film_editor.cc
diff --git
a/src/wx/film_editor.cc
b/src/wx/film_editor.cc
index 6d60772be0f2dc805ff88ca565a3114f3f90f602..edf5d3bd71fe9cfabb13ef37e86a6300bba8dc3a 100644
(file)
--- a/
src/wx/film_editor.cc
+++ b/
src/wx/film_editor.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
6
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.
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
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 "content_panel.h"
#include <wx/wx.h>
#include <wx/notebook.h>
+#include <boost/foreach.hpp>
#include <iostream>
using std::cout;
using std::string;
#include <iostream>
using std::cout;
using std::string;
+using std::list;
using boost::shared_ptr;
using boost::optional;
using boost::shared_ptr;
using boost::optional;
@@
-74,6
+77,11
@@
FilmEditor::film_changed (Film::Property p)
return;
}
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);
_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));
}
_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 ("");
}
} else {
FileChanged ("");
}