X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=4246455378fb8c401aec5ac96206d54ff093ff0b;hb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1;hp=715d420872e0838b0ea3a0d0416270bf90445c77;hpb=85c65bd422742813992686c17a5e1b718cc3c449;p=dcpomatic.git diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 715d42087..424645537 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include "wx/film_viewer.h" #include "wx/film_editor.h" #include "wx/job_manager_view.h" @@ -43,6 +45,7 @@ #include "wx/servers_list_dialog.h" #include "wx/hints_dialog.h" #include "wx/update_dialog.h" +#include "wx/content_panel.h" #include "lib/film.h" #include "lib/config.h" #include "lib/util.h" @@ -62,7 +65,6 @@ using std::cout; using std::string; using std::wstring; -using std::stringstream; using std::map; using std::make_pair; using std::list; @@ -70,16 +72,13 @@ using std::exception; using boost::shared_ptr; using boost::dynamic_pointer_cast; -static FilmEditor* film_editor = 0; -static FilmViewer* film_viewer = 0; static shared_ptr film; -static std::string log_level; static std::string film_to_load; static std::string film_to_create; static std::string content_to_add; static wxMenu* jobs_menu = 0; -static void set_menu_sensitivity (); +// #define DCPOMATIC_WINDOWS_CONSOLE 1 class FilmChangedDialog { @@ -112,7 +111,7 @@ private: }; -void +static void maybe_save_then_delete_film () { if (!film) { @@ -133,49 +132,42 @@ maybe_save_then_delete_film () film.reset (); } -#define ALWAYS 0x0 -#define NEEDS_FILM 0x1 -#define NOT_DURING_DCP_CREATION 0x2 -#define NEEDS_DCP 0x4 - -map menu_items; - -void -add_item (wxMenu* menu, wxString text, int id, int sens) +static void +check_film_state_version (int v) { - wxMenuItem* item = menu->Append (id, text); - menu_items.insert (make_pair (item, sens)); + if (v == 4) { + error_dialog ( + 0, + _("This film was created with an old version of DVD-o-matic and may not load correctly " + "in this version. Please check the film's settings carefully.") + ); + } } -void -set_menu_sensitivity () +static void +load_film (boost::filesystem::path file) { - list > jobs = JobManager::instance()->get (); - list >::iterator i = jobs.begin(); - while (i != jobs.end() && dynamic_pointer_cast (*i) == 0) { - ++i; + film.reset (new Film (file)); + list const notes = film->read_metadata (); + check_film_state_version (film->state_version ()); + for (list::const_iterator i = notes.begin(); i != notes.end(); ++i) { + error_dialog (0, std_to_wx (*i)); } - bool const dcp_creation = (i != jobs.end ()) && !(*i)->finished (); - bool const have_dcp = film && !film->dcps().empty (); - - for (map::iterator j = menu_items.begin(); j != menu_items.end(); ++j) { - - bool enabled = true; - - if ((j->second & NEEDS_FILM) && film == 0) { - enabled = false; - } +} - if ((j->second & NOT_DURING_DCP_CREATION) && dcp_creation) { - enabled = false; - } +#define ALWAYS 0x0 +#define NEEDS_FILM 0x1 +#define NOT_DURING_DCP_CREATION 0x2 +#define NEEDS_CPL 0x4 +#define NEEDS_SELECTED_VIDEO_CONTENT 0x8 - if ((j->second & NEEDS_DCP) && !have_dcp) { - enabled = false; - } - - j->first->Enable (enabled); - } +map menu_items; + +static void +add_item (wxMenu* menu, wxString text, int id, int sens) +{ + wxMenuItem* item = menu->Append (id, text); + menu_items.insert (make_pair (item, sens)); } enum { @@ -183,6 +175,8 @@ enum { ID_file_open, ID_file_save, ID_file_properties, + ID_content_scale_to_fit_width, + ID_content_scale_to_fit_height, ID_jobs_make_dcp, ID_jobs_make_kdms, ID_jobs_send_dcp_to_tms, @@ -192,7 +186,7 @@ enum { ID_tools_check_for_updates }; -void +static void setup_menu (wxMenuBar* m) { wxMenu* file = new wxMenu; @@ -218,13 +212,17 @@ setup_menu (wxMenuBar* m) #else wxMenu* edit = new wxMenu; add_item (edit, _("&Preferences..."), wxID_PREFERENCES, ALWAYS); -#endif +#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); jobs_menu = new wxMenu; add_item (jobs_menu, _("&Make DCP"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION); - add_item (jobs_menu, _("Make &KDMs..."), ID_jobs_make_kdms, NEEDS_FILM | NEEDS_DCP); - add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_DCP); - add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_DCP); + add_item (jobs_menu, _("Make &KDMs..."), ID_jobs_make_kdms, 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, _("Hints..."), ID_tools_hints, 0); @@ -241,7 +239,8 @@ setup_menu (wxMenuBar* m) m->Append (file, _("&File")); #ifndef __WXOSX__ m->Append (edit, _("&Edit")); -#endif +#endif + m->Append (content, _("&Content")); m->Append (jobs_menu, _("&Jobs")); m->Append (tools, _("&Tools")); m->Append (help, _("&Help")); @@ -254,8 +253,9 @@ public: : wxFrame (NULL, -1, title) , _hints_dialog (0) , _servers_list_dialog (0) + , _config_dialog (0) { -#ifdef DCPOMATIC_WINDOWS_CONSOLE +#if defined(DCPOMATIC_WINDOWS) && defined(DCPOMATIC_WINDOWS_CONSOLE) AllocConsole(); HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE); @@ -281,6 +281,8 @@ public: Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_properties, this), ID_file_properties); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_exit, this), wxID_EXIT); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::edit_preferences, this), wxID_PREFERENCES); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::content_scale_to_fit_width, this), ID_content_scale_to_fit_width); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_make_dcp, this), ID_jobs_make_dcp); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_make_kdms, this), ID_jobs_make_kdms); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_send_dcp_to_tms, this), ID_jobs_send_dcp_to_tms); @@ -297,62 +299,50 @@ public: */ wxPanel* overall_panel = new wxPanel (this, wxID_ANY); - film_editor = new FilmEditor (film, overall_panel); - film_viewer = new FilmViewer (film, overall_panel); + _film_editor = new FilmEditor (film, overall_panel); + _film_viewer = new FilmViewer (film, overall_panel); JobManagerView* job_manager_view = new JobManagerView (overall_panel, static_cast (0)); wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL); - right_sizer->Add (film_viewer, 2, wxEXPAND | wxALL, 6); + right_sizer->Add (_film_viewer, 2, wxEXPAND | wxALL, 6); right_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6); wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL); - main_sizer->Add (film_editor, 1, wxEXPAND | wxALL, 6); + main_sizer->Add (_film_editor, 1, wxEXPAND | wxALL, 6); main_sizer->Add (right_sizer, 2, wxEXPAND | wxALL, 6); set_menu_sensitivity (); - film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1)); + _film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1)); if (film) { file_changed (film->directory ()); } else { file_changed (""); } - JobManager::instance()->ActiveJobsChanged.connect (boost::bind (set_menu_sensitivity)); + JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&Frame::set_menu_sensitivity, this)); set_film (); overall_panel->SetSizer (main_sizer); } - void check_film_state_version (int v) - { - if (v == 4) { - error_dialog ( - this, - _("This film was created with an old version of DVD-o-matic and may not load correctly " - "in this version. Please check the film's settings carefully.") - ); - } - } - private: void set_film () { - film_viewer->set_film (film); - film_editor->set_film (film); + _film_viewer->set_film (film); + _film_editor->set_film (film); set_menu_sensitivity (); } void file_changed (boost::filesystem::path f) { - stringstream s; - s << wx_to_std (_("DCP-o-matic")); + string s = wx_to_std (_("DCP-o-matic")); if (!f.empty ()) { - s << " - " << f.string (); + s += " - " + f.string (); } - SetTitle (std_to_wx (s.str())); + SetTitle (std_to_wx (s)); } void file_new () @@ -384,7 +374,6 @@ private: maybe_save_then_delete_film (); film.reset (new Film (d->get_path ())); film->write_metadata (); - film->log()->set_level (log_level); film->set_name (boost::filesystem::path (d->get_path()).filename().generic_string()); set_film (); } @@ -402,7 +391,7 @@ private: ); int r; - while (1) { + while (true) { r = c->ShowModal (); if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) { error_dialog (this, _("You did not select a folder. Make sure that you select a folder before clicking Open.")); @@ -414,10 +403,7 @@ private: if (r == wxID_OK) { maybe_save_then_delete_film (); try { - film.reset (new Film (wx_to_std (c->GetPath ()))); - film->read_metadata (); - check_film_state_version (film->state_version ()); - film->log()->set_level (log_level); + load_film (wx_to_std (c->GetPath ())); set_film (); } catch (std::exception& e) { wxString p = c->GetPath (); @@ -443,15 +429,16 @@ private: void file_exit () { - Close (true); + /* false here allows the close handler to veto the close request */ + Close (false); } void edit_preferences () { - ConfigDialog* d = new ConfigDialog (this); - d->ShowModal (); - d->Destroy (); - Config::instance()->write (); + if (!_config_dialog) { + _config_dialog = create_config_dialog (); + } + _config_dialog->Show (this); } void jobs_make_dcp () @@ -482,12 +469,14 @@ private: try { if (d->write_to ()) { - write_kdm_files (film, d->screens (), d->dcp (), d->from (), d->until (), d->directory ()); + 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->dcp (), d->from (), d->until ())) + shared_ptr (new SendKDMEmailJob (film, d->screens (), d->cpl (), d->from (), d->until (), d->formulation ())) ); } + } catch (dcp::NotEncryptedError& e) { + error_dialog (this, _("CPL's content is not encrypted.")); } catch (exception& e) { error_dialog (this, e.what ()); } catch (...) { @@ -496,6 +485,22 @@ private: 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 (); + } + } + + 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 (); + } + } void jobs_send_dcp_to_tms () { @@ -588,18 +593,58 @@ private: ev.Skip (); } + void set_menu_sensitivity () + { + list > jobs = JobManager::instance()->get (); + list >::iterator i = jobs.begin(); + while (i != jobs.end() && dynamic_pointer_cast (*i) == 0) { + ++i; + } + bool const dcp_creation = (i != jobs.end ()) && !(*i)->finished (); + bool const have_cpl = film && !film->cpls().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) { + + bool enabled = true; + + if ((j->second & NEEDS_FILM) && film == 0) { + enabled = false; + } + + if ((j->second & NOT_DURING_DCP_CREATION) && dcp_creation) { + enabled = false; + } + + if ((j->second & NEEDS_CPL) && !have_cpl) { + enabled = false; + } + + if ((j->second & NEEDS_SELECTED_VIDEO_CONTENT) && !have_selected_video_content) { + enabled = false; + } + + j->first->Enable (enabled); + } + } + + FilmEditor* _film_editor; + FilmViewer* _film_viewer; HintsDialog* _hints_dialog; ServersListDialog* _servers_list_dialog; + wxPreferencesEditor* _config_dialog; }; static const wxCmdLineEntryDesc command_line_description[] = { - { wxCMD_LINE_OPTION, "l", "log", "set log level (silent, verbose or timing)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_SWITCH, "n", "new", "create new film", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_OPTION, "c", "content", "add content file", 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 } }; +/** @class App + * @brief The magic App class for wxWidgets. + */ class App : public wxApp { bool OnInit () @@ -643,9 +688,7 @@ class App : public wxApp if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) { try { - film.reset (new Film (film_to_load)); - film->read_metadata (); - film->log()->set_level (log_level); + load_film (film_to_load); } catch (exception& e) { error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), film_to_load, e.what()))); } @@ -654,7 +697,6 @@ class App : public wxApp if (!film_to_create.empty ()) { film.reset (new Film (film_to_create)); film->write_metadata (); - film->log()->set_level (log_level); film->set_name (boost::filesystem::path (film_to_create).filename().generic_string ()); } @@ -675,7 +717,7 @@ class App : public wxApp _timer->Start (1000); if (film) { - _frame->check_film_state_version (film->state_version ()); + check_film_state_version (film->state_version ()); } UpdateChecker::instance()->StateChanged.connect (boost::bind (&App::update_checker_state_changed, this)); @@ -712,14 +754,20 @@ class App : public wxApp content_to_add = wx_to_std (content); } - wxString log; - if (parser.Found (wxT ("log"), &log)) { - log_level = wx_to_std (log); - } - return true; } + bool OnExceptionInMainLoop () + { + error_dialog (0, _("An unknown exception occurred. Please report this problem to the DCP-o-matic author (carl@dcpomatic.com).")); + return false; + } + + void OnUnhandledException () + { + error_dialog (0, _("An unknown exception occurred. Please report this problem to the DCP-o-matic author (carl@dcpomatic.com).")); + } + void idle () { ui_signaller->ui_idle ();