X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_content_view.cc;h=5d039d0d3f0a2e82d252da234f63519b8eb4864e;hb=HEAD;hp=2f2b7e3ed3bf907d9a8433c6709112c52dedd4e4;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 2f2b7e3ed..5d039d0d3 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -18,12 +18,16 @@
 
 */
 
-#include "timeline_content_view.h"
+
 #include "timeline.h"
+#include "timeline_content_view.h"
 #include "wx_util.h"
 #include "lib/content.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
-#include <boost/foreach.hpp>
+LIBDCP_ENABLE_WARNINGS
+
 
 using std::list;
 using std::shared_ptr;
@@ -32,23 +36,24 @@ using namespace dcpomatic;
 using namespace boost::placeholders;
 #endif
 
+
 TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
 	: TimelineView (tl)
 	, _content (c)
-	, _selected (false)
 {
 	_content_connection = c->Change.connect (bind (&TimelineContentView::content_change, this, _1, _3));
 }
 
+
 dcpomatic::Rect<int>
 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> (
@@ -59,6 +64,7 @@ TimelineContentView::bbox () const
 		);
 }
 
+
 void
 TimelineContentView::set_selected (bool s)
 {
@@ -66,49 +72,55 @@ TimelineContentView::set_selected (bool s)
 	force_redraw ();
 }
 
+
 bool
 TimelineContentView::selected () const
 {
 	return _selected;
 }
 
+
 shared_ptr<Content>
 TimelineContentView::content () const
 {
 	return _content.lock ();
 }
 
+
 void
 TimelineContentView::set_track (int t)
 {
 	_track = t;
 }
 
+
 void
 TimelineContentView::unset_track ()
 {
-	_track = boost::optional<int> ();
+	_track = boost::optional<int>();
 }
 
+
 boost::optional<int>
 TimelineContentView::track () const
 {
 	return _track;
 }
 
+
 void
-TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> > overlaps)
+TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>> overlaps)
 {
 	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 (film);
+	auto const position = cont->position ();
+	auto const len = cont->length_after_trim (film);
 
 	wxColour selected (background_colour().Red() / 2, background_colour().Green() / 2, background_colour().Blue() / 2);
 
@@ -120,7 +132,7 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
 	}
 
 	/* Outline */
-	wxGraphicsPath path = gc->CreatePath ();
+	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);
@@ -131,7 +143,7 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
 
 	/* Reel split points */
 	gc->SetPen (*wxThePenList->FindOrCreatePen (foreground_colour(), 1, wxPENSTYLE_DOT));
-	BOOST_FOREACH (DCPTime i, cont->reel_split_points(film)) {
+	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);
@@ -140,12 +152,12 @@ 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 lab = label ();
+	auto lab = label ();
 	wxDouble lab_width;
 	wxDouble lab_height;
 	wxDouble lab_descent;
@@ -158,16 +170,11 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
 	gc->PopState ();
 }
 
-int
-TimelineContentView::y_pos (int t) const
-{
-	return t * _timeline.pixels_per_track() + _timeline.tracks_y_offset();
-}
 
 void
 TimelineContentView::content_change (ChangeType type, int p)
 {
-	if (type != CHANGE_TYPE_DONE) {
+	if (type != ChangeType::DONE) {
 		return;
 	}
 
@@ -178,6 +185,7 @@ TimelineContentView::content_change (ChangeType type, int p)
 	}
 }
 
+
 wxString
 TimelineContentView::label () const
 {