Move ports around to allow master/server to coexist (#962).

[dcpomatic.git] / src / tools / dcpomatic_batch.cc

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 5693c391dfd4fda7329e5b92f2d52a679743e4ff..9b6fdfd8da3239761057e8c6bd035b1e3b04e3b5 100644 (file)
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2015 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/>.
 
 */
 
@@ -35,16 +36,18 @@
 #include <wx/cmdline.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,
@@ -56,7 +59,7 @@ void
 setup_menu (wxMenuBar* m)
 {
        wxMenu* file = new wxMenu;
-       file->Append (ID_file_add_film, _("&Add Film..."));
+       file->Append (ID_file_add_film, _("&Add Film...\tCtrl-A"));
 #ifdef DCPOMATIC_OSX
        file->Append (wxID_EXIT, _("&Exit"));
 #else
@@ -97,23 +100,23 @@ public:
                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),        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);
+               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);
 
                _sizer->Add (buttons, 0, wxALL, 6);
@@ -249,7 +252,7 @@ class JobServer : public Server
 {
 public:
        JobServer (DOMFrame* frame)
-               : Server (Config::instance()->server_port_base() + 2)
+               : Server (BATCH_JOB_PORT)
                , _frame (frame)
        {}
 
@@ -261,6 +264,7 @@ public:
                        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 (...) {
 
                }
@@ -316,13 +320,22 @@ class App : public wxApp
                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 (%2)")), i.string(),
+                                                               e.what()
+                                                               )
+                                                       )
+                                               );
+                               }
                        }
                }
 
@@ -342,8 +355,8 @@ class App : public wxApp
 
        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;