X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=9cd99a265f553b9e51f39a600e20dbe340a0a9a7;hb=045f61f0120bb15c7329f2e621e149be9e88011a;hp=3168197d519b49d00eef7249734824f51e5deb5e;hpb=87f5322a66ae176043adf9a9297e7e020ac1b5f4;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 3168197d5..9cd99a265 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -812,7 +812,7 @@ private:
 	}
 
 	/** @return false if we succeeded, true if not */
-	bool send_to_other_tool (int port, function<void(boost::filesystem::path)> start, string message)
+	bool send_to_other_tool (int port, function<void()> start, string message)
 	{
 		/* i = 0; try to connect via socket
 		   i = 1; try again, and then try to start the tool
@@ -838,7 +838,7 @@ private:
 			}
 
 			if (i == 1) {
-				start (wx_to_std (wxStandardPaths::Get().GetExecutablePath()));
+				start ();
 			}
 
 			dcpomatic_sleep_seconds (1);
@@ -864,7 +864,7 @@ private:
 
 		_film->write_metadata ();
 
-		if (send_to_other_tool (BATCH_JOB_PORT, bind (&start_batch_converter, _1), _film->directory()->string())) {
+		if (send_to_other_tool (BATCH_JOB_PORT, &start_batch_converter, _film->directory()->string())) {
 			error_dialog (this, _("Could not find batch converter."));
 		}
 	}
@@ -875,7 +875,7 @@ private:
 			return;
 		}
 
-		if (send_to_other_tool (PLAYER_PLAY_PORT, bind (&start_player, _1), _film->dir(_film->dcp_name(false)).string())) {
+		if (send_to_other_tool (PLAYER_PLAY_PORT, &start_player, _film->dir(_film->dcp_name(false)).string())) {
 			error_dialog (this, _("Could not find player."));
 		}
 	}
@@ -1314,7 +1314,15 @@ private:
 		add_item (jobs_menu, _("Export...\tCtrl-E"), ID_jobs_export, NEEDS_FILM);
 		jobs_menu->AppendSeparator ();
 		add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
-		add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
+
+#if defined(DCPOMATIC_OSX)
+		add_item (jobs_menu, _("S&how DCP in Finder"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
+#elif defined(DCPOMATIC_WINDOWS)
+		add_item (jobs_menu, _("S&how DCP in Explorer"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
+#else
+		add_item (jobs_menu, _("S&how DCP in Files"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
+#endif
+
 		add_item (jobs_menu, _("Open DCP in &player"), ID_jobs_open_dcp_in_player, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
 
 		wxMenu* view = new wxMenu;