From b468ccabdb13fca86ae8a324239d83490ef5832e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 1 Apr 2013 02:25:02 +0100
Subject: XML metadata and some other bits.

---
 src/tools/makedcp.cc        |  2 +-
 src/tools/servomatictest.cc | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 226cde113..85134b3c5 100644
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -146,7 +146,7 @@ main (int argc, char* argv[])
 	film->log()->set_level ((Log::Level) log_level);
 
 	cout << "\nMaking ";
-	if (film->dcp_ab()) {
+	if (film->ab()) {
 		cout << "A/B ";
 	}
 	cout << "DCP for " << film->name() << "\n";
diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
index d08fefa90..3d847d690 100644
--- a/src/tools/servomatictest.cc
+++ b/src/tools/servomatictest.cc
@@ -32,8 +32,8 @@
 #include "exceptions.h"
 #include "scaler.h"
 #include "log.h"
-#include "decoder_factory.h"
 #include "video_decoder.h"
+#include "playlist.h"
 
 using std::cout;
 using std::cerr;
@@ -150,17 +150,14 @@ main (int argc, char* argv[])
 	server = new ServerDescription (server_host, 1);
 	shared_ptr<Film> film (new Film (film_dir, true));
 
-	/* XXX */
-//	opt.decode_audio = false;
-//	opt.decode_subtitles = true;
-//	opt.video_sync = true;
+	shared_ptr<Playlist> playlist = film->playlist ();
+	playlist->disable_audio ();
 
-	Decoders decoders = decoder_factory (film);
 	try {
-		decoders.video->Video.connect (boost::bind (process_video, _1, _2, _3));
+		playlist->Video.connect (boost::bind (process_video, _1, _2, _3));
 		bool done = false;
 		while (!done) {
-			done = decoders.video->pass ();
+			done = playlist->pass ();
 		}
 	} catch (std::exception& e) {
 		cerr << "Error: " << e.what() << "\n";
-- 
cgit v1.2.3