X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.cc;h=27139f1f5a8608b2b6c63c71e711863033373a34;hb=746aa7337ac2d51a4fa09039c1d5d7717cc880fa;hp=01b689c9ec4db4f5b766a7d08b2d8e6a1bb487f4;hpb=c19a3e0b6fdd8b129caf7c56336215ba5df282ec;p=dcpomatic.git

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 01b689c9e..27139f1f5 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -52,13 +52,13 @@ using boost::optional;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
 	: wxPanel (parent)
 	, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
 	, _viewer (viewer)
 	, _slider_being_moved (false)
-	, _was_running_before_slider (false)
 	, _outline_content (0)
 	, _eye (0)
 	, _jump_to_selected (0)
@@ -67,6 +67,7 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 	, _forward_button (new Button (this, wxT(">")))
 	, _frame_number (new StaticText (this, wxT("")))
 	, _timecode (new StaticText (this, wxT("")))
+	, _timer (this)
 {
 	_v_sizer = new wxBoxSizer (wxVERTICAL);
 	SetSizer (_v_sizer);
@@ -93,8 +94,8 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 	time_sizer->Add (_timecode, 0, wxEXPAND);
 
 	h_sizer->Add (_rewind_button, 0, wxALL, 2);
-	h_sizer->Add (_back_button, 0, wxALL, 2);
 	h_sizer->Add (time_sizer, 0, wxEXPAND);
+	h_sizer->Add (_back_button, 0, wxALL, 2);
 	h_sizer->Add (_forward_button, 0, wxALL, 2);
 
 	_button_sizer = new wxBoxSizer (wxHORIZONTAL);
@@ -119,7 +120,7 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 	_slider->Bind           (wxEVT_SCROLL_THUMBTRACK,    boost::bind(&Controls::slider_moved,    this, false));
 	_slider->Bind           (wxEVT_SCROLL_PAGEUP,        boost::bind(&Controls::slider_moved,    this, true));
 	_slider->Bind           (wxEVT_SCROLL_PAGEDOWN,      boost::bind(&Controls::slider_moved,    this, true));
-	_slider->Bind           (wxEVT_SCROLL_CHANGED,       boost::bind(&Controls::slider_released, this));
+	_slider->Bind           (wxEVT_SCROLL_THUMBRELEASE,  boost::bind(&Controls::slider_released, this));
 	_rewind_button->Bind    (wxEVT_LEFT_DOWN,            boost::bind(&Controls::rewind_clicked,  this, _1));
 	_back_button->Bind      (wxEVT_LEFT_DOWN,            boost::bind(&Controls::back_clicked,    this, _1));
 	_forward_button->Bind   (wxEVT_LEFT_DOWN,            boost::bind(&Controls::forward_clicked, this, _1));
@@ -130,10 +131,12 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 		_jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
 	}
 
-	_viewer->PositionChanged.connect (boost::bind(&Controls::position_changed, this));
 	_viewer->Started.connect (boost::bind(&Controls::started, this));
 	_viewer->Stopped.connect (boost::bind(&Controls::stopped, this));
 
+	Bind (wxEVT_TIMER, boost::bind(&Controls::update_position, this));
+	_timer.Start (80, wxTIMER_CONTINUOUS);
+
 	set_film (_viewer->film());
 
 	setup_sensitivity ();
@@ -165,7 +168,7 @@ Controls::stopped ()
 }
 
 void
-Controls::position_changed ()
+Controls::update_position ()
 {
 	if (!_slider_being_moved) {
 		update_position_label ();
@@ -195,17 +198,21 @@ Controls::slider_moved (bool page)
 
 	if (!page && !_slider_being_moved) {
 		/* This is the first event of a drag; stop playback for the duration of the drag */
-		_was_running_before_slider = _viewer->stop ();
+		_viewer->suspend ();
 		_slider_being_moved = true;
 	}
 
 	DCPTime t (_slider->GetValue() * _film->length().get() / 4096);
 	t = t.round (_film->video_frame_rate());
-	/* Ensure that we hit the end of the film at the end of the slider */
+	/* Ensure that we hit the end of the film at the end of the slider.  In particular, we
+	   need to do an accurate seek in case there isn't a keyframe near the end.
+	*/
+	bool accurate = false;
 	if (t >= _film->length ()) {
 		t = _film->length() - _viewer->one_video_frame();
+		accurate = true;
 	}
-	_viewer->seek (t, false);
+	_viewer->seek (t, accurate);
 	update_position_label ();
 
 	log (
@@ -218,10 +225,8 @@ Controls::slider_moved (bool page)
 void
 Controls::slider_released ()
 {
-	if (_was_running_before_slider) {
-		/* Restart after a drag */
-		_viewer->start ();
-	}
+	/* Restart after a drag */
+	_viewer->resume ();
 	_slider_being_moved = false;
 }
 
@@ -371,7 +376,10 @@ Controls::set_film (shared_ptr<Film> film)
 	}
 
 	_film = film;
-	_film_change_connection = _film->Change.connect (boost::bind(&Controls::film_change, this, _1, _2));
+
+	if (_film) {
+		_film_change_connection = _film->Change.connect (boost::bind(&Controls::film_change, this, _1, _2));
+	}
 
 	setup_sensitivity ();
 
@@ -388,9 +396,23 @@ Controls::film () const
 void
 Controls::film_change (ChangeType type, Film::Property p)
 {
-	if (type == CHANGE_TYPE_DONE && p == Film::CONTENT) {
-		setup_sensitivity ();
-		update_position_label ();
-		update_position_slider ();
+	if (type == CHANGE_TYPE_DONE) {
+		if (p == Film::CONTENT) {
+			setup_sensitivity ();
+			update_position_label ();
+			update_position_slider ();
+		} else if (p == Film::THREE_D) {
+			setup_sensitivity ();
+		}
 	}
 }
+
+#ifdef DCPOMATIC_PLAYER_STRESS_TEST
+void
+Controls::seek (int slider)
+{
+	_slider->SetValue (slider);
+	slider_moved (false);
+	slider_released ();
+}
+#endif