X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=3d74859dc9e139ec9d97e01386386f1f3a562884;hb=1e77753ef4119b6d7df7d2255b1a1d8d6af951de;hp=7392c830c7be939d8560201ad8597c2e40cbf036;hpb=23583dfb56181c76126e652042e9d1940367aa27;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 7392c830c..3d74859dc 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -22,7 +22,8 @@
  *  @brief The main DCP-o-matic GUI.
  */
 
-#include "wx/control_film_viewer.h"
+#include "wx/controls.h"
+#include "wx/film_viewer.h"
 #include "wx/film_editor.h"
 #include "wx/job_manager_view.h"
 #include "wx/full_config_dialog.h"
@@ -54,6 +55,7 @@
 #include "lib/version.h"
 #include "lib/signal_manager.h"
 #include "lib/log.h"
+#include "lib/screen.h"
 #include "lib/job_manager.h"
 #include "lib/exceptions.h"
 #include "lib/cinema.h"
@@ -90,6 +92,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
 #include <iostream>
 #include <fstream>
 /* This is OK as it's only used with DCPOMATIC_WINDOWS */
@@ -113,6 +116,8 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::function;
+using boost::is_any_of;
+using boost::algorithm::find;
 using dcp::raw_convert;
 
 class FilmChangedClosingDialog : public boost::noncopyable
@@ -317,12 +322,14 @@ public:
 		*/
 		wxPanel* overall_panel = new wxPanel (this, wxID_ANY);
 
-		_film_viewer = new ControlFilmViewer (overall_panel);
+		_film_viewer.reset (new FilmViewer (overall_panel));
+		_controls = new Controls (overall_panel, _film_viewer);
 		_film_editor = new FilmEditor (overall_panel, _film_viewer);
 		JobManagerView* job_manager_view = new JobManagerView (overall_panel, false);
 
 		wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL);
-		right_sizer->Add (_film_viewer, 2, wxEXPAND | wxALL, 6);
+		right_sizer->Add (_film_viewer->panel(), 2, wxEXPAND | wxALL, 6);
+		right_sizer->Add (_controls, 0, wxEXPAND | wxALL, 6);
 		right_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6);
 
 		wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
@@ -473,7 +480,24 @@ private:
 			try {
 				new_film (d->path(), d->template_name());
 			} catch (boost::filesystem::filesystem_error& e) {
-				error_dialog (this, _("Could not create folder to store film"), std_to_wx(e.what()));
+#ifdef DCPOMATIC_WINDOWS
+				string bad_chars = "<>:\"/|?*";
+				string const filename = d->path().string();
+				string found_bad_chars;
+				for (size_t i = 0; i < bad_chars.length(); ++i) {
+					if (filename.find(bad_chars[i]) != string::npos && found_bad_chars.find(bad_chars[i]) == string::npos) {
+						found_bad_chars += bad_chars[i];
+					}
+				}
+				wxString message = _("Could not create folder to store film.");
+				if (!found_bad_chars.empty()) {
+					message += "  ";
+					message += wxString::Format (_("Try removing the %s characters from your folder name."), std_to_wx(found_bad_chars).data());
+				}
+				error_dialog (this, message, std_to_wx(e.what()));
+#else
+				error_dialog (this, _("Could not create folder to store film."), std_to_wx(e.what()));
+#endif
 			}
 		}
 
@@ -800,7 +824,7 @@ private:
 		try {
 			kdm = _film->make_kdm (
 				Config::instance()->decryption_chain()->leaf(),
-				vector<dcp::Certificate> (),
+				vector<string>(),
 				d->cpl (),
 				dcp::LocalTime ("2012-01-01T01:00:00+00:00"),
 				dcp::LocalTime ("2112-01-01T01:00:00+00:00"),
@@ -1298,16 +1322,17 @@ private:
 
 	void back_frame ()
 	{
-		_film_viewer->back_frame ();
+		_film_viewer->seek_by (-_film_viewer->one_video_frame(), true);
 	}
 
 	void forward_frame ()
 	{
-		_film_viewer->forward_frame ();
+		_film_viewer->seek_by (_film_viewer->one_video_frame(), true);
 	}
 
 	FilmEditor* _film_editor;
-	ControlFilmViewer* _film_viewer;
+	boost::shared_ptr<FilmViewer> _film_viewer;
+	Controls* _controls;
 	VideoWaveformDialog* _video_waveform_dialog;
 	HintsDialog* _hints_dialog;
 	ServersListDialog* _servers_list_dialog;