diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
| commit | 8c7a308c03e4b4196b4e2379a26d432b100ae2b1 (patch) | |
| tree | 605c8b62f56c5f9be2ff77161eb18ac372083a35 /src/wx/film_editor.cc | |
| parent | 04acfa42cdffd5938358847ebee822399ef978e6 (diff) | |
| parent | a6d6a794b28c3b3e6679f01c1890f396453eb5ac (diff) | |
Merge master.
Diffstat (limited to 'src/wx/film_editor.cc')
| -rw-r--r-- | src/wx/film_editor.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 37a8c8808..1ce4695d6 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -45,6 +45,7 @@ #include "lib/content.h" #include "lib/content_factory.h" #include "lib/dcp_content.h" +#include "lib/safe_stringstream.h" #include "timecode.h" #include "wx_util.h" #include "film_editor.h" @@ -58,7 +59,6 @@ using std::string; using std::cout; -using std::stringstream; using std::pair; using std::fixed; using std::setprecision; @@ -109,7 +109,6 @@ FilmEditor::film_changed (Film::Property p) _content_panel->film_changed (p); _dcp_panel->film_changed (p); - } void @@ -171,4 +170,3 @@ FilmEditor::active_jobs_changed (bool a) { set_general_sensitivity (!a); } - |