From: Carl Hetherington <cth@carlh.net>
Date: Sat, 6 Jan 2018 22:51:07 +0000 (+0000)
Subject: Remove check on whether the last seek was accurate when re-getting
X-Git-Tag: v2.11.38~6
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2897d0a5912144486294dadca9a72df593c0f0f9

Remove check on whether the last seek was accurate when re-getting
a frame.  This breaks things like changing crop after slidering to
a new position; at this point we don't care that the last seek was
inaccurate: the new one should be so that the frame stays the same.
---

diff --git a/ChangeLog b/ChangeLog
index 910a8f145..4d94b3087 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2018-01-06  Carl Hetherington  <cth@carlh.net>
 
+	* Fix playhead wandering on some operations (#1112).
+
 	* Simplify user interface for managing keys.
 
 	* Version 2.11.37 released.
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 0fb5058f3..3b6ea5b39 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -88,7 +88,6 @@ FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected
 	, _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
 	, _coalesce_player_changes (false)
 	, _pending_player_change (false)
-	, _last_seek_accurate (true)
 	, _audio (DCPOMATIC_RTAUDIO_API)
 	, _audio_channels (0)
 	, _audio_block_size (1024)
@@ -660,7 +659,7 @@ FilmViewer::film_changed (Film::Property p)
 void
 FilmViewer::refresh ()
 {
-	seek (_video_position, _last_seek_accurate);
+	seek (_video_position, true);
 }
 
 void
@@ -722,7 +721,6 @@ FilmViewer::seek (DCPTime t, bool accurate)
 	bool const was_running = stop ();
 
 	_butler->seek (t, accurate);
-	_last_seek_accurate = accurate;
 	get ();
 
 	if (was_running) {
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 50f7dd2cb..0c71ae1bd 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -132,11 +132,6 @@ private:
 	dcp::Size _out_size;
 	/** Size of the panel that we have available */
 	dcp::Size _panel_size;
-	/** true if the last call to Player::seek() was specified to be accurate;
-	 *  this is used so that when re-fetching the current frame we
-	 *  can get the same one that we got last time.
-	 */
-	bool _last_seek_accurate;
 
 	RtAudio _audio;
 	int _audio_channels;