X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=891c4623ca9b6e1ea1ac995d41108d119468e72f;hb=ad49361b303d1ceff7048fa0e89ba609ca9ce376;hp=98501d3bb13d9e4f178a42d2defd02fe803e97ab;hpb=a472eb27d82b1ac535fab599f8d56fdee6a9550e;p=dcpomatic.git diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 98501d3bb..891c4623c 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2013 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 @@ -39,6 +39,9 @@ #include "wx/properties_dialog.h" #include "wx/wx_ui_signaller.h" #include "wx/about_dialog.h" +#include "wx/kdm_dialog.h" +#include "wx/servers_list_dialog.h" +#include "wx/hints_dialog.h" #include "lib/film.h" #include "lib/config.h" #include "lib/util.h" @@ -47,6 +50,11 @@ #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" using std::cout; using std::string; @@ -56,7 +64,6 @@ using std::map; using std::make_pair; using std::list; using std::exception; -using std::ofstream; using boost::shared_ptr; using boost::dynamic_pointer_cast; @@ -125,6 +132,7 @@ maybe_save_then_delete_film () #define ALWAYS 0x0 #define NEEDS_FILM 0x1 #define NOT_DURING_DCP_CREATION 0x2 +#define NEEDS_DCP 0x4 map menu_items; @@ -143,7 +151,8 @@ set_menu_sensitivity () while (i != jobs.end() && dynamic_pointer_cast (*i) == 0) { ++i; } - bool const dcp_creation = (i != jobs.end ()); + 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) { @@ -156,6 +165,10 @@ set_menu_sensitivity () if ((j->second & NOT_DURING_DCP_CREATION) && dcp_creation) { enabled = false; } + + if ((j->second & NEEDS_DCP) && !have_dcp) { + enabled = false; + } j->first->Enable (enabled); } @@ -167,8 +180,11 @@ enum { ID_file_save, ID_file_properties, ID_jobs_make_dcp, + ID_jobs_make_kdms, ID_jobs_send_dcp_to_tms, ID_jobs_show_dcp, + ID_tools_hints, + ID_tools_encoding_servers, }; void @@ -201,8 +217,13 @@ setup_menu (wxMenuBar* m) jobs_menu = new wxMenu; add_item (jobs_menu, _("&Make DCP"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION); - add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION); - add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_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); + + wxMenu* tools = new wxMenu; + add_item (tools, _("Hints..."), ID_tools_hints, 0); + add_item (tools, _("Encoding Servers..."), ID_tools_encoding_servers, 0); wxMenu* help = new wxMenu; #ifdef __WXOSX__ @@ -216,6 +237,7 @@ setup_menu (wxMenuBar* m) m->Append (edit, _("&Edit")); #endif m->Append (jobs_menu, _("&Jobs")); + m->Append (tools, _("&Tools")); m->Append (help, _("&Help")); } @@ -224,23 +246,43 @@ class Frame : public wxFrame public: Frame (wxString const & title) : wxFrame (NULL, -1, title) + , _hints_dialog (0) + , _servers_list_dialog (0) { +#ifdef 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; +#endif + wxMenuBar* bar = new wxMenuBar; setup_menu (bar); SetMenuBar (bar); - 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_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::jobs_make_dcp, this), ID_jobs_make_dcp); - 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::help_about, this), wxID_ABOUT); - - Bind (wxEVT_MENU_OPEN, boost::bind (&Frame::menu_opened, this, _1)); + 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_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::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::help_about, this), wxID_ABOUT); + Bind (wxEVT_CLOSE_WINDOW, boost::bind (&Frame::close, this, _1)); /* Use a panel as the only child of the Frame so that we avoid @@ -277,17 +319,6 @@ public: private: - void menu_opened (wxMenuEvent& ev) - { - if (ev.GetMenu() != jobs_menu) { - return; - } - - bool const have_dcp = film && film->have_dcp(); - jobs_menu->Enable (ID_jobs_send_dcp_to_tms, have_dcp); - jobs_menu->Enable (ID_jobs_show_dcp, have_dcp); - } - void set_film () { film_viewer->set_film (film); @@ -295,12 +326,12 @@ private: set_menu_sensitivity (); } - void file_changed (string f) + void file_changed (boost::filesystem::path f) { stringstream s; s << wx_to_std (_("DCP-o-matic")); if (!f.empty ()) { - s << " - " << f; + s << " - " << f.string (); } SetTitle (std_to_wx (s.str())); @@ -319,7 +350,7 @@ private: std_to_wx ( String::compose (wx_to_std (_("The directory %1 already exists and is not empty. " "Are you sure you want to use it?")), - d->get_path().c_str()) + d->get_path().string().c_str()) ) )) { return; @@ -345,7 +376,13 @@ private: void file_open () { - wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST); + wxDirDialog* c = new wxDirDialog ( + this, + _("Select film to open"), + 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 (1) { r = c->ShowModal (); @@ -407,6 +444,33 @@ private: { JobWrapper::make_dcp (this, film); } + + void jobs_make_kdms () + { + if (!film) { + return; + } + + KDMDialog* d = new KDMDialog (this, film); + if (d->ShowModal () != wxID_OK) { + d->Destroy (); + return; + } + + try { + if (d->write_to ()) { + write_kdm_files (film, d->screens (), d->dcp (), d->from (), d->until (), d->directory ()); + } else { + JobManager::instance()->add ( + shared_ptr (new SendKDMEmailJob (film, d->screens (), d->dcp (), d->from (), d->until ())) + ); + } + } catch (KDMError& e) { + error_dialog (this, e.what ()); + } + + d->Destroy (); + } void jobs_send_dcp_to_tms () { @@ -416,21 +480,21 @@ private: void jobs_show_dcp () { #ifdef __WXMSW__ - string d = film->directory(); + 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 int r = system ("which nautilus"); if (WEXITSTATUS (r) == 0) { - r = system (string ("nautilus " + film->directory()).c_str ()); + r = system (string ("nautilus " + film->directory().string()).c_str ()); if (WEXITSTATUS (r)) { error_dialog (this, _("Could not show DCP (could not run nautilus)")); } } else { int r = system ("which konqueror"); if (WEXITSTATUS (r) == 0) { - r = system (string ("konqueror " + film->directory()).c_str ()); + r = system (string ("konqueror " + film->directory().string()).c_str ()); if (WEXITSTATUS (r)) { error_dialog (this, _("Could not show DCP (could not run konqueror)")); } @@ -439,6 +503,24 @@ private: #endif } + void tools_hints () + { + if (!_hints_dialog) { + _hints_dialog = new HintsDialog (this, film); + } + + _hints_dialog->Show (); + } + + void tools_encoding_servers () + { + if (!_servers_list_dialog) { + _servers_list_dialog = new ServersListDialog (this); + } + + _servers_list_dialog->Show (); + } + void help_about () { AboutDialog* d = new AboutDialog (this); @@ -471,31 +553,29 @@ private: return; } + maybe_save_then_delete_film (); + ev.Skip (); - } + } + + HintsDialog* _hints_dialog; + ServersListDialog* _servers_list_dialog; }; -#if wxMINOR_VERSION == 9 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_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 } }; -#else -static const wxCmdLineEntryDesc command_line_description[] = { - { wxCMD_LINE_OPTION, wxT("l"), wxT("log"), wxT("set log level (silent, verbose or timing)"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, - { wxCMD_LINE_SWITCH, wxT("n"), wxT("new"), wxT("create new film"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, - { wxCMD_LINE_PARAM, 0, 0, wxT("film to load or create"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL }, - { wxCMD_LINE_NONE, wxT(""), wxT(""), wxT(""), wxCmdLineParamType (0), 0 } -}; -#endif class App : public wxApp { bool OnInit () try { + SetAppName (_("DCP-o-matic")); + if (!wxApp::OnInit()) { return false; } @@ -553,8 +633,12 @@ class App : public wxApp f->Show (); ui_signaller = new wxUISignaller (this); - this->Bind (wxEVT_IDLE, boost::bind (&App::idle, 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); + return true; } catch (exception& e) @@ -591,6 +675,17 @@ class App : public wxApp { ui_signaller->ui_idle (); } + + void check () + { + try { + ServerFinder::instance()->rethrow (); + } catch (exception& e) { + error_dialog (0, std_to_wx (e.what ())); + } + } + + shared_ptr _timer; }; IMPLEMENT_APP (App)