X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=16c7a08e5e1ef5100c39df55162f6a8fdce43fc1;hb=9af73fe2b9ea2ef82d641d44a995c110f8e61693;hp=c3dd8cd582231739f4b158bd63b24effa458ef66;hpb=38fd8d2d230a239079ffdf3e10a48833ade6e8c5;p=dcpomatic.git diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index c3dd8cd58..16c7a08e5 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 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 @@ -17,62 +17,80 @@ */ -#include -#include -#include -#ifdef __WXMSW__ -#include -#endif -#ifdef __WXOSX__ -#include -#endif -#include -#include -#include -#include -#include +/** @file src/tools/dcpomatic.cc + * @brief The main DCP-o-matic GUI. + */ + #include "wx/film_viewer.h" #include "wx/film_editor.h" #include "wx/job_manager_view.h" #include "wx/config_dialog.h" -#include "wx/job_wrapper.h" #include "wx/wx_util.h" #include "wx/new_film_dialog.h" -#include "wx/properties_dialog.h" -#include "wx/wx_ui_signaller.h" +#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/version.h" -#include "lib/ui_signaller.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/screen_kdm.h" #include "lib/send_kdm_email_job.h" -#include "lib/server_finder.h" -#include "lib/update.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 +#include +#include +#include +#include +#include +#include +#ifdef __WXMSW__ +#include +#endif +#ifdef __WXOSX__ +#include +#endif +#include +#include +#include +#include + +#ifdef check +#undef check +#endif using std::cout; +using std::wcout; using std::string; using std::vector; using std::wstring; +using std::wstringstream; using std::map; using std::make_pair; using std::list; using std::exception; using boost::shared_ptr; using boost::dynamic_pointer_cast; - -// #define DCPOMATIC_WINDOWS_CONSOLE 1 +using dcp::raw_convert; class FilmChangedDialog { @@ -82,6 +100,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. _("Film changed"), wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION ); @@ -100,7 +120,7 @@ public: private: /* Not defined */ FilmChangedDialog (FilmChangedDialog const &); - + wxMessageDialog* _dialog; }; @@ -111,30 +131,37 @@ 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, 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_check_for_updates, + ID_tools_restore_default_preferences, + ID_help_report_a_problem, + /* IDs for shortcuts (with no associated menu item) */ + ID_add_file }; -class Frame : public wxFrame +class DOMFrame : public wxFrame { public: - Frame (wxString const & title) + DOMFrame (wxString const & title) : wxFrame (NULL, -1, title) + , _video_waveform_dialog (0) , _hints_dialog (0) , _servers_list_dialog (0) , _config_dialog (0) @@ -142,58 +169,67 @@ public: , _history_items (0) , _history_position (0) , _history_separator (0) + , _update_news_requested (false) { -#if defined(DCPOMATIC_WINDOWS) && defined(DCPOMATIC_WINDOWS_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"); - setvbuf(hf_in, NULL, _IONBF, 128); - *stdin = *hf_in; +#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"); + setvbuf(hf_in, NULL, _IONBF, 128); + *stdin = *hf_in; + + cout << "DCP-o-matic is starting." << "\n"; + } #endif wxMenuBar* bar = new wxMenuBar; setup_menu (bar); SetMenuBar (bar); - _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&Frame::config_changed, this)); + _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this)); config_changed (); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_new, this), ID_file_new); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_open, this), ID_file_open); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_save, this), ID_file_save); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_properties, this), ID_file_properties); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_history, this, _1), ID_file_history, ID_file_history + HISTORY_SIZE); - 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); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_show_dcp, this), ID_jobs_show_dcp); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::tools_hints, this), ID_tools_hints); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::tools_encoding_servers, this), ID_tools_encoding_servers); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::tools_check_for_updates, this), ID_tools_check_for_updates); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::help_about, this), wxID_ABOUT); - - Bind (wxEVT_CLOSE_WINDOW, boost::bind (&Frame::close, this, _1)); + 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_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); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::content_scale_to_fit_width, this), ID_content_scale_to_fit_width); + 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); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_restore_default_preferences, this), ID_tools_restore_default_preferences); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_about, this), wxID_ABOUT); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem); + + Bind (wxEVT_CLOSE_WINDOW, boost::bind (&DOMFrame::close, this, _1)); /* Use a panel as the only child of the Frame so that we avoid the dark-grey background on Windows. */ wxPanel* overall_panel = new wxPanel (this, wxID_ANY); - _film_editor = new FilmEditor (overall_panel); _film_viewer = new FilmViewer (overall_panel); - JobManagerView* job_manager_view = new JobManagerView (overall_panel, static_cast (0)); + _film_editor = new FilmEditor (overall_panel, _film_viewer); + JobManagerView* job_manager_view = new JobManagerView (overall_panel); wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL); right_sizer->Add (_film_viewer, 2, wxEXPAND | wxALL, 6); @@ -205,12 +241,23 @@ public: set_menu_sensitivity (); - _film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1)); + _film_editor->FileChanged.connect (bind (&DOMFrame::file_changed, this, _1)); file_changed (""); - JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&Frame::set_menu_sensitivity, this)); + JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this)); overall_panel->SetSizer (main_sizer); + + wxAcceleratorEntry accel[1]; + accel[0].Set (wxACCEL_CTRL, static_cast('A'), ID_add_file); + Bind (wxEVT_MENU, boost::bind (&ContentPanel::add_file_clicked, _film_editor->content_panel()), ID_add_file); + wxAcceleratorTable accel_table (1, 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 new_film (boost::filesystem::path path) @@ -225,7 +272,7 @@ public: try { maybe_save_then_delete_film (); - + shared_ptr film (new Film (file)); list const notes = film->read_metadata (); @@ -236,11 +283,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) { @@ -261,7 +308,7 @@ public: shared_ptr film () const { return _film; } - + private: void file_changed (boost::filesystem::path f) @@ -270,15 +317,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())) { @@ -299,11 +346,11 @@ private: ); return; } - + maybe_save_then_delete_film (); new_film (d->get_path ()); } - + d->Destroy (); } @@ -315,7 +362,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 (); @@ -325,7 +372,7 @@ private: break; } } - + if (r == wxID_OK) { load_film (wx_to_std (c->GetPath ())); } @@ -338,13 +385,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 (); @@ -353,7 +393,7 @@ private: load_film (history[n]); } } - + void file_exit () { /* false here allows the close handler to veto the close request */ @@ -368,18 +408,40 @@ private: _config_dialog->Show (this); } + void tools_restore_default_preferences () + { + Config::restore_defaults (); + } + void jobs_make_dcp () { double required; double available; + bool can_hard_link; - if (!_film->should_be_enough_disk_space (required, available)) { - if (!confirm_dialog (this, wxString::Format (_("The DCP for this film will take up about %.1f Gb, and the disk that you are using only has %.1f Gb available. Do you want to continue anyway?"), required, available))) { + if (!_film->should_be_enough_disk_space (required, available, can_hard_link)) { + wxString message; + if (can_hard_link) { + message = wxString::Format (_("The DCP for this film will take up about %.1f Gb, and the disk that you are using only has %.1f Gb available. Do you want to continue anyway?"), required, available); + } else { + message = wxString::Format (_("The DCP and intermediate files for this film will take up about %.1f Gb, and the disk that you are using only has %.1f Gb available. You would need half as much space if the filesystem supported hard links, but it does not. Do you want to continue anyway?"), required, available); + } + if (!confirm_dialog (this, message)) { return; } } - - JobWrapper::make_dcp (this, _film); + + 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. + */ + _film->write_metadata (); + _film->make_dcp (); + } catch (BadSettingError& e) { + error_dialog (this, wxString::Format (_("Bad setting for %s (%s)"), std_to_wx(e.setting()).data(), std_to_wx(e.what()).data())); + } catch (std::exception& e) { + error_dialog (this, wxString::Format (_("Could not make DCP: %s"), std_to_wx(e.what()).data())); + } } void jobs_make_kdms () @@ -387,7 +449,7 @@ private: if (!_film) { return; } - + KDMDialog* d = new KDMDialog (this, _film); if (d->ShowModal () != wxID_OK) { d->Destroy (); @@ -395,27 +457,112 @@ private: } try { + list screen_kdms = _film->make_kdms (d->screens(), d->cpl(), d->from(), d->until(), d->formulation()); if (d->write_to ()) { - write_kdm_files (_film, d->screens (), d->cpl (), d->from (), d->until (), d->formulation (), d->directory ()); + ScreenKDM::write_files ( + _film->name(), + screen_kdms, + d->directory() + ); } else { JobManager::instance()->add ( - shared_ptr (new SendKDMEmailJob (_film, d->screens (), d->cpl (), d->from (), d->until (), d->formulation ())) + shared_ptr (new SendKDMEmailJob ( + _film->name(), + _film->dcp_name(), + d->from(), + d->until(), + CinemaKDMs::collect (screen_kdms), + _film->log() + )) ); } - } catch (libdcp::NotEncryptedError& e) { + } catch (dcp::NotEncryptedError& e) { + error_dialog (this, _("CPL's content is not encrypted.")); + } catch (exception& e) { + error_dialog (this, e.what ()); + } catch (...) { + error_dialog (this, _("An unknown exception occurred.")); + } + + d->Destroy (); + } + + void jobs_make_dcp_batch () + { + if (!_film) { + 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; try again. + i = 3; try again. + */ + for (int i = 0; i < 4; ++i) { + try { + boost::asio::io_service io_service; + boost::asio::ip::tcp::resolver resolver (io_service); + boost::asio::ip::tcp::resolver::query query ("localhost", raw_convert (Config::instance()->server_port_base() + 2)); + boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); + Socket socket (1); + socket.connect (*endpoint_iterator); + string s = _film->directory().string (); + socket.write (s.length() + 1); + socket.write ((uint8_t *) s.c_str(), s.length() + 1); + return; + } catch (...) { + } + + 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; + } + + try { + dcp::EncryptedKDM 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 + ); + + string const name = tidy_for_filename(_film->name()) + "_DKDM.kdm.xml"; + kdm.as_xml (d->directory() / name); + } catch (dcp::NotEncryptedError& e) { error_dialog (this, _("CPL's content is not encrypted.")); } catch (exception& e) { error_dialog (this, e.what ()); } catch (...) { - error_dialog (this, _("An unknown exeception occurred.")); + error_dialog (this, _("An unknown exception occurred.")); } - + d->Destroy (); } void content_scale_to_fit_width () { - VideoContentList vc = _film_editor->selected_video_content (); + 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 (); } @@ -423,12 +570,12 @@ private: void content_scale_to_fit_height () { - VideoContentList vc = _film_editor->selected_video_content (); + 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 () { _film->send_dcp_to_tms (); @@ -436,12 +583,13 @@ private: void jobs_show_dcp () { -#ifdef __WXMSW__ - string d = _film->directory().string (); - wstring w; - w.assign (d.begin(), d.end()); - ShellExecute (0, L"open", w.c_str(), 0, 0, SW_SHOWDEFAULT); -#else +#ifdef DCPOMATIC_WINDOWS + wstringstream args; + args << "/select," << _film->dir (_film->dcp_name(false)); + ShellExecute (0, L"open", L"explorer.exe", args.str().c_str(), 0, SW_SHOWDEFAULT); +#endif + +#ifdef DCPOMATIC_LINUX int r = system ("which nautilus"); if (WEXITSTATUS (r) == 0) { r = system (string ("nautilus " + _film->directory().string()).c_str ()); @@ -457,7 +605,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 + } + + void tools_video_waveform () + { + if (!_video_waveform_dialog) { + _video_waveform_dialog = new VideoWaveformDialog (this, _film_viewer); + } + + _video_waveform_dialog->Show (); } void tools_hints () @@ -481,6 +645,7 @@ private: void tools_check_for_updates () { UpdateChecker::instance()->run (); + _update_news_requested = true; } void help_about () @@ -490,6 +655,15 @@ private: d->Destroy (); } + void help_report_a_problem () + { + ReportProblemDialog* d = new ReportProblemDialog (this, _film); + if (d->ShowModal () == wxID_OK) { + d->report (); + } + d->Destroy (); + } + bool should_close () { if (!JobManager::instance()->work_to_do ()) { @@ -507,7 +681,7 @@ private: d->Destroy (); return r; } - + void close (wxCloseEvent& ev) { if (!should_close ()) { @@ -520,7 +694,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 (); } @@ -529,33 +703,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->selected_video_content().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); } } @@ -565,7 +739,7 @@ private: if (!_film) { return; } - + if (_film->dirty ()) { FilmChangedDialog d (_film->name ()); switch (d.run ()) { @@ -576,7 +750,7 @@ private: break; } } - + _film.reset (); } @@ -585,60 +759,64 @@ private: wxMenuItem* item = menu->Append (id, text); menu_items.insert (make_pair (item, sens)); } - + void setup_menu (wxMenuBar* m) { _file_menu = new wxMenu; - add_item (_file_menu, _("New..."), ID_file_new, ALWAYS); - add_item (_file_menu, _("&Open..."), ID_file_open, ALWAYS); - _file_menu->AppendSeparator (); - add_item (_file_menu, _("&Save"), ID_file_save, NEEDS_FILM); + add_item (_file_menu, _("New...\tCtrl-N"), ID_file_new, ALWAYS); + add_item (_file_menu, _("&Open...\tCtrl-O"), ID_file_open, ALWAYS); _file_menu->AppendSeparator (); - add_item (_file_menu, _("&Properties..."), ID_file_properties, NEEDS_FILM); + add_item (_file_menu, _("&Save\tCtrl-S"), ID_file_save, 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__ - add_item (_file_menu, _("&Preferences..."), wxID_PREFERENCES, ALWAYS); +#endif + +#ifdef __WXOSX__ + add_item (_file_menu, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS); #else wxMenu* edit = new wxMenu; - add_item (edit, _("&Preferences..."), wxID_PREFERENCES, ALWAYS); + 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"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION); - add_item (jobs_menu, _("Make &KDMs..."), ID_jobs_make_kdms, NEEDS_FILM); + 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); - + 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 - +#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")); @@ -658,15 +836,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) { @@ -678,9 +856,38 @@ private: _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; @@ -690,6 +897,7 @@ private: int _history_position; wxMenuItem* _history_separator; boost::signals2::scoped_connection _config_changed_connection; + bool _update_news_requested; }; static const wxCmdLineEntryDesc command_line_description[] = { @@ -699,38 +907,65 @@ static const wxCmdLineEntryDesc command_line_description[] = { { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 } }; +/** @class App + * @brief The magic App class for wxWidgets. + */ class App : public wxApp { +public: + App () + : wxApp () + , _frame (0) + {} + +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 object will be wrong, however, because dcpomatic_setup - hasn't yet been called and there aren't any scalers, filters etc. + hasn't yet been called and there aren't any filters etc. set up yet. */ dcpomatic_setup_i18n (); - /* Set things up, including scalers / filters etc. + /* Set things up, including filters etc. which will now be internationalised correctly. */ dcpomatic_setup (); @@ -740,9 +975,12 @@ class App : public wxApp */ Config::drop (); - _frame = new Frame (_("DCP-o-matic")); + _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)) { @@ -760,14 +998,13 @@ class App : public wxApp } } - ui_signaller = new wxUISignaller (this); + signal_manager = new wxSignalManager (this); Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); Bind (wxEVT_TIMER, boost::bind (&App::check, this)); _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 (); } @@ -804,69 +1041,60 @@ class App : public wxApp 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 (%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). Please report this problem to the DCP-o-matic author (carl@dcpomatic.com)."), e.what ())); + 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. Please report this problem to the DCP-o-matic author (carl@dcpomatic.com).")); + 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. Please report this problem to the DCP-o-matic author (carl@dcpomatic.com).")); + report_exception (); } void idle () { - ui_signaller->ui_idle (); + signal_manager->ui_idle (); } 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 () - { - switch (UpdateChecker::instance()->state ()) { - case UpdateChecker::YES: - { - string test; - if (Config::instance()->check_for_test_updates ()) { - test = UpdateChecker::instance()->test (); - } - UpdateDialog* dialog = new UpdateDialog (_frame, UpdateChecker::instance()->stable (), test); - dialog->ShowModal (); - dialog->Destroy (); - break; - } - case UpdateChecker::NO: - if (!UpdateChecker::instance()->last_emit_was_first ()) { - error_dialog (_frame, _("There are no new versions of DCP-o-matic available.")); - } - break; - case UpdateChecker::FAILED: - if (!UpdateChecker::instance()->last_emit_was_first ()) { - error_dialog (_frame, _("The DCP-o-matic download server could not be contacted.")); - } - default: - break; - } - } - - Frame* _frame; + DOMFrame* _frame; shared_ptr _timer; string _film_to_load; string _film_to_create;