From ba003c2a760d0635c818fdc19114b85026df9d81 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 12 Nov 2013 00:03:24 +0000
Subject: Tweak formatting of help().

---
 src/tools/dcpomatic_cli.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 90e11a9d1..c40ea6662 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -47,9 +47,9 @@ help (string n)
 {
 	cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
 	     << "  -v, --version      show DCP-o-matic version\n"
-	     << "  -h, --help	      show this help\n"
-	     << "  -d, --deps	      list DCP-o-matic dependency details and quit\n"
-	     << "  -f, --flags	      show flags passed to C++ compiler on build\n"
+	     << "  -h, --help         show this help\n"
+	     << "  -d, --deps         list DCP-o-matic dependency details and quit\n"
+	     << "  -f, --flags        show flags passed to C++ compiler on build\n"
 	     << "  -n, --no-progress  do not print progress to stdout\n"
 	     << "  -r, --no-remote    do not use any remote servers\n"
 	     << "\n"
-- 
cgit v1.2.3


From a02d443281f372cb247b1b48581a63c78db80402 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 12 Nov 2013 21:45:33 +0000
Subject: Fix bad_alloc exception on audio analysis (and probably elsewhere).

---
 ChangeLog         |  5 +++++
 src/lib/player.cc | 12 +++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/ChangeLog b/ChangeLog
index 4e964d5c8..63d2c597e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-12  Carl Hetherington  <cth@carlh.net>
+
+	* Fix bad_alloc exception on audio analysis (and
+	probably elsewhere).
+
 2013-11-11  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.28 released.
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 97d2cbdc0..b5a961631 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -221,20 +221,22 @@ Player::pass ()
 	}
 
 	if (_audio) {
-		Time audio_done_up_to = TIME_MAX;
+		boost::optional<Time> audio_done_up_to;
 		for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
 			if ((*i)->decoder->done ()) {
 				continue;
 			}
 
 			if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
-				audio_done_up_to = min (audio_done_up_to, (*i)->audio_position);
+				audio_done_up_to = min (audio_done_up_to.get_value_or (TIME_MAX), (*i)->audio_position);
 			}
 		}
 
-		TimedAudioBuffers<Time> tb = _audio_merger.pull (audio_done_up_to);
-		Audio (tb.audio, tb.time);
-		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
+		if (audio_done_up_to) {
+			TimedAudioBuffers<Time> tb = _audio_merger.pull (audio_done_up_to.get ());
+			Audio (tb.audio, tb.time);
+			_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
+		}
 	}
 		
 	return false;
-- 
cgit v1.2.3


From df13b914914ed7440be29edc51e4c23370ccb622 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 13 Nov 2013 10:47:54 +0000
Subject: Disable pause/resume button after job cancellation.

---
 src/wx/job_manager_view.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 47af3b48c..1b9e281a7 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -44,6 +44,7 @@ public:
 		, _window (window)
 		, _panel (panel)
 		, _table (table)
+		, _pause (0)
 	{
 		int n = 0;
 		
@@ -133,6 +134,9 @@ private:
 		}
 		
 		_cancel->Enable (false);
+		if (_pause) {
+			_pause->Enable (false);
+		}
 		if (!_job->error_details().empty ()) {
 			_details->Enable (true);
 		}
-- 
cgit v1.2.3


From 670cb0ea8154ab8b62f231448827006ff126f93f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 13 Nov 2013 11:42:02 +0000
Subject: Fix small error in fr_FR translation.

---
 src/lib/po/fr_FR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 3243dc64c..6023f6377 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -88,7 +88,7 @@ msgstr "Une erreur s'est produite lors du traitement du fichier %1."
 #: src/lib/analyse_audio_job.cc:48
 #, fuzzy
 msgid "Analyse audio"
-msgstr "Analyse du son de %1"
+msgstr "Analyse du son"
 
 #: src/lib/scaler.cc:64
 msgid "Area"
-- 
cgit v1.2.3


From 0eed8c6c205fe85fb1094d7a9b0a2f3d7eeeb698 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 13 Nov 2013 21:30:16 +0000
Subject: Trim logging slightly.

---
 src/lib/encoder.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index ecbf2e5bf..059c4014c 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -277,7 +277,7 @@ Encoder::encoder_thread (optional<ServerDescription> server)
 
 		TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
 		shared_ptr<DCPVideoFrame> vf = _queue.front ();
-		_film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 (%3) from queue"), boost::this_thread::get_id(), vf->frame(), vf->eyes ()));
+		TIMING ("encoder thread %1 pops frame %2 (%3) from queue", boost::this_thread::get_id(), vf->frame(), vf->eyes ());
 		_queue.pop_front ();
 		
 		lock.unlock ();
-- 
cgit v1.2.3


From f60d6f84708e2ff568089732cb9fbdbdc8cef3db Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 14 Nov 2013 11:39:10 +0000
Subject: Add server configuration back in.

---
 ChangeLog                |  4 +++
 src/lib/config.cc        | 28 ++++++++++++++++++++
 src/lib/config.h         | 26 +++++++++++++++++-
 src/lib/server_finder.cc | 26 +++++++++++++++---
 src/wx/config_dialog.cc  | 41 ++++++++++++++++++++++++++++
 src/wx/config_dialog.h   |  6 +++++
 src/wx/server_dialog.cc  | 69 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/wx/server_dialog.h   | 32 ++++++++++++++++++++++
 src/wx/wscript           |  1 +
 9 files changed, 228 insertions(+), 5 deletions(-)
 create mode 100644 src/wx/server_dialog.cc
 create mode 100644 src/wx/server_dialog.h

(limited to 'src')

diff --git a/ChangeLog b/ChangeLog
index 6725d35b0..03c8bb029 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-14  Carl Hetherington  <cth@carlh.net>
+
+	* Add server configuration back in.
+
 2013-11-12  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.29 released.
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 1a7c64405..777d4114d 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -22,6 +22,7 @@
 #include <fstream>
 #include <glib.h>
 #include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
 #include <libdcp/colour_matrix.h>
 #include <libcxml/cxml.h>
 #include "config.h"
@@ -48,6 +49,8 @@ using std::cerr;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::optional;
+using boost::algorithm::is_any_of;
+using boost::algorithm::split;
 
 Config* Config::_instance = 0;
 
@@ -55,6 +58,7 @@ Config* Config::_instance = 0;
 Config::Config ()
 	: _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency()))
 	, _server_port_base (6192)
+	, _use_any_servers (true)
 	, _tms_path (".")
 	, _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
 	, _default_still_length (10)
@@ -101,6 +105,18 @@ Config::read ()
 		b = f.optional_number_child<int> ("ServerPortBase");
 	}
 	_server_port_base = b.get ();
+
+	boost::optional<bool> u = f.optional_bool_child ("UseAnyServers");
+	_use_any_servers = u.get_value_or (true);
+
+	list<shared_ptr<cxml::Node> > servers = f.node_children ("Server");
+	for (list<shared_ptr<cxml::Node> >::iterator i = servers.begin(); i != servers.end(); ++i) {
+		if ((*i)->node_children("HostName").size() == 1) {
+			_servers.push_back ((*i)->string_child ("HostName"));
+		} else {
+			_servers.push_back ((*i)->content ());
+		}
+	}
 	
 	_tms_ip = f.string_child ("TMSIP");
 	_tms_path = f.string_child ("TMSPath");
@@ -192,6 +208,12 @@ Config::read_old_metadata ()
 			_default_directory = v;
 		} else if (k == N_("server_port")) {
 			_server_port_base = atoi (v.c_str ());
+		} else if (k == N_("server")) {
+			vector<string> b;
+			split (b, v, is_any_of (" "));
+			if (b.size() == 2) {
+				_servers.push_back (b[0]);
+			}
 		} else if (k == N_("tms_ip")) {
 			_tms_ip = v;
 		} else if (k == N_("tms_path")) {
@@ -283,6 +305,12 @@ Config::write () const
 	root->add_child("NumLocalEncodingThreads")->add_child_text (lexical_cast<string> (_num_local_encoding_threads));
 	root->add_child("DefaultDirectory")->add_child_text (_default_directory.string ());
 	root->add_child("ServerPortBase")->add_child_text (lexical_cast<string> (_server_port_base));
+	root->add_child("UseAnyServers")->add_child_text (_use_any_servers ? "1" : "0");
+	
+	for (vector<string>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
+		root->add_child("Server")->add_child_text (*i);
+	}
+
 	root->add_child("TMSIP")->add_child_text (_tms_ip);
 	root->add_child("TMSPath")->add_child_text (_tms_path);
 	root->add_child("TMSUser")->add_child_text (_tms_user);
diff --git a/src/lib/config.h b/src/lib/config.h
index 0dcfd3f58..1fa54f669 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -31,7 +31,9 @@
 #include <libdcp/metadata.h>
 #include "dci_metadata.h"
 #include "colour_conversion.h"
+#include "server.h"
 
+class ServerDescription;
 class Scaler;
 class Filter;
 class SoundProcessor;
@@ -62,11 +64,29 @@ public:
 		return _server_port_base;
 	}
 
+	void set_use_any_servers (bool u) {
+		_use_any_servers = u;
+	}
+
+	bool use_any_servers () const {
+		return _use_any_servers;
+	}
+
+	/** @param s New list of servers */
+	void set_servers (std::vector<std::string> s) {
+		_servers = s;
+	}
+
+	/** @return Host names / IP addresses of J2K encoding servers that should definitely be used */
+	std::vector<std::string> servers () const {
+		return _servers;
+	}
+
 	/** @return The IP address of a TMS that we can copy DCPs to */
 	std::string tms_ip () const {
 		return _tms_ip;
 	}
-
+	
 	/** @return The path on a TMS that we should write DCPs to */
 	std::string tms_path () const {
 		return _tms_path;
@@ -262,6 +282,10 @@ private:
 	 *  this port and the one above it will be used.
 	 */
 	int _server_port_base;
+	/** true to broadcast on the `any' address to look for servers */
+	bool _use_any_servers;
+	/** J2K encoding servers that should definitely be used */
+	std::vector<std::string> _servers;
 	/** Scaler to use for the "A" part of A/B comparisons */
 	Scaler const * _reference_scaler;
 	/** Filters to use for the "A" part of A/B comparisons */
diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index 941caf4d9..a51aecd97 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -28,6 +28,7 @@
 using std::string;
 using std::stringstream;
 using std::list;
+using std::vector;
 using boost::shared_ptr;
 using boost::scoped_array;
 
@@ -55,12 +56,29 @@ ServerFinder::broadcast_thread ()
 
         socket.set_option (boost::asio::ip::udp::socket::reuse_address (true));
         socket.set_option (boost::asio::socket_base::broadcast (true));
-	
-        boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), Config::instance()->server_port_base() + 1);            
 
+	string const data = DCPOMATIC_HELLO;
+	
 	while (1) {
-		string const data = DCPOMATIC_HELLO;
-		socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
+		if (Config::instance()->use_any_servers ()) {
+			/* Broadcast to look for servers */
+			boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), Config::instance()->server_port_base() + 1);
+			socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
+		}
+
+		/* Query our `definite' servers (if there are any) */
+		vector<string> servers = Config::instance()->servers ();
+		for (vector<string>::const_iterator i = servers.begin(); i != servers.end(); ++i) {
+			try {
+				boost::asio::ip::udp::resolver resolver (io_service);
+				boost::asio::ip::udp::resolver::query query (*i);
+				boost::asio::ip::udp::endpoint end_point (*resolver.resolve (query));
+				socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
+			} catch (...) {
+
+			}
+		}
+		
 		dcpomatic_sleep (10);
 	}
 }
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 114f20aee..71a0f505f 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -39,6 +39,7 @@
 #include "dir_picker_ctrl.h"
 #include "dci_metadata_dialog.h"
 #include "preset_colour_conversion_dialog.h"
+#include "server_dialog.h"
 
 using std::vector;
 using std::string;
@@ -56,6 +57,8 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 
 	make_misc_panel ();
 	_notebook->AddPage (_misc_panel, _("Miscellaneous"), true);
+	make_servers_panel ();
+	_notebook->AddPage (_servers_panel, _("Encoding servers"), false);
 	make_colour_conversions_panel ();
 	_notebook->AddPage (_colour_conversions_panel, _("Colour conversions"), false);
 	make_metadata_panel ();
@@ -290,6 +293,44 @@ ConfigDialog::make_metadata_panel ()
 	_creator->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ConfigDialog::creator_changed, this));
 }
 
+static string 
+server_column (string s)
+{
+	return s;
+}
+
+void
+ConfigDialog::make_servers_panel ()
+{
+	_servers_panel = new wxPanel (_notebook);
+	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+	_servers_panel->SetSizer (s);
+
+	_use_any_servers = new wxCheckBox (_servers_panel, wxID_ANY, _("Use all servers"));
+	s->Add (_use_any_servers, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
+	
+	vector<string> columns;
+	columns.push_back (wx_to_std (_("IP address / host name")));
+	_servers_list = new EditableList<std::string, ServerDialog> (
+		_servers_panel,
+		columns,
+		boost::bind (&Config::servers, Config::instance()),
+		boost::bind (&Config::set_servers, Config::instance(), _1),
+		boost::bind (&server_column, _1)
+		);
+
+	s->Add (_servers_list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_X_GAP);
+
+	_use_any_servers->SetValue (Config::instance()->use_any_servers ());
+	_use_any_servers->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ConfigDialog::use_any_servers_changed, this));
+}
+
+void
+ConfigDialog::use_any_servers_changed ()
+{
+	Config::instance()->set_use_any_servers (_use_any_servers->GetValue ());
+}
+
 void
 ConfigDialog::language_changed ()
 {
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 2492f4899..3a196cce3 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -32,6 +32,7 @@ class DirPickerCtrl;
 class wxNotebook;
 class PresetColourConversion;
 class PresetColourConversionDialog;
+class ServerDialog;
 
 /** @class ConfigDialog
  *  @brief A dialogue to edit DCP-o-matic configuration.
@@ -60,10 +61,12 @@ private:
 	void mail_server_changed ();
 	void kdm_from_changed ();
 	void kdm_email_changed ();
+	void use_any_servers_changed ();
 
 	void setup_language_sensitivity ();
 
 	void make_misc_panel ();
+	void make_servers_panel ();
 	void make_tms_panel ();
 	void make_metadata_panel ();
 	void make_colour_conversions_panel ();
@@ -71,6 +74,7 @@ private:
 
 	wxNotebook* _notebook;
 	wxPanel* _misc_panel;
+	wxPanel* _servers_panel;
 	wxPanel* _tms_panel;
 	EditableList<PresetColourConversion, PresetColourConversionDialog>* _colour_conversions_panel;
 	wxPanel* _metadata_panel;
@@ -97,5 +101,7 @@ private:
 	wxSpinCtrl* _default_j2k_bandwidth;
 	wxPanel* _kdm_email_panel;
 	wxTextCtrl* _kdm_email;
+	wxCheckBox* _use_any_servers;
+	EditableList<std::string, ServerDialog>* _servers_list;
 };
 
diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
new file mode 100644
index 000000000..04da9ad7d
--- /dev/null
+++ b/src/wx/server_dialog.cc
@@ -0,0 +1,69 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    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
+    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,
+    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.
+
+*/
+
+#include "lib/server.h"
+#include "server_dialog.h"
+#include "wx_util.h"
+
+using std::string;
+using boost::shared_ptr;
+
+ServerDialog::ServerDialog (wxWindow* parent)
+	: wxDialog (parent, wxID_ANY, _("Server"))
+{
+	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	table->AddGrowableCol (1, 1);
+
+        wxClientDC dc (parent);
+	/* XXX: bit of a mystery why we need such a long string here */
+        wxSize size = dc.GetTextExtent (wxT ("255.255.255.255.255.255.255.255"));
+        size.SetHeight (-1);
+
+        wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
+        wxArrayString list;
+
+	add_label_to_sizer (table, this, _("Host name or IP address"), true);
+	_host = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size);
+	table->Add (_host, 1, wxEXPAND | wxALL);
+
+	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+
+	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+	if (buttons) {
+		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
+
+	SetSizer (overall_sizer);
+	overall_sizer->Layout ();
+	overall_sizer->SetSizeHints (this);
+}
+
+void
+ServerDialog::set (string server)
+{
+	_host->SetValue (std_to_wx (server));
+}
+
+string
+ServerDialog::get () const
+{
+	return wx_to_std (_host->GetValue ());
+}
+
diff --git a/src/wx/server_dialog.h b/src/wx/server_dialog.h
new file mode 100644
index 000000000..9d758d7c0
--- /dev/null
+++ b/src/wx/server_dialog.h
@@ -0,0 +1,32 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    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
+    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,
+    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.
+
+*/
+
+#include <wx/wx.h>
+
+class ServerDialog : public wxDialog
+{
+public:
+	ServerDialog (wxWindow *);
+
+	void set (std::string);
+	std::string get () const;
+
+private:
+	wxTextCtrl* _host;
+};
diff --git a/src/wx/wscript b/src/wx/wscript
index 85bb697ab..c86188c6a 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -30,6 +30,7 @@ sources = """
           properties_dialog.cc
           repeat_dialog.cc
           screen_dialog.cc
+          server_dialog.cc
           servers_list_dialog.cc
           subtitle_panel.cc
           timecode.cc
-- 
cgit v1.2.3