X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=03e8419a091f16b5fa95c7085af4f376824ff5a9;hb=f0d7baf0ce956fe5461caa91868c41d881b5f0dc;hp=945644fb1ede92c74131d721a283237d5897bba4;hpb=aedc1d5c8db3a77bd6b2cbba8461ce8df5c9ae39;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 945644fb1..03e8419a0 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -120,8 +120,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
 	_film = f;
 
 	_frame.reset ();
-	_queue.clear ();
-
+	
 	_slider->SetValue (0);
 	set_position_text (0);
 	
@@ -286,12 +285,6 @@ FilmViewer::process_video (shared_ptr<const Image> image, Eyes eyes, Time t)
 		return;
 	}
 	
-	if (_got_frame) {
-		/* This is an additional frame emitted by a single pass.  Store it. */
-		_queue.push_front (make_pair (image, t));
-		return;
-	}
-	
 	_frame = image;
 	_got_frame = true;
 
@@ -335,17 +328,16 @@ FilmViewer::fetch_next_frame ()
 
 	_got_frame = false;
 	
-	if (!_queue.empty ()) {
-		process_video (_queue.back().first, EYES_BOTH, _queue.back().second);
-		_queue.pop_back ();
-	} else {
-		try {
-			while (!_got_frame && !_player->pass ()) {}
-		} catch (DecodeError& e) {
-			_play_button->SetValue (false);
-			check_play_state ();
-			error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), std_to_wx(e.what()).data()));
-		}
+	try {
+		while (!_got_frame && !_player->pass ()) {}
+	} catch (DecodeError& e) {
+		_play_button->SetValue (false);
+		check_play_state ();
+		error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), std_to_wx(e.what()).data()));
+	} catch (OpenFileError& e) {
+		/* There was a problem opening a content file; we'll let this slide as it
+		   probably means a missing content file, which we're already taking care of.
+		*/
 	}
 
 	_panel->Refresh ();