X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=0db26566aec8f1f5147f80ce0c748f0961f265b4;hp=d3cd2b06b64284c9ec2ed7aa57cd8b4e2ef89eed;hb=d31674ec14bb533fe2b195601e9ee2fe03848487;hpb=08376d150bbadfdb8a981b27a3963d24ee12da1e diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index d3cd2b06b..0db26566a 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -33,6 +33,7 @@ #include "wx/recreate_chain_dialog.h" #include "wx/about_dialog.h" #include "wx/kdm_dialog.h" +#include "wx/dkdm_dialog.h" #include "wx/self_dkdm_dialog.h" #include "wx/servers_list_dialog.h" #include "wx/hints_dialog.h" @@ -44,11 +45,11 @@ #include "wx/save_template_dialog.h" #include "wx/templates_dialog.h" #include "wx/nag_dialog.h" -#include "wx/export_dialog.h" +#include "wx/export_subtitles_dialog.h" +#include "wx/export_video_file_dialog.h" #include "wx/paste_dialog.h" #include "wx/focus_manager.h" #include "wx/html_dialog.h" -#include "wx/initial_setup_dialog.h" #include "wx/send_i18n_dialog.h" #include "wx/i18n_hook.h" #include "lib/film.h" @@ -65,14 +66,13 @@ #include "lib/job_manager.h" #include "lib/exceptions.h" #include "lib/cinema.h" -#include "lib/screen_kdm.h" +#include "lib/kdm_with_metadata.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 "lib/dcp_content.h" @@ -83,23 +83,26 @@ #include "lib/check_content_change_job.h" #include "lib/text_content.h" #include "lib/dcpomatic_log.h" +#include "lib/subtitle_encoder.h" +#include "lib/warnings.h" #include #include +DCPOMATIC_DISABLE_WARNINGS #include #include #include #include #include #include +DCPOMATIC_ENABLE_WARNINGS +#ifdef __WXGTK__ +#include +#endif #ifdef __WXMSW__ #include #endif -#ifdef __WXOSX__ -#include -#endif #include #include -#include #include #include #include @@ -120,12 +123,16 @@ using std::map; using std::make_pair; using std::list; using std::exception; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::make_shared; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::optional; using boost::function; using boost::is_any_of; using boost::algorithm::find; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::raw_convert; class FilmChangedClosingDialog : public boost::noncopyable @@ -218,13 +225,13 @@ enum { ID_file_close = 100, ID_edit_copy, ID_edit_paste, - ID_content_scale_to_fit_width, - ID_content_scale_to_fit_height, ID_jobs_make_dcp, ID_jobs_make_dcp_batch, ID_jobs_make_kdms, + ID_jobs_make_dkdms, ID_jobs_make_self_dkdm, - ID_jobs_export, + ID_jobs_export_video_file, + ID_jobs_export_subtitles, ID_jobs_send_dcp_to_tms, ID_jobs_show_dcp, ID_jobs_open_dcp_in_player, @@ -258,12 +265,14 @@ public: , _servers_list_dialog (0) , _config_dialog (0) , _kdm_dialog (0) + , _dkdm_dialog (0) , _templates_dialog (0) , _file_menu (0) , _history_items (0) , _history_position (0) , _history_separator (0) , _update_news_requested (false) + , _first_shown_called (false) { #if defined(DCPOMATIC_WINDOWS) if (Config::instance()->win32_console ()) { @@ -285,7 +294,7 @@ public: } #endif - wxMenuBar* bar = new wxMenuBar; + auto bar = new wxMenuBar; setup_menu (bar); SetMenuBar (bar); @@ -310,13 +319,13 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_copy, this), ID_edit_copy); Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_paste, this), ID_edit_paste); Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES); - Bind (wxEVT_MENU, boost::bind (&DOMFrame::content_scale_to_fit_width, this), ID_content_scale_to_fit_width); - Bind (wxEVT_MENU, boost::bind (&DOMFrame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height); Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp, this), ID_jobs_make_dcp); Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_kdms, this), ID_jobs_make_kdms); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dkdms, this), ID_jobs_make_dkdms); Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp_batch, this), ID_jobs_make_dcp_batch); Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_self_dkdm, this), ID_jobs_make_self_dkdm); - Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export, this), ID_jobs_export); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export_video_file, this), ID_jobs_export_video_file); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export_subtitles, this), ID_jobs_export_subtitles); Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_send_dcp_to_tms, this), ID_jobs_send_dcp_to_tms); Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_show_dcp, this), ID_jobs_show_dcp); Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_open_dcp_in_player, this), ID_jobs_open_dcp_in_player); @@ -333,6 +342,7 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem); Bind (wxEVT_CLOSE_WINDOW, boost::bind (&DOMFrame::close, this, _1)); + Bind (wxEVT_SHOW, boost::bind (&DOMFrame::show, this, _1)); /* Use a panel as the only child of the Frame so that we avoid the dark-grey background on Windows. @@ -342,9 +352,9 @@ public: _film_viewer.reset (new FilmViewer (overall_panel)); _controls = new StandardControls (overall_panel, _film_viewer, true); _film_editor = new FilmEditor (overall_panel, _film_viewer); - JobManagerView* job_manager_view = new JobManagerView (overall_panel, false); + auto job_manager_view = new JobManagerView (overall_panel, false); - wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL); + auto right_sizer = new wxBoxSizer (wxVERTICAL); 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); @@ -412,7 +422,7 @@ public: void new_film (boost::filesystem::path path, optional template_name) { - shared_ptr film (new Film (path)); + auto film = make_shared(path); if (template_name) { film->use_template (template_name.get()); } @@ -424,8 +434,8 @@ public: void load_film (boost::filesystem::path file) try { - shared_ptr film (new Film (file)); - list const notes = film->read_metadata (); + auto film = make_shared(file); + auto const notes = film->read_metadata (); if (film->state_version() == 4) { error_dialog ( @@ -435,7 +445,7 @@ public: ); } - BOOST_FOREACH (string i, notes) { + for (auto i: notes) { error_dialog (0, std_to_wx(i)); } @@ -443,10 +453,21 @@ public: JobManager::instance()->add(shared_ptr(new CheckContentChangeJob(film))); } - catch (std::exception& e) { - wxString p = std_to_wx (file.string ()); - wxCharBuffer b = p.ToUTF8 (); - error_dialog (this, wxString::Format (_("Could not open film at %s"), p.data()), std_to_wx (e.what())); + catch (FileNotFoundError& e) { + auto const dir = e.file().parent_path(); + if (boost::filesystem::exists(dir / "ASSETMAP") || boost::filesystem::exists(dir / "ASSETMAP.xml")) { + error_dialog ( + this, _("Could not open this folder as a DCP-o-matic project."), + _("It looks like you are trying to open a DCP. File -> Open is for loading DCP-o-matic projects, not DCPs. To import a DCP, create a new project with File -> New and then click the \"Add DCP...\" button.") + ); + } else { + auto const p = std_to_wx(file.string ()); + error_dialog (this, wxString::Format(_("Could not open film at %s"), p.data()), std_to_wx(e.what())); + } + + } catch (std::exception& e) { + auto const p = std_to_wx (file.string()); + error_dialog (this, wxString::Format(_("Could not open film at %s"), p.data()), std_to_wx(e.what())); } void set_film (shared_ptr film) @@ -476,6 +497,14 @@ public: private: + void show (wxShowEvent& ev) + { + if (ev.IsShown() && !_first_shown_called) { + _film_editor->first_shown (); + _first_shown_called = true; + } + } + void film_message (string m) { message_dialog (this, std_to_wx(m)); @@ -490,7 +519,7 @@ private: void file_changed (boost::filesystem::path f) { - string s = wx_to_std (_("DCP-o-matic")); + auto s = wx_to_std(_("DCP-o-matic")); if (!f.empty ()) { s += " - " + f.string (); } @@ -500,7 +529,7 @@ private: void file_new () { - FilmNameLocationDialog* d = new FilmNameLocationDialog (this, _("New Film"), true); + auto d = new FilmNameLocationDialog (this, _("New Film"), true); int const r = d->ShowModal (); if (r == wxID_OK && d->check_path() && maybe_save_then_delete_film()) { @@ -509,7 +538,7 @@ private: } catch (boost::filesystem::filesystem_error& e) { #ifdef DCPOMATIC_WINDOWS string bad_chars = "<>:\"/|?*"; - string const filename = d->path().string(); + string const filename = d->path().filename().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) { @@ -517,9 +546,11 @@ private: } } wxString message = _("Could not create folder to store film."); + message += " "; 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()); + } else { + message += _("Please check that you do not have Windows controlled folder access enabled for DCP-o-matic."); } error_dialog (this, message, std_to_wx(e.what())); #else @@ -533,7 +564,7 @@ private: void file_open () { - wxDirDialog* c = new wxDirDialog ( + auto c = new wxDirDialog ( this, _("Select film to open"), std_to_wx (Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()), @@ -564,7 +595,7 @@ private: void file_save_as_template () { - SaveTemplateDialog* d = new SaveTemplateDialog (this); + auto d = new SaveTemplateDialog (this); int const r = d->ShowModal (); if (r == wxID_OK) { Config::instance()->save_template (_film, d->name ()); @@ -574,7 +605,7 @@ private: void file_duplicate () { - FilmNameLocationDialog* d = new FilmNameLocationDialog (this, _("Duplicate Film"), false); + auto d = new FilmNameLocationDialog (this, _("Duplicate Film"), false); int const r = d->ShowModal (); if (r == wxID_OK && d->check_path() && maybe_save_film()) { @@ -589,7 +620,7 @@ private: void file_duplicate_and_open () { - FilmNameLocationDialog* d = new FilmNameLocationDialog (this, _("Duplicate Film"), false); + auto d = new FilmNameLocationDialog (this, _("Duplicate Film"), false); int const r = d->ShowModal (); if (r == wxID_OK && d->check_path() && maybe_save_film()) { @@ -607,7 +638,7 @@ private: { if (_film && _film->dirty ()) { - FilmChangedClosingDialog* dialog = new FilmChangedClosingDialog (_film->name ()); + auto dialog = new FilmChangedClosingDialog (_film->name ()); int const r = dialog->run (); delete dialog; @@ -630,7 +661,7 @@ private: void file_history (wxCommandEvent& event) { - vector history = Config::instance()->history (); + auto history = Config::instance()->history (); int n = event.GetId() - ID_file_history; if (n >= 0 && n < static_cast (history.size ()) && maybe_save_then_delete_film()) { load_film (history[n]); @@ -645,7 +676,7 @@ private: void edit_copy () { - ContentList const sel = _film_editor->content_panel()->selected(); + auto const sel = _film_editor->content_panel()->selected(); DCPOMATIC_ASSERT (sel.size() == 1); _clipboard = sel.front()->clone(); } @@ -654,9 +685,9 @@ private: { DCPOMATIC_ASSERT (_clipboard); - PasteDialog* d = new PasteDialog (this, static_cast(_clipboard->video), static_cast(_clipboard->audio), !_clipboard->text.empty()); + auto d = new PasteDialog (this, static_cast(_clipboard->video), static_cast(_clipboard->audio), !_clipboard->text.empty()); if (d->ShowModal() == wxID_OK) { - BOOST_FOREACH (shared_ptr i, _film_editor->content_panel()->selected()) { + for (auto i: _film_editor->content_panel()->selected()) { if (d->video() && i->video) { DCPOMATIC_ASSERT (_clipboard->video); i->video->take_settings_from (_clipboard->video); @@ -667,8 +698,8 @@ private: } if (d->text()) { - list >::iterator j = i->text.begin (); - list >::const_iterator k = _clipboard->text.begin (); + auto j = i->text.begin (); + auto k = _clipboard->text.begin (); while (j != i->text.end() && k != _clipboard->text.end()) { (*j)->take_settings_from (*k); ++j; @@ -690,7 +721,7 @@ private: void tools_restore_default_preferences () { - wxMessageDialog* d = new wxMessageDialog ( + auto d = new wxMessageDialog ( 0, _("Are you sure you want to restore preferences to their defaults? This cannot be undone."), _("Restore default preferences"), @@ -724,7 +755,7 @@ private: } if (Config::instance()->show_hints_before_make_dcp()) { - HintsDialog* hints = new HintsDialog (this, _film, false); + auto hints = new HintsDialog (this, _film, false); int const r = hints->ShowModal(); hints->Destroy (); if (r == wxID_CANCEL) { @@ -780,8 +811,23 @@ private: _kdm_dialog->Show (); } + void jobs_make_dkdms () + { + if (!_film) { + return; + } + + if (_dkdm_dialog) { + _dkdm_dialog->Destroy (); + _dkdm_dialog = 0; + } + + _dkdm_dialog = new DKDMDialog (this, _film); + _dkdm_dialog->Show (); + } + /** @return false if we succeeded, true if not */ - bool send_to_other_tool (int port, function start, string message) + bool send_to_other_tool (int port, function start, string message) { /* i = 0; try to connect via socket i = 1; try again, and then try to start the tool @@ -807,10 +853,10 @@ private: } if (i == 1) { - start (wx_to_std (wxStandardPaths::Get().GetExecutablePath())); + start (); } - dcpomatic_sleep (1); + dcpomatic_sleep_seconds (1); } return true; @@ -823,7 +869,7 @@ private: } if (Config::instance()->show_hints_before_make_dcp()) { - HintsDialog* hints = new HintsDialog (this, _film, false); + auto hints = new HintsDialog (this, _film, false); int const r = hints->ShowModal(); hints->Destroy (); if (r == wxID_CANCEL) { @@ -833,8 +879,12 @@ private: _film->write_metadata (); - if (send_to_other_tool (BATCH_JOB_PORT, bind (&start_batch_converter, _1), _film->directory()->string())) { + if (send_to_other_tool (BATCH_JOB_PORT, &start_batch_converter, _film->directory()->string())) { +#ifdef DCPOMATIC_OSX + error_dialog (this, _("Could not start the batch converter. You may need to download it from dcpomatic.com.")); +#else error_dialog (this, _("Could not find batch converter.")); +#endif } } @@ -844,8 +894,12 @@ private: return; } - if (send_to_other_tool (PLAYER_PLAY_PORT, bind (&start_player, _1), _film->dir(_film->dcp_name(false)).string())) { + if (send_to_other_tool (PLAYER_PLAY_PORT, &start_player, _film->dir(_film->dcp_name(false)).string())) { +#ifdef DCPOMATIC_OSX + error_dialog (this, _("Could not start the player. You may need to download it from dcpomatic.com.")); +#else error_dialog (this, _("Could not find player.")); +#endif } } @@ -855,7 +909,7 @@ private: return; } - SelfDKDMDialog* d = new SelfDKDMDialog (this, _film); + auto d = new SelfDKDMDialog (this, _film); if (d->ShowModal () != wxID_OK) { d->Destroy (); return; @@ -872,14 +926,19 @@ private: ) ); + + dcp::LocalTime from (Config::instance()->signer_chain()->leaf().not_before()); + from.add_days (1); + dcp::LocalTime to (Config::instance()->signer_chain()->leaf().not_after()); + to.add_days (-1); + optional kdm; try { 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"), + from, to, dcp::MODIFIED_TRANSITIONAL_1, true, 0 @@ -894,11 +953,11 @@ private: if (kdm) { if (d->internal ()) { - shared_ptr dkdms = Config::instance()->dkdms (); + auto dkdms = Config::instance()->dkdms(); dkdms->add (shared_ptr (new DKDM (kdm.get()))); Config::instance()->changed (); } else { - boost::filesystem::path path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml"); + auto path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml"); kdm->as_xml (path); } } @@ -906,41 +965,48 @@ private: d->Destroy (); } - void jobs_export () + + void jobs_export_video_file () { - ExportDialog* d = new ExportDialog (this); + auto d = new ExportVideoFileDialog (this, _film->isdcf_name(true)); if (d->ShowModal() == wxID_OK) { - shared_ptr job (new TranscodeJob (_film)); + if (boost::filesystem::exists(d->path())) { + bool ok = confirm_dialog( + this, + wxString::Format (_("File %s already exists. Do you want to overwrite it?"), std_to_wx(d->path().string()).data()) + ); + + if (!ok) { + d->Destroy (); + return; + } + } + + auto job = make_shared(_film); job->set_encoder ( - shared_ptr ( - new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->x264_crf() -#ifdef DCPOMATIC_VARIANT_SWAROOP - , optional(), optional() -#endif - ) - ) + make_shared ( + _film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf()) ); JobManager::instance()->add (job); } d->Destroy (); } - void content_scale_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 (_film); - } - } - void content_scale_to_fit_height () + void jobs_export_subtitles () { - 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 (_film); + auto d = new ExportSubtitlesDialog (this, _film->reels().size(), _film->interop()); + if (d->ShowModal() == wxID_OK) { + auto job = make_shared(_film); + job->set_encoder ( + make_shared(_film, job, d->path(), _film->isdcf_name(true), d->split_reels(), d->include_font()) + ); + JobManager::instance()->add (job); } + d->Destroy (); } + void jobs_send_dcp_to_tms () { _film->send_dcp_to_tms (); @@ -1039,19 +1105,18 @@ private: void tools_send_translations () { - SendI18NDialog* d = new SendI18NDialog (this); + auto d = new SendI18NDialog (this); if (d->ShowModal() == wxID_OK) { string body; body += d->name() + "\n"; body += d->language() + "\n"; body += string(dcpomatic_version) + " " + string(dcpomatic_git_commit) + "\n"; body += "--\n"; - map translations = I18NHook::translations (); - for (map::const_iterator i = translations.begin(); i != translations.end(); ++i) { - body += i->first + "\n" + i->second + "\n\n"; + auto translations = I18NHook::translations (); + for (auto i: translations) { + body += i.first + "\n" + i.second + "\n\n"; } - list to; - to.push_back ("carl@dcpomatic.com"); + list to = { "carl@dcpomatic.com" }; Emailer emailer (d->email(), to, "DCP-o-matic translations", body); emailer.send ("main.carlh.net", 2525, EMAIL_PROTOCOL_STARTTLS); } @@ -1061,14 +1126,14 @@ private: void help_about () { - AboutDialog* d = new AboutDialog (this); + auto d = new AboutDialog (this); d->ShowModal (); d->Destroy (); } void help_report_a_problem () { - ReportProblemDialog* d = new ReportProblemDialog (this, _film); + auto d = new ReportProblemDialog (this, _film); if (d->ShowModal () == wxID_OK) { d->report (); } @@ -1081,7 +1146,7 @@ private: return true; } - wxMessageDialog* d = new wxMessageDialog ( + auto d = new wxMessageDialog ( 0, _("There are unfinished jobs; are you sure you want to quit?"), _("Unfinished jobs"), @@ -1102,7 +1167,7 @@ private: if (_film && _film->dirty ()) { - FilmChangedClosingDialog* dialog = new FilmChangedClosingDialog (_film->name ()); + auto dialog = new FilmChangedClosingDialog (_film->name ()); int const r = dialog->run (); delete dialog; @@ -1135,8 +1200,8 @@ private: void set_menu_sensitivity () { - list > jobs = JobManager::instance()->get (); - list >::iterator i = jobs.begin(); + auto jobs = JobManager::instance()->get (); + auto i = jobs.begin(); while (i != jobs.end() && (*i)->json_name() != "transcode") { ++i; } @@ -1146,43 +1211,43 @@ private: bool const have_selected_content = !_film_editor->content_panel()->selected().empty(); bool const have_selected_video_content = !_film_editor->content_panel()->selected_video().empty(); - for (map::iterator j = menu_items.begin(); j != menu_items.end(); ++j) { + for (auto j: menu_items) { bool enabled = true; - if ((j->second & NEEDS_FILM) && !_film) { + if ((j.second & NEEDS_FILM) && !_film) { enabled = false; } - if ((j->second & NOT_DURING_DCP_CREATION) && dcp_creation) { + if ((j.second & NOT_DURING_DCP_CREATION) && dcp_creation) { enabled = false; } - if ((j->second & NEEDS_CPL) && !have_cpl) { + if ((j.second & NEEDS_CPL) && !have_cpl) { enabled = false; } - if ((j->second & NEEDS_SELECTED_CONTENT) && !have_selected_content) { + if ((j.second & NEEDS_SELECTED_CONTENT) && !have_selected_content) { enabled = false; } - if ((j->second & NEEDS_SINGLE_SELECTED_CONTENT) && !have_single_selected_content) { + if ((j.second & NEEDS_SINGLE_SELECTED_CONTENT) && !have_single_selected_content) { enabled = false; } - if ((j->second & NEEDS_SELECTED_VIDEO_CONTENT) && !have_selected_video_content) { + if ((j.second & NEEDS_SELECTED_VIDEO_CONTENT) && !have_selected_video_content) { enabled = false; } - if ((j->second & NEEDS_CLIPBOARD) && !_clipboard) { + if ((j.second & NEEDS_CLIPBOARD) && !_clipboard) { enabled = false; } - if ((j->second & NEEDS_ENCRYPTION) && (!_film || !_film->encrypted())) { + if ((j.second & NEEDS_ENCRYPTION) && (!_film || !_film->encrypted())) { enabled = false; } - j->first->Enable (enabled); + j.first->Enable (enabled); } } @@ -1224,7 +1289,7 @@ private: void add_item (wxMenu* menu, wxString text, int id, int sens) { - wxMenuItem* item = menu->Append (id, text); + auto item = menu->Append (id, text); menu_items.insert (make_pair (item, sens)); } @@ -1265,21 +1330,27 @@ private: add_item (edit, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS); #endif - wxMenu* content = new wxMenu; - add_item (content, _("Scale to fit &width"), ID_content_scale_to_fit_width, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT); - add_item (content, _("Scale to fit &height"), ID_content_scale_to_fit_height, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT); - 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); jobs_menu->AppendSeparator (); add_item (jobs_menu, _("Make &KDMs...\tCtrl-K"), ID_jobs_make_kdms, NEEDS_FILM); + add_item (jobs_menu, _("Make &DKDMs...\tCtrl-D"), ID_jobs_make_dkdms, NEEDS_FILM); add_item (jobs_menu, _("Make DKDM for DCP-o-matic..."), ID_jobs_make_self_dkdm, NEEDS_FILM | NEEDS_ENCRYPTION); jobs_menu->AppendSeparator (); - add_item (jobs_menu, _("Export...\tCtrl-E"), ID_jobs_export, NEEDS_FILM); + add_item (jobs_menu, _("Export video file...\tCtrl-E"), ID_jobs_export_video_file, NEEDS_FILM); + add_item (jobs_menu, _("Export subtitles..."), ID_jobs_export_subtitles, NEEDS_FILM); jobs_menu->AppendSeparator (); 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); + +#if defined(DCPOMATIC_OSX) + add_item (jobs_menu, _("S&how DCP in Finder"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); +#elif defined(DCPOMATIC_WINDOWS) + add_item (jobs_menu, _("S&how DCP in Explorer"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); +#else + add_item (jobs_menu, _("S&how DCP in Files"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); +#endif + add_item (jobs_menu, _("Open DCP in &player"), ID_jobs_open_dcp_in_player, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); wxMenu* view = new wxMenu; @@ -1306,7 +1377,6 @@ private: m->Append (_file_menu, _("&File")); m->Append (edit, _("&Edit")); - m->Append (content, _("&Content")); m->Append (jobs_menu, _("&Jobs")); m->Append (view, _("&View")); m->Append (tools, _("&Tools")); @@ -1356,7 +1426,7 @@ private: /* Clear out non-existant history items before we re-build the menu */ Config::instance()->clean_history (); - vector history = Config::instance()->history (); + auto history = Config::instance()->history(); if (!history.empty ()) { _history_separator = _file_menu->InsertSeparator (pos++); @@ -1379,7 +1449,7 @@ private: void update_checker_state_changed () { - UpdateChecker* uc = UpdateChecker::instance (); + auto uc = UpdateChecker::instance (); bool const announce = _update_news_requested || @@ -1393,7 +1463,7 @@ private: } if (uc->state() == UpdateChecker::YES) { - UpdateDialog* dialog = new UpdateDialog (this, uc->stable (), uc->test ()); + auto dialog = new UpdateDialog (this, uc->stable(), uc->test()); dialog->ShowModal (); dialog->Destroy (); } else if (uc->state() == UpdateChecker::FAILED) { @@ -1431,13 +1501,13 @@ private: void analytics_message (string title, string html) { - HTMLDialog* d = new HTMLDialog(this, std_to_wx(title), std_to_wx(html)); + auto d = new HTMLDialog(this, std_to_wx(title), std_to_wx(html)); d->ShowModal(); d->Destroy(); } FilmEditor* _film_editor; - boost::shared_ptr _film_viewer; + std::shared_ptr _film_viewer; StandardControls* _controls; VideoWaveformDialog* _video_waveform_dialog; SystemInformationDialog* _system_information_dialog; @@ -1445,6 +1515,7 @@ private: ServersListDialog* _servers_list_dialog; wxPreferencesEditor* _config_dialog; KDMDialog* _kdm_dialog; + DKDMDialog* _dkdm_dialog; TemplatesDialog* _templates_dialog; wxMenu* _file_menu; shared_ptr _film; @@ -1455,12 +1526,15 @@ private: boost::signals2::scoped_connection _analytics_message_connection; bool _update_news_requested; shared_ptr _clipboard; + bool _first_shown_called; }; static const wxCmdLineEntryDesc command_line_description[] = { { wxCMD_LINE_SWITCH, "n", "new", "create new film", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_OPTION, "c", "content", "add content file / directory", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_OPTION, "d", "dcp", "add content DCP", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, + { wxCMD_LINE_SWITCH, "v", "version", "show DCP-o-matic version", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, + { wxCMD_LINE_OPTION, "", "config", "directory containing config.xml and cinemas.xml", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 } }; @@ -1475,7 +1549,11 @@ public: : wxApp () , _frame (0) , _splash (0) - {} + { +#ifdef DCPOMATIC_LINUX + XInitThreads (); +#endif + } private: @@ -1499,10 +1577,9 @@ private: unsetenv ("UBUNTU_MENUPROXY"); #endif -#ifdef __WXOSX__ - ProcessSerialNumber serial; - GetCurrentProcess (&serial); - TransformProcessType (&serial, kProcessTransformToForegroundApplication); +#ifdef DCPOMATIC_OSX + dcpomatic_sleep_seconds (1); + make_foreground_application (); #endif dcpomatic_setup_path_encoding (); @@ -1536,13 +1613,6 @@ private: _frame->Maximize (); close_splash (); - if (!Config::instance()->nagged(Config::NAG_INITIAL_SETUP)) { - InitialSetupDialog* d = new InitialSetupDialog (); - d->ShowModal (); - d->Destroy (); - Config::instance()->set_nagged(Config::NAG_INITIAL_SETUP, true); - } - if (running_32_on_64 ()) { NagDialog::maybe_nag ( _frame, Config::NAG_32_ON_64, @@ -1566,7 +1636,7 @@ private: if (!_film_to_create.empty ()) { _frame->new_film (_film_to_create, optional ()); if (!_content_to_add.empty ()) { - BOOST_FOREACH (shared_ptr i, content_factory(_content_to_add)) { + for (auto i: content_factory(_content_to_add)) { _frame->film()->examine_and_add_content (i); } } @@ -1587,9 +1657,9 @@ private: { if (_splash) { _splash->Destroy (); - _splash = 0; + _splash = nullptr; } - error_dialog (0, wxString::Format ("DCP-o-matic could not start."), std_to_wx(e.what())); + error_dialog (nullptr, wxString::Format ("DCP-o-matic could not start."), std_to_wx(e.what())); } return true; @@ -1603,6 +1673,11 @@ private: bool OnCmdLineParsed (wxCmdLineParser& parser) { + if (parser.Found (wxT("version"))) { + cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n"; + exit (EXIT_SUCCESS); + } + if (parser.GetParamCount() > 0) { if (parser.Found (wxT ("new"))) { _film_to_create = wx_to_std (parser.GetParam (0)); @@ -1621,6 +1696,11 @@ private: _dcp_to_add = wx_to_std (dcp); } + wxString config; + if (parser.Found (wxT("config"), &config)) { + State::override_path = wx_to_std (config); + } + return true; } @@ -1639,7 +1719,7 @@ private: ); } catch (exception& e) { error_dialog ( - 0, + nullptr, wxString::Format ( _("An exception occurred: %s.\n\n") + REPORT_PROBLEM, std_to_wx (e.what ()) @@ -1704,16 +1784,16 @@ private: when we open our recreate dialog, close it, *then* try to Destroy the splash (the Destroy fails). */ _splash->Destroy (); - _splash = 0; + _splash = nullptr; - Config* config = Config::instance(); + auto config = Config::instance(); switch (reason) { case Config::BAD_SIGNER_UTF8_STRINGS: { if (config->nagged(Config::NAG_BAD_SIGNER_CHAIN)) { return false; } - RecreateChainDialog* d = new RecreateChainDialog ( + auto d = new RecreateChainDialog ( _frame, _("Recreate signing certificates"), _("The certificate chain that DCP-o-matic uses for signing DCPs and KDMs contains a small error\n" "which will prevent DCPs from being validated correctly on some systems. Do you want to re-create\n" @@ -1727,7 +1807,7 @@ private: } case Config::BAD_SIGNER_INCONSISTENT: { - RecreateChainDialog* d = new RecreateChainDialog ( + auto d = new RecreateChainDialog ( _frame, _("Recreate signing certificates"), _("The certificate chain that DCP-o-matic uses for signing DCPs and KDMs is inconsistent and\n" "cannot be used. DCP-o-matic cannot start unless you re-create it. Do you want to re-create\n" @@ -1743,7 +1823,7 @@ private: } case Config::BAD_DECRYPTION_INCONSISTENT: { - RecreateChainDialog* d = new RecreateChainDialog ( + auto d = new RecreateChainDialog ( _frame, _("Recreate KDM decryption chain"), _("The certificate chain that DCP-o-matic uses for decrypting KDMs is inconsistent and\n" "cannot be used. DCP-o-matic cannot start unless you re-create it. Do you want to re-create\n"