X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=7c7b39b0423616674b1439f67fe61013d9fd0ef6;hp=896ada0904c745a4d3f77608a2cfb00dc8190d68;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hpb=f0144040f62b94908f5d3198e2fcc8ebc60dfba1 diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 896ada090..7c7b39b04 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - 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 . */ @@ -21,21 +22,6 @@ * @brief The main DCP-o-matic GUI. */ -#include "lib/film.h" -#include "lib/config.h" -#include "lib/util.h" -#include "lib/version.h" -#include "lib/signal_manager.h" -#include "lib/log.h" -#include "lib/job_manager.h" -#include "lib/transcode_job.h" -#include "lib/exceptions.h" -#include "lib/cinema.h" -#include "lib/kdm.h" -#include "lib/send_kdm_email_job.h" -#include "lib/server_finder.h" -#include "lib/update.h" -#include "lib/content_factory.h" #include "wx/film_viewer.h" #include "wx/film_editor.h" #include "wx/job_manager_view.h" @@ -45,16 +31,40 @@ #include "wx/wx_signal_manager.h" #include "wx/about_dialog.h" #include "wx/kdm_dialog.h" +#include "wx/self_dkdm_dialog.h" #include "wx/servers_list_dialog.h" #include "wx/hints_dialog.h" #include "wx/update_dialog.h" #include "wx/content_panel.h" #include "wx/report_problem_dialog.h" +#include "wx/video_waveform_dialog.h" +#include "lib/film.h" +#include "lib/config.h" +#include "lib/util.h" +#include "lib/video_content.h" +#include "lib/content.h" +#include "lib/version.h" +#include "lib/signal_manager.h" +#include "lib/log.h" +#include "lib/job_manager.h" +#include "lib/exceptions.h" +#include "lib/cinema.h" +#include "lib/screen_kdm.h" +#include "lib/send_kdm_email_job.h" +#include "lib/encode_server_finder.h" +#include "lib/update_checker.h" +#include "lib/cross.h" +#include "lib/content_factory.h" +#include "lib/compose.hpp" +#include "lib/cinema_kdms.h" +#include "lib/dcpomatic_socket.h" +#include "lib/hints.h" #include #include #include #include #include +#include #ifdef __WXMSW__ #include #endif @@ -62,8 +72,10 @@ #include #endif #include +#include #include #include +/* This is OK as it's only used with DCPOMATIC_WINDOWS */ #include #ifdef check @@ -82,8 +94,9 @@ using std::list; using std::exception; using boost::shared_ptr; using boost::dynamic_pointer_cast; +using boost::optional; -class FilmChangedDialog +class FilmChangedDialog : public boost::noncopyable { public: FilmChangedDialog (string name) @@ -91,11 +104,14 @@ public: _dialog = new wxMessageDialog ( 0, wxString::Format (_("Save changes to film \"%s\" before closing?"), std_to_wx (name).data()), - /* TRANSLATORS: this is the heading for a dialog box, which tells the user that the current - project (Film) has been changed since it was last saved. - */ + /// TRANSLATORS: this is the heading for a dialog box, which tells the user that the current + /// project (Film) has been changed since it was last saved. _("Film changed"), - wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION + wxYES_NO | wxCANCEL | wxYES_DEFAULT | wxICON_QUESTION + ); + + _dialog->SetYesNoCancelLabels ( + _("Save film and close"), _("Close without saving film"), _("Don't close") ); } @@ -110,9 +126,6 @@ public: } private: - /* Not defined */ - FilmChangedDialog (FilmChangedDialog const &); - wxMessageDialog* _dialog; }; @@ -133,16 +146,20 @@ enum { ID_content_scale_to_fit_width = 100, ID_content_scale_to_fit_height, ID_jobs_make_dcp, + ID_jobs_make_dcp_batch, ID_jobs_make_kdms, + ID_jobs_make_self_dkdm, ID_jobs_send_dcp_to_tms, ID_jobs_show_dcp, + ID_tools_video_waveform, ID_tools_hints, ID_tools_encoding_servers, ID_tools_check_for_updates, ID_tools_restore_default_preferences, ID_help_report_a_problem, /* IDs for shortcuts (with no associated menu item) */ - ID_add_file + ID_add_file, + ID_remove }; class DOMFrame : public wxFrame @@ -150,13 +167,16 @@ class DOMFrame : public wxFrame public: DOMFrame (wxString const & title) : wxFrame (NULL, -1, title) + , _video_waveform_dialog (0) , _hints_dialog (0) , _servers_list_dialog (0) , _config_dialog (0) + , _kdm_dialog (0) , _file_menu (0) , _history_items (0) , _history_position (0) , _history_separator (0) + , _update_news_requested (false) { #if defined(DCPOMATIC_WINDOWS) if (Config::instance()->win32_console ()) { @@ -195,8 +215,11 @@ public: Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_make_dcp, this), ID_jobs_make_dcp); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_make_kdms, this), ID_jobs_make_kdms); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_make_dcp_batch, this), ID_jobs_make_dcp_batch); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_make_self_dkdm, this), ID_jobs_make_self_dkdm); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_send_dcp_to_tms, this), ID_jobs_send_dcp_to_tms); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_show_dcp, this), ID_jobs_show_dcp); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_video_waveform, this), ID_tools_video_waveform); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_hints, this), ID_tools_hints); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_encoding_servers, this), ID_tools_encoding_servers); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_check_for_updates, this), ID_tools_check_for_updates); @@ -232,14 +255,25 @@ public: overall_panel->SetSizer (main_sizer); - wxAcceleratorEntry accel[1]; + wxAcceleratorEntry accel[2]; accel[0].Set (wxACCEL_CTRL, static_cast('A'), ID_add_file); + accel[1].Set (wxACCEL_NORMAL, WXK_DELETE, ID_remove); Bind (wxEVT_MENU, boost::bind (&ContentPanel::add_file_clicked, _film_editor->content_panel()), ID_add_file); - wxAcceleratorTable accel_table (1, accel); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::remove_clicked, this, _1), ID_remove); + wxAcceleratorTable accel_table (2, accel); SetAcceleratorTable (accel_table); /* Instantly save any config changes when using the DCP-o-matic GUI */ Config::instance()->Changed.connect (boost::bind (&Config::write, Config::instance ())); + + UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this)); + } + + void remove_clicked (wxCommandEvent& ev) + { + if (_film_editor->content_panel()->remove_clicked (true)) { + ev.Skip (); + } } void new_film (boost::filesystem::path path) @@ -253,8 +287,6 @@ public: void load_film (boost::filesystem::path file) try { - maybe_save_then_delete_film (); - shared_ptr film (new Film (file)); list const notes = film->read_metadata (); @@ -329,8 +361,9 @@ private: return; } - maybe_save_then_delete_film (); - new_film (d->get_path ()); + if (maybe_save_then_delete_film ()) { + new_film (d->get_path ()); + } } d->Destroy (); @@ -355,7 +388,7 @@ private: } } - if (r == wxID_OK) { + if (r == wxID_OK && maybe_save_then_delete_film()) { load_film (wx_to_std (c->GetPath ())); } @@ -371,7 +404,7 @@ private: { vector history = Config::instance()->history (); int n = event.GetId() - ID_file_history; - if (n >= 0 && n < static_cast (history.size ())) { + if (n >= 0 && n < static_cast (history.size ()) && maybe_save_then_delete_film()) { load_film (history[n]); } } @@ -392,7 +425,19 @@ private: void tools_restore_default_preferences () { - Config::restore_defaults (); + wxMessageDialog* d = new wxMessageDialog ( + 0, + _("Are you sure you want to restore preferences to their defaults? This cannot be undone."), + _("Restore default preferences"), + wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION + ); + + int const r = d->ShowModal (); + d->Destroy (); + + if (r == wxID_YES) { + Config::restore_defaults (); + } } void jobs_make_dcp () @@ -413,6 +458,15 @@ private: } } + if (!get_hints(_film).empty() && Config::instance()->show_hints_before_make_dcp()) { + HintsDialog* hints = new HintsDialog (this, _film, false); + int const r = hints->ShowModal(); + hints->Destroy (); + if (r == wxID_CANCEL) { + return; + } + } + try { /* It seems to make sense to auto-save metadata here, since the make DCP may last a long time, and crashes/power failures are moderately likely. @@ -432,20 +486,87 @@ private: return; } - KDMDialog* d = new KDMDialog (this, _film); + if (_kdm_dialog) { + _kdm_dialog->Destroy (); + _kdm_dialog = 0; + } + + _kdm_dialog = new KDMDialog (this, _film); + _kdm_dialog->Show (this); + } + + void jobs_make_dcp_batch () + { + if (!_film) { + return; + } + + if (!get_hints(_film).empty() && Config::instance()->show_hints_before_make_dcp()) { + HintsDialog* hints = new HintsDialog (this, _film, false); + int const r = hints->ShowModal(); + hints->Destroy (); + if (r == wxID_CANCEL) { + return; + } + } + + _film->write_metadata (); + + /* i = 0; try to connect via socket + i = 1; try again, and then try to start the batch converter + i = 2 onwards; try again. + */ + for (int i = 0; i < 8; ++i) { + try { + boost::asio::io_service io_service; + boost::asio::ip::tcp::resolver resolver (io_service); + boost::asio::ip::tcp::resolver::query query ("127.0.0.1", raw_convert (Config::instance()->server_port_base() + 2)); + boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); + Socket socket (5); + socket.connect (*endpoint_iterator); + string s = _film->directory().string (); + socket.write (s.length() + 1); + socket.write ((uint8_t *) s.c_str(), s.length() + 1); + /* OK\0 */ + uint8_t ok[3]; + socket.read (ok, 3); + return; + } catch (exception& e) { + + } + + if (i == 1) { + start_batch_converter (wx_to_std (wxStandardPaths::Get().GetExecutablePath())); + } + + dcpomatic_sleep (1); + } + + error_dialog (this, _("Could not find batch converter.")); + } + + void jobs_make_self_dkdm () + { + if (!_film) { + return; + } + + SelfDKDMDialog* d = new SelfDKDMDialog (this, _film); if (d->ShowModal () != wxID_OK) { d->Destroy (); return; } + optional kdm; try { - if (d->write_to ()) { - write_kdm_files (_film, d->screens (), d->cpl (), d->from (), d->until (), d->formulation (), d->directory ()); - } else { - JobManager::instance()->add ( - shared_ptr (new SendKDMEmailJob (_film, d->screens (), d->cpl (), d->from (), d->until (), d->formulation ())) - ); - } + kdm = _film->make_kdm ( + Config::instance()->decryption_chain()->leaf(), + vector (), + d->cpl (), + dcp::LocalTime ("2012-01-01T01:00:00+00:00"), + dcp::LocalTime ("2112-01-01T01:00:00+00:00"), + dcp::MODIFIED_TRANSITIONAL_1 + ); } catch (dcp::NotEncryptedError& e) { error_dialog (this, _("CPL's content is not encrypted.")); } catch (exception& e) { @@ -454,22 +575,33 @@ private: error_dialog (this, _("An unknown exception occurred.")); } + if (kdm) { + if (d->internal ()) { + vector dkdms = Config::instance()->dkdms (); + dkdms.push_back (kdm.get()); + Config::instance()->set_dkdms (dkdms); + } else { + boost::filesystem::path path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml"); + kdm->as_xml (path); + } + } + d->Destroy (); } void content_scale_to_fit_width () { - VideoContentList vc = _film_editor->content_panel()->selected_video (); - for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) { - (*i)->scale_and_crop_to_fit_width (); + 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 (); } } void content_scale_to_fit_height () { - VideoContentList vc = _film_editor->content_panel()->selected_video (); - for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) { - (*i)->scale_and_crop_to_fit_height (); + 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 (); } } @@ -512,10 +644,19 @@ private: #endif } + void tools_video_waveform () + { + if (!_video_waveform_dialog) { + _video_waveform_dialog = new VideoWaveformDialog (this, _film_viewer); + } + + _video_waveform_dialog->Show (); + } + void tools_hints () { if (!_hints_dialog) { - _hints_dialog = new HintsDialog (this, _film); + _hints_dialog = new HintsDialog (this, _film, true); } _hints_dialog->Show (); @@ -533,6 +674,7 @@ private: void tools_check_for_updates () { UpdateChecker::instance()->run (); + _update_news_requested = true; } void help_about () @@ -576,13 +718,33 @@ private: return; } + if (_film && _film->dirty ()) { + + FilmChangedDialog* dialog = new FilmChangedDialog (_film->name ()); + int const r = dialog->run (); + delete dialog; + + switch (r) { + case wxID_NO: + /* Don't save and carry on to close */ + break; + case wxID_YES: + /* Save and carry on to close */ + _film->write_metadata (); + break; + case wxID_CANCEL: + /* Veto the event and stop */ + ev.Veto (); + return; + } + } + /* We don't want to hear about any more configuration changes, since they cause the File menu to be altered, which itself will be deleted around now (without, as far as I can see, any way for us to find out). */ _config_changed_connection.disconnect (); - maybe_save_then_delete_film (); ev.Skip (); } @@ -590,7 +752,7 @@ private: { list > jobs = JobManager::instance()->get (); list >::iterator i = jobs.begin(); - while (i != jobs.end() && dynamic_pointer_cast (*i) == 0) { + while (i != jobs.end() && (*i)->json_name() != "transcode") { ++i; } bool const dcp_creation = (i != jobs.end ()) && !(*i)->finished (); @@ -621,10 +783,13 @@ private: } } - void maybe_save_then_delete_film () + /** @return true if the operation that called this method + * should continue, false to abort it. + */ + bool maybe_save_then_delete_film () { if (!_film) { - return; + return true; } if (_film->dirty ()) { @@ -635,10 +800,13 @@ private: case wxID_YES: _film->write_metadata (); break; + case wxID_CANCEL: + return false; } } _film.reset (); + return true; } void add_item (wxMenu* menu, wxString text, int id, int sens) @@ -680,11 +848,14 @@ private: wxMenu* jobs_menu = new wxMenu; add_item (jobs_menu, _("&Make DCP\tCtrl-M"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION); + add_item (jobs_menu, _("Make DCP in &batch converter\tCtrl-B"), ID_jobs_make_dcp_batch, NEEDS_FILM | NOT_DURING_DCP_CREATION); add_item (jobs_menu, _("Make &KDMs...\tCtrl-K"), ID_jobs_make_kdms, NEEDS_FILM); + add_item (jobs_menu, _("Make DKDM for DCP-o-matic..."), ID_jobs_make_self_dkdm, NEEDS_FILM); add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); wxMenu* tools = new wxMenu; + add_item (tools, _("Video waveform..."), ID_tools_video_waveform, NEEDS_FILM); add_item (tools, _("Hints..."), ID_tools_hints, 0); add_item (tools, _("Encoding servers..."), ID_tools_encoding_servers, 0); add_item (tools, _("Check for updates"), ID_tools_check_for_updates, 0); @@ -730,28 +901,60 @@ private: } for (size_t i = 0; i < history.size(); ++i) { - SafeStringStream s; + string s; if (i < 9) { - s << "&" << (i + 1) << " "; + s = String::compose ("&%1 %2", i + 1, history[i].string()); + } else { + s = history[i].string(); } - s << history[i].string(); - _file_menu->Insert (pos++, ID_file_history + i, std_to_wx (s.str ())); + _file_menu->Insert (pos++, ID_file_history + i, std_to_wx (s)); } _history_items = history.size (); } + void update_checker_state_changed () + { + UpdateChecker* uc = UpdateChecker::instance (); + + bool const announce = + _update_news_requested || + (uc->stable() && Config::instance()->check_for_updates()) || + (uc->test() && Config::instance()->check_for_updates() && Config::instance()->check_for_test_updates()); + + _update_news_requested = false; + + if (!announce) { + return; + } + + if (uc->state() == UpdateChecker::YES) { + UpdateDialog* dialog = new UpdateDialog (this, uc->stable (), uc->test ()); + dialog->ShowModal (); + dialog->Destroy (); + } else if (uc->state() == UpdateChecker::FAILED) { + error_dialog (this, _("The DCP-o-matic download server could not be contacted.")); + } else { + error_dialog (this, _("There are no new versions of DCP-o-matic available.")); + } + + _update_news_requested = false; + } + FilmEditor* _film_editor; FilmViewer* _film_viewer; + VideoWaveformDialog* _video_waveform_dialog; HintsDialog* _hints_dialog; ServersListDialog* _servers_list_dialog; wxPreferencesEditor* _config_dialog; + KDMDialog* _kdm_dialog; wxMenu* _file_menu; shared_ptr _film; int _history_items; int _history_position; wxMenuItem* _history_separator; boost::signals2::scoped_connection _config_changed_connection; + bool _update_news_requested; }; static const wxCmdLineEntryDesc command_line_description[] = { @@ -777,6 +980,24 @@ private: bool OnInit () try { + wxInitAllImageHandlers (); + + Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + + wxSplashScreen* splash = 0; + try { + if (!Config::have_existing ("config.xml")) { + wxBitmap bitmap; + boost::filesystem::path p = shared_path () / "splash.png"; + if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) { + splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1); + wxYield (); + } + } + } catch (boost::filesystem::filesystem_error& e) { + /* Maybe we couldn't find the splash image; never mind */ + } + SetAppName (_("DCP-o-matic")); if (!wxApp::OnInit()) { @@ -793,7 +1014,7 @@ private: TransformProcessType (&serial, kProcessTransformToForegroundApplication); #endif - wxInitAllImageHandlers (); + dcpomatic_setup_path_encoding (); /* Enable i18n; this will create a Config object to look for a force-configured language. This Config @@ -816,6 +1037,9 @@ private: _frame = new DOMFrame (_("DCP-o-matic")); SetTopWindow (_frame); _frame->Maximize (); + if (splash) { + splash->Destroy (); + } _frame->Show (); if (!_film_to_load.empty() && boost::filesystem::is_directory (_film_to_load)) { @@ -840,7 +1064,6 @@ private: _timer.reset (new wxTimer (this)); _timer->Start (1000); - UpdateChecker::instance()->StateChanged.connect (boost::bind (&App::update_checker_state_changed, this)); if (Config::instance()->check_for_updates ()) { UpdateChecker::instance()->run (); } @@ -877,26 +1100,43 @@ private: return true; } - /* An unhandled exception has occurred inside the main event loop */ - bool OnExceptionInMainLoop () + void report_exception () { try { throw; } catch (FileError& e) { - error_dialog (0, wxString::Format (_("An exception occurred: %s in %s.\n\n" + REPORT_PROBLEM), e.what(), e.file().string().c_str ())); + error_dialog ( + 0, + wxString::Format ( + _("An exception occurred: %s (%s)\n\n") + REPORT_PROBLEM, + std_to_wx (e.what()), + std_to_wx (e.file().string().c_str ()) + ) + ); } catch (exception& e) { - error_dialog (0, wxString::Format (_("An exception occurred: %s.\n\n"), e.what ()) + " " + REPORT_PROBLEM); + error_dialog ( + 0, + wxString::Format ( + _("An exception occurred: %s.\n\n") + REPORT_PROBLEM, + std_to_wx (e.what ()) + ) + ); } catch (...) { error_dialog (0, _("An unknown exception occurred.") + " " + REPORT_PROBLEM); } + } + /* An unhandled exception has occurred inside the main event loop */ + bool OnExceptionInMainLoop () + { + report_exception (); /* This will terminate the program */ return false; } void OnUnhandledException () { - error_dialog (0, _("An unknown exception occurred.") + " " + REPORT_PROBLEM); + report_exception (); } void idle () @@ -907,28 +1147,15 @@ private: void check () { try { - ServerFinder::instance()->rethrow (); + EncodeServerFinder::instance()->rethrow (); } catch (exception& e) { error_dialog (0, std_to_wx (e.what ())); } } - void update_checker_state_changed () + void config_failed_to_load () { - UpdateChecker* uc = UpdateChecker::instance (); - if (uc->state() == UpdateChecker::YES && (uc->stable() || uc->test())) { - UpdateDialog* dialog = new UpdateDialog (_frame, uc->stable (), uc->test ()); - dialog->ShowModal (); - dialog->Destroy (); - } else if (uc->state() == UpdateChecker::FAILED) { - if (!UpdateChecker::instance()->last_emit_was_first ()) { - error_dialog (_frame, _("The DCP-o-matic download server could not be contacted.")); - } - } else { - if (!UpdateChecker::instance()->last_emit_was_first ()) { - error_dialog (_frame, _("There are no new versions of DCP-o-matic available.")); - } - } + message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create.")); } DOMFrame* _frame;