X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_content_view.cc;h=bb84d6147fe50e1b22f4a74145e3eac80c73257a;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=eacfbfd4a0143a493803d8f9a578e6446edac1b8;hpb=220518a7bf41bfd9e9da852b4d5ac1461fdd0e1a;p=dcpomatic.git

diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index eacfbfd4a..bb84d6147 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -23,17 +23,20 @@
 #include "wx_util.h"
 #include "lib/content.h"
 #include <wx/graphics.h>
-#include <boost/foreach.hpp>
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
+using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
 	: TimelineView (tl)
 	, _content (c)
 	, _selected (false)
 {
-	_content_connection = c->Changed.connect (bind (&TimelineContentView::content_changed, this, _2));
+	_content_connection = c->Change.connect (bind (&TimelineContentView::content_change, this, _1, _3));
 }
 
 dcpomatic::Rect<int>
@@ -41,17 +44,17 @@ TimelineContentView::bbox () const
 {
 	DCPOMATIC_ASSERT (_track);
 
-	shared_ptr<const Film> film = _timeline.film ();
-	shared_ptr<const Content> content = _content.lock ();
+	auto film = _timeline.film ();
+	auto content = _content.lock ();
 	if (!film || !content) {
-		return dcpomatic::Rect<int> ();
+		return {};
 	}
 
 	return dcpomatic::Rect<int> (
 		time_x (content->position ()),
 		y_pos (_track.get()),
-		content->length_after_trim().seconds() * _timeline.pixels_per_second().get_value_or(0),
-		_timeline.track_height()
+		content->length_after_trim(film).seconds() * _timeline.pixels_per_second().get_value_or(0),
+		_timeline.pixels_per_track()
 		);
 }
 
@@ -83,7 +86,7 @@ TimelineContentView::set_track (int t)
 void
 TimelineContentView::unset_track ()
 {
-	_track = boost::optional<int> ();
+	_track = boost::optional<int>();
 }
 
 boost::optional<int>
@@ -97,14 +100,14 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
 {
 	DCPOMATIC_ASSERT (_track);
 
-	shared_ptr<const Film> film = _timeline.film ();
-	shared_ptr<const Content> cont = content ();
+	auto film = _timeline.film ();
+	auto cont = content ();
 	if (!film || !cont) {
 		return;
 	}
 
 	DCPTime const position = cont->position ();
-	DCPTime const len = cont->length_after_trim ();
+	DCPTime const len = cont->length_after_trim (film);
 
 	wxColour selected (background_colour().Red() / 2, background_colour().Green() / 2, background_colour().Blue() / 2);
 
@@ -116,18 +119,18 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
 	}
 
 	/* Outline */
-	wxGraphicsPath path = gc->CreatePath ();
-	path.MoveToPoint    (time_x (position) + 1,	      y_pos (_track.get()) + 4);
+	auto path = gc->CreatePath ();
+	path.MoveToPoint    (time_x (position) + 2,	      y_pos (_track.get()) + 4);
 	path.AddLineToPoint (time_x (position + len) - 1,     y_pos (_track.get()) + 4);
 	path.AddLineToPoint (time_x (position + len) - 1,     y_pos (_track.get() + 1) - 4);
-	path.AddLineToPoint (time_x (position) + 1,	      y_pos (_track.get() + 1) - 4);
-	path.AddLineToPoint (time_x (position) + 1,	      y_pos (_track.get()) + 4);
+	path.AddLineToPoint (time_x (position) + 2,	      y_pos (_track.get() + 1) - 4);
+	path.AddLineToPoint (time_x (position) + 2,	      y_pos (_track.get()) + 4);
 	gc->StrokePath (path);
 	gc->FillPath (path);
 
 	/* Reel split points */
 	gc->SetPen (*wxThePenList->FindOrCreatePen (foreground_colour(), 1, wxPENSTYLE_DOT));
-	BOOST_FOREACH (DCPTime i, cont->reel_split_points ()) {
+	for (auto i: cont->reel_split_points(film)) {
 		path = gc->CreatePath ();
 		path.MoveToPoint (time_x (i), y_pos (_track.get()) + 4);
 		path.AddLineToPoint (time_x (i), y_pos (_track.get() + 1) - 4);
@@ -136,35 +139,46 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
 
 	/* Overlaps */
 	gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (foreground_colour(), wxBRUSHSTYLE_CROSSDIAG_HATCH));
-	for (list<dcpomatic::Rect<int> >::const_iterator i = overlaps.begin(); i != overlaps.end(); ++i) {
-		gc->DrawRectangle (i->x, i->y + 4, i->width, i->height - 8);
+	for (auto const& i: overlaps) {
+		gc->DrawRectangle (i.x, i.y + 4, i.width, i.height - 8);
 	}
 
 	/* Label text */
-	wxString name = std_to_wx (cont->summary());
-	wxDouble name_width;
-	wxDouble name_height;
-	wxDouble name_descent;
-	wxDouble name_leading;
+	auto lab = label ();
+	wxDouble lab_width;
+	wxDouble lab_height;
+	wxDouble lab_descent;
+	wxDouble lab_leading;
 	gc->SetFont (gc->CreateFont (*wxNORMAL_FONT, foreground_colour ()));
-	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().get_value_or(0), _timeline.track_height()));
-	gc->DrawText (name, time_x (position) + 12, y_pos (_track.get() + 1) - name_height - 4);
-	gc->ResetClip ();
+	gc->GetTextExtent (lab, &lab_width, &lab_height, &lab_descent, &lab_leading);
+	gc->PushState ();
+	gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len.seconds() * _timeline.pixels_per_second().get_value_or(0), _timeline.pixels_per_track()));
+	gc->DrawText (lab, time_x (position) + 12, y_pos (_track.get() + 1) - lab_height - 4);
+	gc->PopState ();
 }
 
 int
 TimelineContentView::y_pos (int t) const
 {
-	return t * _timeline.track_height();
+	return t * _timeline.pixels_per_track() + _timeline.tracks_y_offset();
 }
 
 void
-TimelineContentView::content_changed (int p)
+TimelineContentView::content_change (ChangeType type, int p)
 {
+	if (type != ChangeType::DONE) {
+		return;
+	}
+
 	ensure_ui_thread ();
 
 	if (p == ContentProperty::POSITION || p == ContentProperty::LENGTH) {
 		force_redraw ();
 	}
 }
+
+wxString
+TimelineContentView::label () const
+{
+	return std_to_wx(content()->summary());
+}