X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=f3daae30af73fec898b77a48d777255b2773ece0;hb=d0be7e3154fccdf3f2de330d9cf200e01a9f4270;hp=9401bc3405f8e995551f2fdd74fc39a3f943f62f;hpb=75f6cc0fa8bcff9b98a31200e313d8895cfaa3f8;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 9401bc340..f3daae30a 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -131,6 +131,9 @@ using boost::optional;
 using boost::function;
 using boost::is_any_of;
 using boost::algorithm::find;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::raw_convert;
 
 class FilmChangedClosingDialog : public boost::noncopyable
@@ -878,7 +881,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
 		}
 	}
 
@@ -889,7 +896,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
 		}
 	}
 
@@ -990,23 +1001,11 @@ private:
 
 	void jobs_export_subtitles ()
 	{
-		ExportSubtitlesDialog* d = new ExportSubtitlesDialog (this, _film->isdcf_name(true));
+		ExportSubtitlesDialog* d = new ExportSubtitlesDialog (this, _film->reels().size(), _film->interop());
 		if (d->ShowModal() == wxID_OK) {
-			if (boost::filesystem::exists(d->path())) {
-				bool ok = confirm_dialog(
-						this,
-						wxString::Format (_("File %s already exists.  Do you want to overwrite it?"), std_to_wx(d->path().string()).data())
-						);
-
-				if (!ok) {
-					d->Destroy ();
-					return;
-				}
-			}
-
 			shared_ptr<TranscodeJob> job (new TranscodeJob (_film));
 			job->set_encoder (
-				shared_ptr<SubtitleEncoder>(new SubtitleEncoder(_film, job, d->path(), d->split_reels()))
+				shared_ptr<SubtitleEncoder>(new SubtitleEncoder(_film, job, d->path(), _film->isdcf_name(true), d->split_reels(), d->include_font()))
 				);
 			JobManager::instance()->add (job);
 		}