X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=7e1b618119eec5367b0374fa09239886a3f12181;hp=a4a293918df44cedec1b4c5ddc0a4f3ab5587d07;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hpb=2eb98168b80792ba21fe31423d50bd28c4f17837

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index a4a293918..7e1b61811 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
@@ -46,11 +46,12 @@ 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;
 using boost::weak_ptr;
-using libdcp::Size;
+using dcp::Size;
 
 FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
 	: wxPanel (p)
@@ -121,13 +122,20 @@ FilmViewer::set_film (shared_ptr<Film> f)
 	_frame.reset ();
 	
 	_slider->SetValue (0);
-	set_position_text (0);
+	set_position_text (DCPTime ());
 	
 	if (!_film) {
 		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->set_approximate_size ();
 	_player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _2, _5));
@@ -168,8 +176,8 @@ FilmViewer::timer ()
 
 	DCPTime const len = _film->length ();
 
-	if (len) {
-		int const new_slider_position = 4096 * _player->video_position() / len;
+	if (len.get ()) {
+		int const new_slider_position = 4096 * _player->video_position().get() / len.get();
 		if (new_slider_position != _slider->GetValue()) {
 			_slider->SetValue (new_slider_position);
 		}
@@ -214,7 +222,7 @@ FilmViewer::slider_moved ()
 {
 	if (_film && _player) {
 		try {
-			_player->seek (_slider->GetValue() * _film->length() / 4096, false);
+			_player->seek (DCPTime (_film->length().get() * _slider->GetValue() / 4096), false);
 			fetch_next_frame ();
 		} catch (OpenFileError& e) {
 			/* There was a problem opening a content file; we'll let this slide as it
@@ -317,9 +325,9 @@ FilmViewer::set_position_text (DCPTime t)
 		
 	double const fps = _film->video_frame_rate ();
 	/* Count frame number from 1 ... not sure if this is the best idea */
-	_frame_number->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps / TIME_HZ)) + 1));
+	_frame_number->SetLabel (wxString::Format (wxT("%d"), int (rint (t.seconds() * fps)) + 1));
 	
-	double w = static_cast<double>(t) / TIME_HZ;
+	double w = t.seconds ();
 	int const h = (w / 3600);
 	w -= h * 3600;
 	int const m = (w / 60);
@@ -390,9 +398,9 @@ FilmViewer::back_clicked ()
 	   We want to see the one before it, so we need to go back 2.
 	*/
 
-	DCPTime p = _player->video_position() - _film->video_frames_to_time (2);
-	if (p < 0) {
-		p = 0;
+	DCPTime p = _player->video_position() - DCPTime::from_frames (2, _film->video_frame_rate ());
+	if (p < DCPTime ()) {
+		p = DCPTime ();
 	}
 	
 	try {
@@ -421,7 +429,7 @@ FilmViewer::player_changed (bool frequent)
 	if (frequent) {
 		return;
 	}
-	
+
 	calculate_sizes ();
 	fetch_current_frame_again ();
 }