X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=d6699338828bc3eaa816dcbd657cb4ba17258d4d;hb=a332bd6be323f03dad5b180fb237afe54f1bf81e;hp=60f11752e89988687192314ec451490e0094d262;hpb=c04fec82d25127fafa73c3daff87bece9aa8c8e8;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 60f11752e..d66993388 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -50,7 +50,6 @@
 #include "wx/paste_dialog.h"
 #include "wx/focus_manager.h"
 #include "wx/html_dialog.h"
-#include "wx/initial_setup_dialog.h"
 #include "wx/send_i18n_dialog.h"
 #include "wx/i18n_hook.h"
 #include "lib/film.h"
@@ -881,7 +880,11 @@ private:
 		_film->write_metadata ();
 
 		if (send_to_other_tool (BATCH_JOB_PORT, &start_batch_converter, _film->directory()->string())) {
+#ifdef DCPOMATIC_OSX
+			error_dialog (this, _("Could not start the batch converter.  You may need to download it from dcpomatic.com."));
+#else
 			error_dialog (this, _("Could not find batch converter."));
+#endif
 		}
 	}
 
@@ -892,7 +895,11 @@ private:
 		}
 
 		if (send_to_other_tool (PLAYER_PLAY_PORT, &start_player, _film->dir(_film->dcp_name(false)).string())) {
+#ifdef DCPOMATIC_OSX
+			error_dialog (this, _("Could not start the player.  You may need to download it from dcpomatic.com."));
+#else
 			error_dialog (this, _("Could not find player."));
+#endif
 		}
 	}
 
@@ -978,11 +985,7 @@ private:
 			shared_ptr<TranscodeJob> job (new TranscodeJob (_film));
 			job->set_encoder (
 				shared_ptr<FFmpegEncoder> (
-					new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf()
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-							   , optional<dcp::Key>(), optional<string>()
-#endif
-						)
+					new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf())
 					)
 				);
 			JobManager::instance()->add (job);
@@ -1612,13 +1615,6 @@ private:
 			_frame->Maximize ();
 			close_splash ();
 
-			if (!Config::instance()->nagged(Config::NAG_INITIAL_SETUP)) {
-				InitialSetupDialog* d = new InitialSetupDialog ();
-				d->ShowModal ();
-				d->Destroy ();
-				Config::instance()->set_nagged(Config::NAG_INITIAL_SETUP, true);
-			}
-
 			if (running_32_on_64 ()) {
 				NagDialog::maybe_nag (
 					_frame, Config::NAG_32_ON_64,