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

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index f69ab5a6a..9cd99a265 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -222,8 +222,6 @@ enum {
 	ID_file_close = 100,
 	ID_edit_copy,
 	ID_edit_paste,
-	ID_content_scale_to_fit_width,
-	ID_content_scale_to_fit_height,
 	ID_jobs_make_dcp,
 	ID_jobs_make_dcp_batch,
 	ID_jobs_make_kdms,
@@ -316,8 +314,6 @@ public:
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_copy, this),               ID_edit_copy);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_paste, this),              ID_edit_paste);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this),        wxID_PREFERENCES);
-		Bind (wxEVT_MENU, boost::bind (&DOMFrame::content_scale_to_fit_width, this), ID_content_scale_to_fit_width);
-		Bind (wxEVT_MENU, boost::bind (&DOMFrame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp, this),           ID_jobs_make_dcp);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_kdms, this),          ID_jobs_make_kdms);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dkdms, this),         ID_jobs_make_dkdms);
@@ -816,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
@@ -842,7 +838,7 @@ private:
 			}
 
 			if (i == 1) {
-				start (wx_to_std (wxStandardPaths::Get().GetExecutablePath()));
+				start ();
 			}
 
 			dcpomatic_sleep_seconds (1);
@@ -868,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."));
 		}
 	}
@@ -879,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."));
 		}
 	}
@@ -909,9 +905,9 @@ private:
 
 
 		dcp::LocalTime from (Config::instance()->signer_chain()->leaf().not_before());
-		from.add_minutes (1);
+		from.add_days (1);
 		dcp::LocalTime to (Config::instance()->signer_chain()->leaf().not_after());
-		to.add_minutes (-1);
+		to.add_days (-1);
 
 		optional<dcp::EncryptedKDM> kdm;
 		try {
@@ -983,22 +979,6 @@ private:
 		d->Destroy ();
 	}
 
-	void content_scale_to_fit_width ()
-	{
-		ContentList vc = _film_editor->content_panel()->selected_video ();
-		for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
-			(*i)->video->scale_and_crop_to_fit_width (_film);
-		}
-	}
-
-	void content_scale_to_fit_height ()
-	{
-		ContentList vc = _film_editor->content_panel()->selected_video ();
-		for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
-			(*i)->video->scale_and_crop_to_fit_height (_film);
-		}
-	}
-
 	void jobs_send_dcp_to_tms ()
 	{
 		_film->send_dcp_to_tms ();
@@ -1323,10 +1303,6 @@ private:
 		add_item (edit, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS);
 #endif
 
-		wxMenu* content = new wxMenu;
-		add_item (content, _("Scale to fit &width"), ID_content_scale_to_fit_width, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT);
-		add_item (content, _("Scale to fit &height"), ID_content_scale_to_fit_height, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT);
-
 		wxMenu* jobs_menu = new wxMenu;
 		add_item (jobs_menu, _("&Make DCP\tCtrl-M"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION);
 		add_item (jobs_menu, _("Make DCP in &batch converter\tCtrl-B"), ID_jobs_make_dcp_batch, NEEDS_FILM | NOT_DURING_DCP_CREATION);
@@ -1338,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;
@@ -1365,7 +1349,6 @@ private:
 
 		m->Append (_file_menu, _("&File"));
 		m->Append (edit, _("&Edit"));
-		m->Append (content, _("&Content"));
 		m->Append (jobs_menu, _("&Jobs"));
 		m->Append (view, _("&View"));
 		m->Append (tools, _("&Tools"));