Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0

16 files changed, 51 insertions, 150 deletions

diff --git a/ChangeLog b/ChangeLog
index c3b671471..40cae41f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2013-08-29  Carl Hetherington  <cth@carlh.net>
 
+	* Restore server/client operation (#202).
+
 	* Fix strange rounding of still image durations (#204).
 
 	* Remove limitation to numbers and periods in the
diff --git a/run/alignomatic b/run/alignomatic
deleted file mode 100755
index 9cc8c2245..000000000
--- a/run/alignomatic
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=build/src/lib:build/src/gtk:$LD_LIBRARY_PATH
-if [ "$1" == "--debug" ]; then
-    gdb --args build/src/tools/alignomatic $2
-elif [ "$1" == "--valgrind" ]; then
-    valgrind --tool="memcheck" build/src/tools/alignomatic $2
-else
-    build/src/tools/alignomatic "$1"
-fi
diff --git a/run/dcpomatic b/run/dcpomatic
index 7ea08778c..cf3de165c 100755
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -7,6 +7,9 @@ if [ "$1" == "--debug" ]; then
 elif [ "$1" == "--valgrind" ]; then
     shift
     valgrind --tool="memcheck" build/src/tools/dcpomatic $*
+elif [ "$1" == "--callgrind" ]; then
+    shift
+    valgrind --tool="callgrind" build/src/tools/dcpomatic $*
 elif [ "$1" == "--i18n" ]; then
     shift
     LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 build/src/tools/dcpomatic "$*"
diff --git a/run/dcpomatic_server_cli b/run/dcpomatic_server_cli
new file mode 100755
index 000000000..bc5790adf
--- /dev/null
+++ b/run/dcpomatic_server_cli
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH
+if [ "$1" == "--debug" ]; then
+    gdb --args build/src/tools/dcpomatic_server_cli
+elif [ "$1" == "--valgrind" ]; then
+    valgrind --tool="memcheck" build/src/tools/dcpomatic_server_cli
+else
+    build/src/tools/dcpomatic_server_cli
+fi
diff --git a/run/dcpomatic_server_gui b/run/dcpomatic_server_gui
new file mode 100755
index 000000000..b7b122e67
--- /dev/null
+++ b/run/dcpomatic_server_gui
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH
+if [ "$1" == "--debug" ]; then
+    gdb --args build/src/tools/dcpomatic_server_gui
+elif [ "$1" == "--valgrind" ]; then
+    valgrind --tool="memcheck" build/src/tools/dcpomatic_server_gui
+else
+    build/src/tools/dcpomatic_server_gui
+fi
diff --git a/run/dvdomatic-osx b/run/dvdomatic-osx
deleted file mode 100755
index 8fef27fec..000000000
--- a/run/dvdomatic-osx
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:build/src/lib:build/src:/Users/carl/Environments/osx/64/lib
-if [ "$1" == "--debug" ]; then
-    shift
-    gdb --args build/src/tools/dvdomatic "$*"
-elif [ "$1" == "--valgrind" ]; then
-    shift
-    valgrind --tool="memcheck" build/src/tools/dvdomatic $*
-elif [ "$1" == "--i18n" ]; then
-    shift
-    LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 build/src/tools/dvdomatic "$*"
-else
-    build/src/tools/dvdomatic "$*"
-fi
diff --git a/run/fixlengths b/run/fixlengths
deleted file mode 100755
index 1a6cc0a17..000000000
--- a/run/fixlengths
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH:build/src
-if [ "$1" == "--debug" ]; then
-    gdb --args build/src/tools/fixlengths "$@"
-elif [ "$1" == "--valgrind" ]; then
-    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes build/src/tools/fixlengths "$@"
-else
-    build/src/tools/fixlengths "$@"
-fi
diff --git a/run/makedcp-osx b/run/makedcp-osx
deleted file mode 100755
index 03756f524..000000000
--- a/run/makedcp-osx
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:build/src/lib:build/src:/Users/carl/Environments/osx/64/lib
-if [ "$1" == "--debug" ]; then
-    shift
-    gdb --args build/src/tools/makedcp "$@"
-elif [ "$1" == "--memcheck" ]; then
-    shift
-    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes build/src/tools/makedcp "$@"
-elif [ "$1" == "--massif" ]; then
-    shift
-    valgrind --tool="massif" build/src/tools/makedcp "$@"
-else
-    build/src/tools/makedcp "$@"
-fi
diff --git a/run/playomatic b/run/playomatic
deleted file mode 100755
index 9fe191a51..000000000
--- a/run/playomatic
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=build/src/lib:build/src/gtk:$LD_LIBRARY_PATH
-if [ "$1" == "--debug" ]; then
-    gdb --args build/src/tools/playomatic $2
-elif [ "$1" == "--valgrind" ]; then
-    valgrind --tool="memcheck" build/src/tools/playomatic $2
-else
-    build/src/tools/playomatic "$1"
-fi
diff --git a/run/servomatictest b/run/server_test
index 58cea8815..20e9f486c 100755
--- a/run/servomatictest
+++ b/run/server_test
@@ -3,10 +3,10 @@
 export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH
 if [ "$1" == "--debug" ]; then
     shift
-    gdb --args build/src/tools/servomatictest $*
+    gdb --args build/src/tools/server_test $*
 elif [ "$1" == "--valgrind" ]; then
     shift
-    valgrind --tool="memcheck" build/src/tools/servomatictest $*
+    valgrind --tool="memcheck" build/src/tools/server_test $*
 else
-    build/src/tools/servomatictest $*
+    build/src/tools/server_test $*
 fi
diff --git a/run/servomatic_cli b/run/servomatic_cli
deleted file mode 100755
index 3dd67d246..000000000
--- a/run/servomatic_cli
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH
-if [ "$1" == "--debug" ]; then
-    gdb --args build/src/tools/servomatic_cli
-elif [ "$1" == "--valgrind" ]; then
-    valgrind --tool="memcheck" build/src/tools/servomatic_cli
-else
-    build/src/tools/servomatic_cli
-fi
diff --git a/run/servomatic_gui b/run/servomatic_gui
deleted file mode 100755
index 4f1c617cc..000000000
--- a/run/servomatic_gui
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH
-if [ "$1" == "--debug" ]; then
-    gdb --args build/src/tools/servomatic_gui
-elif [ "$1" == "--valgrind" ]; then
-    valgrind --tool="memcheck" build/src/tools/servomatic_gui
-else
-    build/src/tools/servomatic_gui
-fi
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index b5b031292..1c812cbf2 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -272,7 +272,7 @@ DCPVideoFrame::encode_remotely (ServerDescription serv)
 	add_metadata (root);
 
 	stringstream xml;
-	doc.write_to_stream (xml);
+	doc.write_to_stream (xml, "UTF-8");
 
 	_log->log (String::compose (
 			   N_("Sending to remote; pixel format %1, components %2, lines (%3,%4,%5), line sizes (%6,%7,%8)"),
diff --git a/src/tools/servomatictest.cc b/src/tools/server_test.cc
index 88974eed7..029e62614 100644
--- a/src/tools/servomatictest.cc
+++ b/src/tools/server_test.cc
@@ -21,19 +21,19 @@
 #include <iomanip>
 #include <exception>
 #include <getopt.h>
-#include "format.h"
-#include "film.h"
-#include "filter.h"
-#include "util.h"
-#include "scaler.h"
-#include "server.h"
-#include "dcp_video_frame.h"
-#include "decoder.h"
-#include "exceptions.h"
-#include "scaler.h"
-#include "log.h"
-#include "video_decoder.h"
-#include "player.h"
+#include "lib/ratio.h"
+#include "lib/film.h"
+#include "lib/filter.h"
+#include "lib/util.h"
+#include "lib/scaler.h"
+#include "lib/server.h"
+#include "lib/dcp_video_frame.h"
+#include "lib/decoder.h"
+#include "lib/exceptions.h"
+#include "lib/scaler.h"
+#include "lib/log.h"
+#include "lib/video_decoder.h"
+#include "lib/player.h"
 
 using std::cout;
 using std::cerr;
@@ -41,26 +41,16 @@ using std::string;
 using std::pair;
 using boost::shared_ptr;
 
+static shared_ptr<Film> film;
 static ServerDescription* server;
 static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
 static int frame = 0;
 
 void
-process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub)
+process_video (shared_ptr<const Image> image, Eyes eyes, ColourConversion conversion, Time)
 {
-	shared_ptr<DCPVideoFrame> local (
-		new DCPVideoFrame (
-			image, sub,
-			libdcp::Size (1024, 1024), 0, 0, 0,
-			Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, log_)
-		);
-	
-	shared_ptr<DCPVideoFrame> remote (
-		new DCPVideoFrame (
-			image, sub,
-			libdcp::Size (1024, 1024), 0, 0, 0,
-			Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, log_)
-		);
+	shared_ptr<DCPVideoFrame> local  (new DCPVideoFrame (image, frame, eyes, conversion, film->video_frame_rate(), 250000000, log_));
+	shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image, frame, eyes, conversion, film->video_frame_rate(), 250000000, log_));
 
 	cout << "Frame " << frame << ": ";
 	cout.flush ();
@@ -72,7 +62,7 @@ process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub)
 
 	string remote_error;
 	try {
-		remote_encoded = remote->encode_remotely (server);
+		remote_encoded = remote->encode_remotely (*server);
 	} catch (NetworkError& e) {
 		remote_error = e.what ();
 	}
@@ -148,14 +138,14 @@ main (int argc, char* argv[])
 	dcpomatic_setup ();
 
 	server = new ServerDescription (server_host, 1);
-	shared_ptr<Film> film (new Film (film_dir));
+	film.reset (new Film (film_dir));
 	film->read_metadata ();
 
-	shared_ptr<Player> player = film->player ();
+	shared_ptr<Player> player = film->make_player ();
 	player->disable_audio ();
 
 	try {
-		player->Video.connect (boost::bind (process_video, _1, _2, _3));
+		player->Video.connect (boost::bind (process_video, _1, _2, _3, _5));
 		bool done = false;
 		while (!done) {
 			done = player->pass ();
diff --git a/src/tools/test.cc b/src/tools/test.cc
deleted file mode 100644
index 4baaeb73f..000000000
--- a/src/tools/test.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-    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 <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include "image.h"
-#include "server.h"
-
-using namespace boost;
-
-int main ()
-{
-	uint8_t* rgb = new uint8_t[256];
-	shared_ptr<Image> image (new Image (rgb, 0, 32, 32, 24));
-	Server* s = new Server ("localhost", 2);
-	image->encode_remotely (s);
-	return 0;
-}
diff --git a/src/tools/wscript b/src/tools/wscript
index c7ab44604..42fc90adb 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -4,7 +4,7 @@ from waflib import Logs
 import i18n
 
 def build(bld):
-    for t in ['dcpomatic_cli', 'dcpomatic_server_cli']:
+    for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test']:
         obj = bld(features = 'cxx cxxprogram')
         obj.uselib = 'BOOST_THREAD OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS'
         obj.includes = ['..']