/*
- Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
-#include <wx/aboutdlg.h>
-#include <wx/stdpaths.h>
-#include <wx/cmdline.h>
-#include <wx/wx.h>
+#include "wx/wx_util.h"
+#include "wx/about_dialog.h"
+#include "wx/wx_signal_manager.h"
+#include "wx/job_manager_view.h"
+#include "wx/full_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/about_dialog.h"
-#include "wx/wx_signal_manager.h"
-#include "wx/job_manager_view.h"
+#include "lib/job.h"
+#include "lib/dcpomatic_socket.h"
+#include <wx/aboutdlg.h>
+#include <wx/stdpaths.h>
+#include <wx/cmdline.h>
+#include <wx/splash.h>
+#include <wx/preferences.h>
+#include <wx/wx.h>
+#include <boost/foreach.hpp>
+#include <iostream>
using std::exception;
+using std::string;
+using std::cout;
+using std::list;
using boost::shared_ptr;
+using boost::thread;
+using boost::scoped_array;
-static std::string film_to_load;
+static list<boost::filesystem::path> films_to_load;
enum {
ID_file_add_film = 1,
- ID_file_quit,
+ ID_tools_encoding_servers,
ID_help_about
};
setup_menu (wxMenuBar* m)
{
wxMenu* file = new wxMenu;
- file->Append (ID_file_add_film, _("&Add Film..."));
- file->Append (ID_file_quit, _("&Quit"));
+ file->Append (ID_file_add_film, _("&Add Film...\tCtrl-A"));
+#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 DOMFrame : public wxFrame
{
public:
- DOMFrame (wxString const & title)
+ explicit 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 (&DOMFrame::file_add_film, this), ID_file_add_film);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_quit, this), ID_file_quit);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_about, this), ID_help_about);
+ Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this, _1));
+
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_add_film, this), ID_file_add_film);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_quit, this), wxID_EXIT);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_encoding_servers, this), ID_tools_encoding_servers);
+ Bind (wxEVT_MENU, 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);
- JobManagerView* job_manager_view = new JobManagerView (panel);
+ JobManagerView* job_manager_view = new JobManagerView (panel, true);
_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 (&DOMFrame::add_film, this));
+ add->Bind (wxEVT_BUTTON, boost::bind (&DOMFrame::add_film, this));
buttons->Add (add, 1, wxALL, 6);
+ _pause = new wxButton (panel, wxID_ANY, _("Pause"));
+ _pause->Bind (wxEVT_BUTTON, boost::bind(&DOMFrame::pause, this));
+ buttons->Add (_pause, 1, wxALL, 6);
+ _resume = new wxButton (panel, wxID_ANY, _("Resume"));
+ _resume->Bind (wxEVT_BUTTON, boost::bind(&DOMFrame::resume, this));
+ buttons->Add (_resume, 1, wxALL, 6);
+
+ setup_sensitivity ();
_sizer->Add (buttons, 0, wxALL, 6);
Bind (wxEVT_SIZE, boost::bind (&DOMFrame::sized, this, _1));
}
+ void setup_sensitivity ()
+ {
+ _pause->Enable (!JobManager::instance()->paused());
+ _resume->Enable (JobManager::instance()->paused());
+ }
+
+ void pause ()
+ {
+ JobManager::instance()->pause ();
+ setup_sensitivity ();
+ }
+
+ void resume ()
+ {
+ JobManager::instance()->resume ();
+ setup_sensitivity ();
+ }
+
+ void start_job (boost::filesystem::path path)
+ {
+ try {
+ shared_ptr<Film> film (new Film (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"), p.data()), std_to_wx(e.what()));
+ }
+ }
+
private:
void sized (wxSizeEvent& ev)
{
}
}
+ void edit_preferences ()
+ {
+ if (!_config_dialog) {
+ _config_dialog = create_full_config_dialog ();
+ }
+ _config_dialog->Show (this);
+ }
+
+ 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);
}
if (r == wxID_OK) {
- try {
- shared_ptr<Film> 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 ();
c->Destroy ();
}
+ void config_changed (Config::Property what)
+ {
+ /* Instantly save any config changes when using the DCP-o-matic GUI */
+ if (what == Config::CINEMAS) {
+ try {
+ Config::instance()->write_cinemas();
+ } catch (exception& e) {
+ error_dialog (
+ this,
+ wxString::Format (
+ _("Could not write to cinemas file at %s. Your changes have not been saved."),
+ std_to_wx (Config::instance()->cinemas_file().string()).data()
+ )
+ );
+ }
+ } else {
+ try {
+ Config::instance()->write_config();
+ } catch (exception& e) {
+ error_dialog (
+ this,
+ wxString::Format (
+ _("Could not write to config file at %s. Your changes have not been saved."),
+ std_to_wx (Config::instance()->cinemas_file().string()).data()
+ )
+ );
+ }
+ }
+ }
+
boost::optional<boost::filesystem::path> _last_parent;
wxSizer* _sizer;
+ wxPreferencesEditor* _config_dialog;
+ ServersListDialog* _servers_list_dialog;
+ wxButton* _pause;
+ wxButton* _resume;
};
static const wxCmdLineEntryDesc command_line_description[] = {
{ wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
};
+class JobServer : public Server
+{
+public:
+ explicit JobServer (DOMFrame* frame)
+ : Server (BATCH_JOB_PORT)
+ , _frame (frame)
+ {}
+
+ void handle (shared_ptr<Socket> socket)
+ {
+ try {
+ int const length = socket->read_uint32 ();
+ scoped_array<char> buffer (new char[length]);
+ socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
+ string s (buffer.get());
+ _frame->start_job (s);
+ socket->write (reinterpret_cast<uint8_t const *> ("OK"), 3);
+ } catch (...) {
+
+ }
+ }
+
+private:
+ DOMFrame* _frame;
+};
+
class App : public wxApp
{
bool OnInit ()
{
+ SetAppName (_("DCP-o-matic Batch Converter"));
+ is_batch_converter = true;
+
+ Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+ Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
+
+ wxSplashScreen* splash = maybe_show_splash ();
+
if (!wxApp::OnInit()) {
return false;
}
unsetenv ("UBUNTU_MENUPROXY");
#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
*/
Config::drop ();
- DOMFrame* f = new DOMFrame (_("DCP-o-matic Batch Converter"));
- SetTopWindow (f);
- f->Maximize ();
- f->Show ();
+ _frame = new DOMFrame (_("DCP-o-matic Batch Converter"));
+ SetTopWindow (_frame);
+ _frame->Maximize ();
+ if (splash) {
+ splash->Destroy ();
+ }
+ _frame->Show ();
+
+ JobServer* server = new JobServer (_frame);
+ new thread (boost::bind (&JobServer::run, server));
signal_manager = new wxSignalManager (this);
this->Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
shared_ptr<Film> film;
- if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) {
- try {
- film.reset (new Film (film_to_load));
- film->read_metadata ();
- film->make_dcp ();
- } 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())));
+ BOOST_FOREACH (boost::filesystem::path i, films_to_load) {
+ if (boost::filesystem::is_directory (i)) {
+ try {
+ film.reset (new Film (i));
+ film->read_metadata ();
+ film->make_dcp ();
+ } catch (exception& e) {
+ error_dialog (
+ 0,
+ std_to_wx (String::compose (wx_to_std (_("Could not load film %1")), i.string())),
+ std_to_wx(e.what())
+ );
+ }
}
}
bool OnCmdLineParsed (wxCmdLineParser& parser)
{
- if (parser.GetParamCount() > 0) {
- film_to_load = wx_to_std (parser.GetParam(0));
+ for (size_t i = 0; i < parser.GetParamCount(); ++i) {
+ films_to_load.push_back (wx_to_std (parser.GetParam(i)));
}
return true;
}
+
+ void config_failed_to_load ()
+ {
+ message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create."));
+ }
+
+ void config_warning (string m)
+ {
+ message_dialog (_frame, std_to_wx (m));
+ }
+
+ DOMFrame* _frame;
};
IMPLEMENT_APP (App)