3 files changed, 10 insertions, 15 deletions

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 87c079bee..a0e7f0de8 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -236,9 +236,6 @@ public:
 
 		set_menu_sensitivity ();
 
-		/* XXX: calling these here is a bit of a hack */
-		film_editor->setup_visibility ();
-		
 		film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1));
 		if (film) {
 			file_changed (film->directory ());
@@ -452,7 +449,9 @@ setup_i18n ()
 
 	if (Config::instance()->language()) {
 		wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (Config::instance()->language().get()));
-		language = li->Language;
+		if (li) {
+			language = li->Language;
+		}
 	}
  
 	if (wxLocale::IsAvailable (language)) {
diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 0c6390771..85134b3c5 100644
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -146,12 +146,12 @@ 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";
 	cout << "Test mode: " << (test_mode ? "yes" : "no") << "\n";
-	cout << "Content: " << film->content() << "\n";
+//	cout << "Content: " << film->content() << "\n";
 	pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
 	cout << "Filters: " << f.first << " " << f.second << "\n";
 
diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
index f5756c693..d3222faa3 100644
--- a/src/tools/servomatictest.cc
+++ b/src/tools/servomatictest.cc
@@ -28,13 +28,12 @@
 #include "scaler.h"
 #include "server.h"
 #include "dcp_video_frame.h"
-#include "options.h"
 #include "decoder.h"
 #include "exceptions.h"
 #include "scaler.h"
 #include "log.h"
-#include "decoder_factory.h"
 #include "video_decoder.h"
+#include "player.h"
 
 using std::cout;
 using std::cerr;
@@ -151,17 +150,14 @@ main (int argc, char* argv[])
 	server = new ServerDescription (server_host, 1);
 	shared_ptr<Film> film (new Film (film_dir, true));
 
-	DecodeOptions opt;
-	opt.decode_audio = false;
-	opt.decode_subtitles = true;
-	opt.video_sync = true;
+	shared_ptr<Player> player = film->player ();
+	player->disable_audio ();
 
-	Decoders decoders = decoder_factory (film, opt);
 	try {
-		decoders.video->Video.connect (boost::bind (process_video, _1, _2, _3));
+		player->Video.connect (boost::bind (process_video, _1, _2, _3));
 		bool done = false;
 		while (!done) {
-			done = decoders.video->pass ();
+			done = player->pass ();
 		}
 	} catch (std::exception& e) {
 		cerr << "Error: " << e.what() << "\n";