X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=17f6526257c2a01e6e4d03b5c824d969e2ddb367;hb=6eba051dcbb8c56e3e2efea946ce0380d17a7b33;hp=8ee6572619ca7b3e43ba0e4ffda9c81abe7d81bc;hpb=19760ad4cf6d348416444e515b5e709be565f81e;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 8ee657261..17f652625 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -73,9 +73,6 @@
 #ifdef __WXGTK__
 #include <X11/Xlib.h>
 #endif
-#ifdef __WXOSX__
-#include <ApplicationServices/ApplicationServices.h>
-#endif
 #include <boost/bind.hpp>
 #include <boost/algorithm/string.hpp>
 #include <iostream>
@@ -124,8 +121,16 @@ enum {
 	ID_tools_system_information,
 	/* IDs for shortcuts (with no associated menu item) */
 	ID_start_stop,
-	ID_back_frame,
-	ID_forward_frame
+	ID_go_back_frame,
+	ID_go_forward_frame,
+	ID_go_back_small_amount,
+	ID_go_forward_small_amount,
+	ID_go_back_medium_amount,
+	ID_go_forward_medium_amount,
+	ID_go_back_large_amount,
+	ID_go_forward_large_amount,
+	ID_go_to_start,
+	ID_go_to_end
 };
 
 class DOMFrame : public wxFrame
@@ -212,27 +217,43 @@ public:
 		_info = new PlayerInformation (_overall_panel, _viewer);
 		setup_main_sizer (Config::instance()->player_mode());
 #ifdef __WXOSX__
-		int accelerators = 4;
+		int accelerators = 12;
 #else
-		int accelerators = 3;
+		int accelerators = 11;
 #endif
 
 		_stress.setup (this, _controls);
 
 		wxAcceleratorEntry* accel = new wxAcceleratorEntry[accelerators];
-		accel[0].Set(wxACCEL_NORMAL, WXK_SPACE, ID_start_stop);
-		accel[1].Set(wxACCEL_NORMAL, WXK_LEFT, ID_back_frame);
-		accel[2].Set(wxACCEL_NORMAL, WXK_RIGHT, ID_forward_frame);
+		accel[0].Set(wxACCEL_NORMAL,                WXK_SPACE, ID_start_stop);
+		accel[1].Set(wxACCEL_NORMAL,                WXK_LEFT,  ID_go_back_frame);
+		accel[2].Set(wxACCEL_NORMAL,                WXK_RIGHT, ID_go_forward_frame);
+		accel[3].Set(wxACCEL_SHIFT,                 WXK_LEFT,  ID_go_back_small_amount);
+		accel[4].Set(wxACCEL_SHIFT,                 WXK_RIGHT, ID_go_forward_small_amount);
+		accel[5].Set(wxACCEL_CTRL,                  WXK_LEFT,  ID_go_back_medium_amount);
+		accel[6].Set(wxACCEL_CTRL,                  WXK_RIGHT, ID_go_forward_medium_amount);
+		accel[7].Set(wxACCEL_SHIFT | wxACCEL_CTRL,  WXK_LEFT,  ID_go_back_large_amount);
+		accel[8].Set(wxACCEL_SHIFT | wxACCEL_CTRL,  WXK_RIGHT, ID_go_forward_large_amount);
+		accel[9].Set(wxACCEL_NORMAL,                WXK_HOME,  ID_go_to_start);
+		accel[10].Set(wxACCEL_NORMAL,               WXK_END,   ID_go_to_end);
 #ifdef __WXOSX__
-		accel[3].Set(wxACCEL_CTRL, static_cast<int>('W'), ID_file_close);
+		accel[11].Set(wxACCEL_CTRL, static_cast<int>('W'), ID_file_close);
 #endif
 		wxAcceleratorTable accel_table (accelerators, accel);
 		SetAcceleratorTable (accel_table);
 		delete[] accel;
 
-		Bind (wxEVT_MENU, boost::bind (&DOMFrame::start_stop_pressed, this), ID_start_stop);
-		Bind (wxEVT_MENU, boost::bind (&DOMFrame::back_frame, this), ID_back_frame);
-		Bind (wxEVT_MENU, boost::bind (&DOMFrame::forward_frame, this), ID_forward_frame);
+		Bind (wxEVT_MENU, boost::bind(&DOMFrame::start_stop_pressed, this), ID_start_stop);
+		Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_back_frame, this),      ID_go_back_frame);
+		Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_forward_frame, this),   ID_go_forward_frame);
+		Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds,  this,   -60), ID_go_back_small_amount);
+		Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds,  this,    60), ID_go_forward_small_amount);
+		Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds,  this,  -600), ID_go_back_medium_amount);
+		Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds,  this,   600), ID_go_forward_medium_amount);
+		Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds,  this, -3600), ID_go_back_large_amount);
+		Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds,  this,  3600), ID_go_forward_large_amount);
+		Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_to_start, this), ID_go_to_start);
+		Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_to_end,   this), ID_go_to_end);
 
 		reset_film ();
 
@@ -400,7 +421,7 @@ public:
 #ifndef DCPOMATIC_VARIANT_SWAROOP
 			Config::instance()->add_to_player_history (dir);
 #endif
-		} catch (dcp::DCPReadError& e) {
+		} catch (dcp::ReadError& e) {
 			error_dialog (this, wxString::Format(_("Could not load a DCP from %s"), std_to_wx(dir.string())), std_to_wx(e.what()));
 		}
 	}
@@ -989,7 +1010,7 @@ private:
 			} else {
 				dcpomatic_log.reset (new NullLog());
 			}
-			dcpomatic_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_PLAYER);
+			dcpomatic_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_VIDEO_VIEW);
 		}
 	}
 
@@ -1010,16 +1031,31 @@ private:
 		}
 	}
 
-	void back_frame ()
+	void go_back_frame ()
 	{
 		_viewer->seek_by (-_viewer->one_video_frame(), true);
 	}
 
-	void forward_frame ()
+	void go_forward_frame ()
 	{
 		_viewer->seek_by (_viewer->one_video_frame(), true);
 	}
 
+	void go_seconds (int s)
+	{
+		_viewer->seek_by (DCPTime::from_seconds(s), true);
+	}
+
+	void go_to_start ()
+	{
+		_viewer->seek (DCPTime(), true);
+	}
+
+	void go_to_end ()
+	{
+		_viewer->seek (_film->length() - _viewer->one_video_frame(), true);
+	}
+
 	wxFrame* _dual_screen;
 	bool _update_news_requested;
 	PlayerInformation* _info;
@@ -1117,10 +1153,8 @@ private:
 			unsetenv ("UBUNTU_MENUPROXY");
 #endif
 
-#ifdef __WXOSX__
-			ProcessSerialNumber serial;
-			GetCurrentProcess (&serial);
-			TransformProcessType (&serial, kProcessTransformToForegroundApplication);
+#ifdef DCPOMATIC_OSX
+			make_foreground_application ();
 #endif
 
 			dcpomatic_setup_path_encoding ();