X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=ed1a2ce4109293b3d932be8fabacb2bc4477878b;hb=93439dbc6d93dafd88e80d51d6473c8d97aa02c7;hp=0e1fe3ea0ab87baf7453e175c6c30ad204efe0b2;hpb=ef4cd174472dc1c4694d4451dc60b9292c60666b;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 0e1fe3ea0..ed1a2ce41 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@
 #include "lib/examine_content_job.h"
 #include "lib/filter.h"
 #include "lib/player.h"
+#include "lib/player_video_frame.h"
 #include "lib/video_content.h"
 #include "lib/video_decoder.h"
 #include "film_viewer.h"
@@ -45,6 +46,7 @@ using std::min;
 using std::max;
 using std::cout;
 using std::list;
+using std::bad_alloc;
 using std::make_pair;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
@@ -126,9 +128,16 @@ FilmViewer::set_film (shared_ptr<Film> f)
 		return;
 	}
 
-	_player = f->make_player ();
+	try {
+		_player = f->make_player ();
+	} catch (bad_alloc) {
+		error_dialog (this, _("There is not enough free memory to do that."));
+		_film.reset ();
+		return;
+	}
+	
 	_player->disable_audio ();
-	_player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _2, _5));
+	_player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _3));
 	_player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
 
 	calculate_sizes ();
@@ -185,9 +194,7 @@ FilmViewer::paint_panel ()
 		return;
 	}
 
-	shared_ptr<Image> packed_frame (new Image (_frame, false));
-
-	wxImage frame (_out_size.width, _out_size.height, packed_frame->data()[0], true);
+	wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true);
 	wxBitmap frame_bitmap (frame);
 	dc.DrawBitmap (frame_bitmap, 0, 0);
 
@@ -213,7 +220,12 @@ void
 FilmViewer::slider_moved ()
 {
 	if (_film && _player) {
-		_player->seek (_slider->GetValue() * _film->length() / 4096, false);
+		Time t = _slider->GetValue() * _film->length() / 4096;
+		/* Ensure that we hit the end of the film at the end of the slider */
+		if (t >= _film->length ()) {
+			t = _film->length() - _film->video_frames_to_time (1);
+		}
+		_player->seek (t, false);
 		fetch_next_frame ();
 	}
 }
@@ -277,13 +289,13 @@ FilmViewer::check_play_state ()
 }
 
 void
-FilmViewer::process_video (shared_ptr<const Image> image, Eyes eyes, Time t)
+FilmViewer::process_video (shared_ptr<PlayerVideoFrame> pvf, Time t)
 {
-	if (eyes == EYES_RIGHT) {
+	if (pvf->eyes() == EYES_RIGHT) {
 		return;
 	}
 	
-	_frame = image;
+	_frame = pvf->image ();
 	_got_frame = true;
 
 	set_position_text (t);
@@ -398,7 +410,7 @@ FilmViewer::player_changed (bool frequent)
 	if (frequent) {
 		return;
 	}
-	
+
 	calculate_sizes ();
 	fetch_current_frame_again ();
 }