X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;fp=src%2Fwx%2Ftimeline.cc;h=4b56168a1d0636be5d56642d212b8050e19b61ce;hp=d5643b556db5747c7e80099165217886435f0b87;hb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;hpb=8102046b2f29e0c7b234c29bf204b056cb30e64f

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index d5643b556..4b56168a1 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -68,7 +68,7 @@ protected:
 	
 	int time_x (DCPTime t) const
 	{
-		return _timeline.tracks_position().x + t.seconds() * _timeline.pixels_per_second ();
+		return _timeline.tracks_position().x + t.seconds() * _timeline.pixels_per_second().get_value_or (0);
 	}
 	
 	Timeline& _timeline;
@@ -105,7 +105,7 @@ public:
 		return dcpomatic::Rect<int> (
 			time_x (content->position ()) - 8,
 			y_pos (_track.get()) - 8,
-			content->length_after_trim().seconds() * _timeline.pixels_per_second() + 16,
+			content->length_after_trim().seconds() * _timeline.pixels_per_second().get_value_or(0) + 16,
 			_timeline.track_height() + 16
 			);
 	}
@@ -176,7 +176,7 @@ private:
 		wxDouble name_leading;
 		gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading);
 		
-		gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len.seconds() * _timeline.pixels_per_second(), _timeline.track_height()));
+		gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len.seconds() * _timeline.pixels_per_second().get_value_or(0), _timeline.track_height()));
 		gc->DrawText (name, time_x (position) + 12, y_pos (_track.get() + 1) - name_height - 4);
 		gc->ResetClip ();
 	}
@@ -292,9 +292,15 @@ private:
 
 	void do_paint (wxGraphicsContext* gc)
 	{
+		if (!_timeline.pixels_per_second()) {
+			return;
+		}
+
+		double const pps = _timeline.pixels_per_second().get ();
+		
 		gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID));
 		
-		double mark_interval = rint (128 / _timeline.pixels_per_second ());
+		double mark_interval = rint (128 / pps);
 		if (mark_interval > 5) {
 			mark_interval -= int (rint (mark_interval)) % 5;
 		}
@@ -319,7 +325,7 @@ private:
 
 		/* Time in seconds */
 		DCPTime t;
-		while ((t.seconds() * _timeline.pixels_per_second()) < _timeline.width()) {
+		while ((t.seconds() * pps) < _timeline.width()) {
 			wxGraphicsPath path = gc->CreatePath ();
 			path.MoveToPoint (time_x (t), _y - 4);
 			path.AddLineToPoint (time_x (t), _y + 4);
@@ -339,7 +345,7 @@ private:
 			wxDouble str_leading;
 			gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading);
 			
-			int const tx = _timeline.x_offset() + t.seconds() * _timeline.pixels_per_second();
+			int const tx = _timeline.x_offset() + t.seconds() * pps;
 			if ((tx + str_width) < _timeline.width()) {
 				gc->DrawText (str, time_x (t), _y + 16);
 			}
@@ -359,7 +365,6 @@ Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> film)
 	, _film (film)
 	, _time_axis_view (new TimeAxisView (*this, 32))
 	, _tracks (0)
-	, _pixels_per_second (0)
 	, _left_down (false)
 	, _down_view_position (0)
 	, _first_move (false)
@@ -602,6 +607,12 @@ Timeline::right_down (wxMouseEvent& ev)
 void
 Timeline::set_position_from_event (wxMouseEvent& ev)
 {
+	if (!_pixels_per_second) {
+		return;
+	}
+
+	double const pps = _pixels_per_second.get ();
+
 	wxPoint const p = ev.GetPosition();
 
 	if (!_first_move) {
@@ -619,7 +630,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 		return;
 	}
 	
-	DCPTime new_position = _down_view_position + DCPTime::from_seconds ((p.x - _down_point.x) / _pixels_per_second);
+	DCPTime new_position = _down_view_position + DCPTime::from_seconds ((p.x - _down_point.x) / pps);
 	
 	if (_snap) {
 		
@@ -660,7 +671,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 		
 		if (!first) {
 			/* Snap if it's close; `close' means within a proportion of the time on the timeline */
-			if (nearest_distance < DCPTime::from_seconds ((width() / pixels_per_second()) / 32)) {
+			if (nearest_distance < DCPTime::from_seconds ((width() / pps) / 32)) {
 				new_position = nearest_new_position;
 			}
 		}