X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_batch.cc;h=3570dda084a2dc0a257c43169db4bf03165b2281;hp=49b341443e4bebaeae755563deae93299efd1d74;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hpb=05654d0e1799746a9df3ccab040c92e0ed825cac diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 49b341443..3570dda08 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -1,44 +1,57 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include -#include -#include -#include +#include "wx/wx_util.h" +#include "wx/about_dialog.h" +#include "wx/wx_signal_manager.h" +#include "wx/job_manager_view.h" +#include "wx/config_dialog.h" +#include "wx/servers_list_dialog.h" #include "lib/version.h" #include "lib/compose.hpp" #include "lib/config.h" #include "lib/util.h" #include "lib/film.h" #include "lib/job_manager.h" -#include "wx/wx_util.h" -#include "wx/wx_ui_signaller.h" -#include "wx/job_manager_view.h" +#include "lib/dcpomatic_socket.h" +#include +#include +#include +#include +#include +#include +#include using std::exception; +using std::string; +using std::cout; using boost::shared_ptr; +using boost::make_shared; +using boost::thread; +using boost::scoped_array; static std::string film_to_load; enum { ID_file_add_film = 1, - ID_file_quit, + ID_tools_encoding_servers, ID_help_about }; @@ -47,52 +60,93 @@ setup_menu (wxMenuBar* m) { wxMenu* file = new wxMenu; file->Append (ID_file_add_film, _("&Add Film...")); - file->Append (ID_file_quit, _("&Quit")); +#ifdef DCPOMATIC_OSX + file->Append (wxID_EXIT, _("&Exit")); +#else + file->Append (wxID_EXIT, _("&Quit")); +#endif + +#ifdef DCPOMATIC_OSX + file->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); +#else + wxMenu* edit = new wxMenu; + edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); +#endif + + wxMenu* tools = new wxMenu; + tools->Append (ID_tools_encoding_servers, _("Encoding servers...")); wxMenu* help = new wxMenu; help->Append (ID_help_about, _("About")); m->Append (file, _("&File")); +#ifndef DCPOMATIC_OSX + m->Append (edit, _("&Edit")); +#endif + m->Append (tools, _("&Tools")); m->Append (help, _("&Help")); } -class Frame : public wxFrame +class DOMFrame : public wxFrame { public: - Frame (wxString const & title) + DOMFrame (wxString const & title) : wxFrame (NULL, -1, title) + , _sizer (new wxBoxSizer (wxVERTICAL)) + , _config_dialog (0) + , _servers_list_dialog (0) { wxMenuBar* bar = new wxMenuBar; setup_menu (bar); SetMenuBar (bar); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_add_film, this), ID_file_add_film); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_quit, this), ID_file_quit); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::help_about, this), ID_help_about); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_add_film, this), ID_file_add_film); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_quit, this), wxID_EXIT); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_encoding_servers, this), ID_tools_encoding_servers); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_about, this), ID_help_about); wxPanel* panel = new wxPanel (this); wxSizer* s = new wxBoxSizer (wxHORIZONTAL); s->Add (panel, 1, wxEXPAND); SetSizer (s); - wxSizer* sizer = new wxBoxSizer (wxVERTICAL); - - JobManagerView* job_manager_view = new JobManagerView (panel, JobManagerView::PAUSE); - sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6); + JobManagerView* job_manager_view = new JobManagerView (panel); + _sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6); wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL); wxButton* add = new wxButton (panel, wxID_ANY, _("Add Film...")); - add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&Frame::add_film, this)); + add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DOMFrame::add_film, this)); buttons->Add (add, 1, wxALL, 6); - sizer->Add (buttons, 0, wxALL, 6); + _sizer->Add (buttons, 0, wxALL, 6); - panel->SetSizer (sizer); + panel->SetSizer (_sizer); - Bind (wxEVT_CLOSE_WINDOW, boost::bind (&Frame::close, this, _1)); + Bind (wxEVT_CLOSE_WINDOW, boost::bind (&DOMFrame::close, this, _1)); + Bind (wxEVT_SIZE, boost::bind (&DOMFrame::sized, this, _1)); + } + + void start_job (boost::filesystem::path path) + { + try { + shared_ptr film = make_shared (path); + film->read_metadata (); + film->make_dcp (); + } catch (std::exception& e) { + wxString p = std_to_wx (path.string ()); + wxCharBuffer b = p.ToUTF8 (); + error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()).data())); + } } private: + void sized (wxSizeEvent& ev) + { + _sizer->Layout (); + ev.Skip (); + } + bool should_close () { if (!JobManager::instance()->work_to_do ()) { @@ -110,7 +164,7 @@ private: d->Destroy (); return r; } - + void close (wxCloseEvent& ev) { if (!should_close ()) { @@ -125,7 +179,7 @@ private: { add_film (); } - + void file_quit () { if (should_close ()) { @@ -133,36 +187,28 @@ private: } } - void help_about () + void edit_preferences () + { + if (!_config_dialog) { + _config_dialog = create_config_dialog (); + } + _config_dialog->Show (this); + } + + void tools_encoding_servers () { - wxAboutDialogInfo info; - info.SetName (_("DCP-o-matic Batch Converter")); - if (strcmp (dcpomatic_git_commit, "release") == 0) { - info.SetVersion (std_to_wx (String::compose ("version %1", dcpomatic_version))); - } else { - info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dcpomatic_version, dcpomatic_git_commit))); + if (!_servers_list_dialog) { + _servers_list_dialog = new ServersListDialog (this); } - info.SetDescription (_("Free, open-source DCP generation from almost anything.")); - info.SetCopyright (_("(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen")); - - wxArrayString authors; - authors.Add (wxT ("Carl Hetherington")); - authors.Add (wxT ("Terrence Meiczinger")); - authors.Add (wxT ("Paul Davis")); - authors.Add (wxT ("Ole Laursen")); - info.SetDevelopers (authors); - - wxArrayString translators; - translators.Add (wxT ("Olivier Perriere")); - translators.Add (wxT ("Lilian Lefranc")); - translators.Add (wxT ("Thierry Journet")); - translators.Add (wxT ("Massimiliano Broggi")); - translators.Add (wxT ("Manuel AC")); - translators.Add (wxT ("Adam Klotblixt")); - info.SetTranslators (translators); - - info.SetWebSite (wxT ("http://carlh.net/software/dcpomatic")); - wxAboutBox (info); + + _servers_list_dialog->Show (); + } + + void help_about () + { + AboutDialog* d = new AboutDialog (this); + d->ShowModal (); + d->Destroy (); } void add_film () @@ -171,7 +217,7 @@ private: if (_last_parent) { c->SetPath (std_to_wx (_last_parent.get().string ())); } - + int r; while (true) { r = c->ShowModal (); @@ -181,17 +227,9 @@ private: break; } } - + if (r == wxID_OK) { - try { - shared_ptr film (new Film (wx_to_std (c->GetPath ()))); - film->read_metadata (); - film->make_dcp (); - } catch (std::exception& e) { - wxString p = c->GetPath (); - wxCharBuffer b = p.ToUTF8 (); - error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()).data())); - } + start_job (wx_to_std (c->GetPath ())); } _last_parent = boost::filesystem::path (wx_to_std (c->GetPath ())).parent_path (); @@ -200,6 +238,9 @@ private: } boost::optional _last_parent; + wxSizer* _sizer; + wxPreferencesEditor* _config_dialog; + ServersListDialog* _servers_list_dialog; }; static const wxCmdLineEntryDesc command_line_description[] = { @@ -207,27 +248,57 @@ static const wxCmdLineEntryDesc command_line_description[] = { { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 } }; +class JobServer : public Server +{ +public: + JobServer (DOMFrame* frame) + : Server (Config::instance()->server_port_base() + 2) + , _frame (frame) + {} + + void handle (shared_ptr socket) + { + try { + int const length = socket->read_uint32 (); + scoped_array buffer (new char[length]); + socket->read (reinterpret_cast (buffer.get()), length); + string s (buffer.get()); + _frame->start_job (s); + socket->write (reinterpret_cast ("OK"), 3); + } catch (...) { + + } + } + +private: + DOMFrame* _frame; +}; + class App : public wxApp { bool OnInit () { + SetAppName (_("DCP-o-matic Batch Converter")); + if (!wxApp::OnInit()) { return false; } - -#ifdef DCPOMATIC_LINUX + +#ifdef DCPOMATIC_LINUX unsetenv ("UBUNTU_MENUPROXY"); -#endif +#endif + + 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 (); @@ -237,12 +308,15 @@ class App : public wxApp */ Config::drop (); - Frame* f = new Frame (_("DCP-o-matic Batch Converter")); + DOMFrame* f = new DOMFrame (_("DCP-o-matic Batch Converter")); SetTopWindow (f); f->Maximize (); f->Show (); - ui_signaller = new wxUISignaller (this); + JobServer* server = new JobServer (f); + new thread (boost::bind (&JobServer::run, server)); + + signal_manager = new wxSignalManager (this); this->Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); shared_ptr film; @@ -261,7 +335,7 @@ class App : public wxApp void idle () { - ui_signaller->ui_idle (); + signal_manager->ui_idle (); } void OnInitCmdLine (wxCmdLineParser& parser)