* @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"
#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"
#include "lib/audio_content.h"
#include "lib/check_content_change_job.h"
#include "lib/text_content.h"
+#include "lib/dcpomatic_log.h"
#include <dcp/exceptions.h>
#include <dcp/raw_convert.h>
#include <wx/generic/aboutdlgg.h>
#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 */
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
*/
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);
film->set_name (path.filename().generic_string());
film->write_metadata ();
set_film (film);
+ dcpomatic_log = film->log ();
}
void load_film (boost::filesystem::path file)
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
}
}
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"),
{
ContentList vc = _film_editor->content_panel()->selected_video ();
for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
- (*i)->video->scale_and_crop_to_fit_width ();
+ (*i)->video->scale_and_crop_to_fit_width (_film);
}
}
{
ContentList vc = _film_editor->content_panel()->selected_video ();
for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
- (*i)->video->scale_and_crop_to_fit_height ();
+ (*i)->video->scale_and_crop_to_fit_height (_film);
}
}
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;
if (!_film_to_create.empty ()) {
_frame->new_film (_film_to_create, optional<string> ());
if (!_content_to_add.empty ()) {
- BOOST_FOREACH (shared_ptr<Content> i, content_factory (_frame->film(), _content_to_add)) {
+ BOOST_FOREACH (shared_ptr<Content> i, content_factory(_content_to_add)) {
_frame->film()->examine_and_add_content (i);
}
}
if (!_dcp_to_add.empty ()) {
- _frame->film()->examine_and_add_content (shared_ptr<DCPContent> (new DCPContent (_frame->film(), _dcp_to_add)));
+ _frame->film()->examine_and_add_content(shared_ptr<DCPContent>(new DCPContent(_dcp_to_add)));
}
}