X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=5abf47182a89a46e44dc131256c4678b062cffcb;hb=d2bd0c628fd0616fe3b7dd02bd955b2c07ab48d5;hp=5fea90504be49b9a7009224eb36ee903ad3360f3;hpb=1420c529d7e196f96ddf9580efdc09fa01c55d58;p=dcpomatic.git diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 5fea90504..5abf47182 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -21,28 +21,12 @@ * @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" #include "wx/config_dialog.h" #include "wx/wx_util.h" #include "wx/new_film_dialog.h" -#include "wx/properties_dialog.h" #include "wx/wx_signal_manager.h" #include "wx/about_dialog.h" #include "wx/kdm_dialog.h" @@ -51,11 +35,30 @@ #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/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/kdm.h" +#include "lib/send_kdm_email_job.h" +#include "lib/server_finder.h" +#include "lib/update_checker.h" +#include "lib/cross.h" +#include "lib/content_factory.h" +#include "lib/compose.hpp" #include #include #include #include #include +#include #ifdef __WXMSW__ #include #endif @@ -92,9 +95,8 @@ 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 ); @@ -113,7 +115,7 @@ public: private: /* Not defined */ FilmChangedDialog (FilmChangedDialog const &); - + wxMessageDialog* _dialog; }; @@ -124,12 +126,11 @@ private: #define NEEDS_SELECTED_VIDEO_CONTENT 0x8 map menu_items; - + enum { ID_file_new = 1, ID_file_open, ID_file_save, - ID_file_properties, ID_file_history, /* Allow spare IDs after _history for the recent files list */ ID_content_scale_to_fit_width = 100, @@ -138,6 +139,7 @@ enum { ID_jobs_make_kdms, 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, @@ -152,6 +154,7 @@ 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) @@ -163,13 +166,13 @@ public: #if defined(DCPOMATIC_WINDOWS) if (Config::instance()->win32_console ()) { AllocConsole(); - + HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE); int hCrt = _open_osfhandle((intptr_t) handle_out, _O_TEXT); FILE* hf_out = _fdopen(hCrt, "w"); setvbuf(hf_out, NULL, _IONBF, 1); *stdout = *hf_out; - + HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE); hCrt = _open_osfhandle((intptr_t) handle_in, _O_TEXT); FILE* hf_in = _fdopen(hCrt, "r"); @@ -190,7 +193,6 @@ public: Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_new, this), ID_file_new); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_open, this), ID_file_open); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_save, this), ID_file_save); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_properties, this), ID_file_properties); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_history, this, _1), ID_file_history, ID_file_history + HISTORY_SIZE); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES); @@ -200,6 +202,7 @@ public: 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_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); @@ -257,7 +260,7 @@ public: try { maybe_save_then_delete_film (); - + shared_ptr film (new Film (file)); list const notes = film->read_metadata (); @@ -268,11 +271,11 @@ public: "in this version. Please check the film's settings carefully.") ); } - + for (list::const_iterator i = notes.begin(); i != notes.end(); ++i) { error_dialog (0, std_to_wx (*i)); } - + set_film (film); } catch (std::exception& e) { @@ -293,7 +296,7 @@ public: shared_ptr film () const { return _film; } - + private: void file_changed (boost::filesystem::path f) @@ -302,15 +305,15 @@ private: if (!f.empty ()) { s += " - " + f.string (); } - + SetTitle (std_to_wx (s)); } - + void file_new () { NewFilmDialog* d = new NewFilmDialog (this); int const r = d->ShowModal (); - + if (r == wxID_OK) { if (boost::filesystem::is_directory (d->get_path()) && !boost::filesystem::is_empty(d->get_path())) { @@ -331,11 +334,11 @@ private: ); return; } - + maybe_save_then_delete_film (); new_film (d->get_path ()); } - + d->Destroy (); } @@ -347,7 +350,7 @@ private: std_to_wx (Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST ); - + int r; while (true) { r = c->ShowModal (); @@ -357,7 +360,7 @@ private: break; } } - + if (r == wxID_OK) { load_film (wx_to_std (c->GetPath ())); } @@ -370,13 +373,6 @@ private: _film->write_metadata (); } - void file_properties () - { - PropertiesDialog* d = new PropertiesDialog (this, _film); - d->ShowModal (); - d->Destroy (); - } - void file_history (wxCommandEvent& event) { vector history = Config::instance()->history (); @@ -385,7 +381,7 @@ private: load_film (history[n]); } } - + void file_exit () { /* false here allows the close handler to veto the close request */ @@ -441,7 +437,7 @@ private: if (!_film) { return; } - + KDMDialog* d = new KDMDialog (this, _film); if (d->ShowModal () != wxID_OK) { d->Destroy (); @@ -463,7 +459,7 @@ private: } catch (...) { error_dialog (this, _("An unknown exception occurred.")); } - + d->Destroy (); } @@ -482,7 +478,7 @@ private: (*i)->scale_and_crop_to_fit_height (); } } - + void jobs_send_dcp_to_tms () { _film->send_dcp_to_tms (); @@ -512,14 +508,23 @@ private: } } } -#endif +#endif #ifdef DCPOMATIC_OSX int r = system (string ("open -R " + _film->dir (_film->dcp_name (false)).string ()).c_str ()); if (WEXITSTATUS (r)) { error_dialog (this, _("Could not show DCP")); } -#endif +#endif + } + + void tools_video_waveform () + { + if (!_video_waveform_dialog) { + _video_waveform_dialog = new VideoWaveformDialog (this, _film_viewer); + } + + _video_waveform_dialog->Show (); } void tools_hints () @@ -578,7 +583,7 @@ private: d->Destroy (); return r; } - + void close (wxCloseEvent& ev) { if (!should_close ()) { @@ -591,7 +596,7 @@ private: 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 (); } @@ -600,33 +605,33 @@ 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 (); 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) { 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); } } @@ -636,7 +641,7 @@ private: if (!_film) { return; } - + if (_film->dirty ()) { FilmChangedDialog d (_film->name ()); switch (d.run ()) { @@ -647,7 +652,7 @@ private: break; } } - + _film.reset (); } @@ -656,7 +661,7 @@ private: wxMenuItem* item = menu->Append (id, text); menu_items.insert (make_pair (item, sens)); } - + void setup_menu (wxMenuBar* m) { _file_menu = new wxMenu; @@ -664,22 +669,20 @@ private: add_item (_file_menu, _("&Open...\tCtrl-O"), ID_file_open, ALWAYS); _file_menu->AppendSeparator (); add_item (_file_menu, _("&Save\tCtrl-S"), ID_file_save, NEEDS_FILM); - _file_menu->AppendSeparator (); - add_item (_file_menu, _("&Properties..."), ID_file_properties, NEEDS_FILM); _history_position = _file_menu->GetMenuItems().GetCount(); -#ifndef __WXOSX__ +#ifndef __WXOSX__ _file_menu->AppendSeparator (); #endif - -#ifdef __WXOSX__ + +#ifdef __WXOSX__ add_item (_file_menu, _("&Exit"), wxID_EXIT, ALWAYS); #else add_item (_file_menu, _("&Quit"), wxID_EXIT, ALWAYS); -#endif - -#ifdef __WXOSX__ +#endif + +#ifdef __WXOSX__ add_item (_file_menu, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS); #else wxMenu* edit = new wxMenu; @@ -689,7 +692,7 @@ private: 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 &KDMs...\tCtrl-K"), ID_jobs_make_kdms, NEEDS_FILM); @@ -697,22 +700,23 @@ private: 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); tools->AppendSeparator (); add_item (tools, _("Restore default preferences"), ID_tools_restore_default_preferences, ALWAYS); - + wxMenu* help = new wxMenu; -#ifdef __WXOSX__ +#ifdef __WXOSX__ add_item (help, _("About DCP-o-matic"), wxID_ABOUT, ALWAYS); -#else +#else add_item (help, _("About"), wxID_ABOUT, ALWAYS); -#endif - add_item (help, _("Report a problem..."), ID_help_report_a_problem, ALWAYS); - +#endif + add_item (help, _("Report a problem..."), ID_help_report_a_problem, NEEDS_FILM); + m->Append (_file_menu, _("&File")); -#ifndef __WXOSX__ +#ifndef __WXOSX__ m->Append (edit, _("&Edit")); #endif m->Append (content, _("&Content")); @@ -732,15 +736,15 @@ private: } delete _history_separator; _history_separator = 0; - + int pos = _history_position; - + vector history = Config::instance()->history (); - + if (!history.empty ()) { _history_separator = _file_menu->InsertSeparator (pos++); } - + for (size_t i = 0; i < history.size(); ++i) { SafeStringStream s; if (i < 9) { @@ -752,9 +756,10 @@ private: _history_items = history.size (); } - + FilmEditor* _film_editor; FilmViewer* _film_viewer; + VideoWaveformDialog* _video_waveform_dialog; HintsDialog* _hints_dialog; ServersListDialog* _servers_list_dialog; wxPreferencesEditor* _config_dialog; @@ -784,28 +789,44 @@ public: , _frame (0) {} -private: - +private: + bool OnInit () try { + wxInitAllImageHandlers (); + + wxSplashScreen* splash = 0; + try { + if (!Config::have_existing ()) { + 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()) { return false; } - -#ifdef DCPOMATIC_LINUX + +#ifdef DCPOMATIC_LINUX unsetenv ("UBUNTU_MENUPROXY"); #endif -#ifdef __WXOSX__ +#ifdef __WXOSX__ ProcessSerialNumber serial; GetCurrentProcess (&serial); TransformProcessType (&serial, kProcessTransformToForegroundApplication); -#endif +#endif - wxInitAllImageHandlers (); + dcpomatic_setup_path_encoding (); /* Enable i18n; this will create a Config object to look for a force-configured language. This Config @@ -828,6 +849,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)) { @@ -895,7 +919,7 @@ private: 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), e.what(), e.file().string().c_str ())); } catch (exception& e) { error_dialog (0, wxString::Format (_("An exception occurred: %s.\n\n"), e.what ()) + " " + REPORT_PROBLEM); } catch (...) { @@ -905,7 +929,7 @@ private: /* This will terminate the program */ return false; } - + void OnUnhandledException () { error_dialog (0, _("An unknown exception occurred.") + " " + REPORT_PROBLEM);