X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_text_content_view.cc;h=a57398599d4392d00296d40deeccd479aa7f7531;hb=391a2852b6e73792882df5ea0d65238d840ab894;hp=b4820bfea8471d4598fe38c60d13663a7c97a325;hpb=d7ac100c0eb1b5efdcfbec59be870fd869252840;p=dcpomatic.git

diff --git a/src/wx/timeline_text_content_view.cc b/src/wx/timeline_text_content_view.cc
index b4820bfea..a57398599 100644
--- a/src/wx/timeline_text_content_view.cc
+++ b/src/wx/timeline_text_content_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,14 +18,18 @@
 
 */
 
+
 #include "timeline_text_content_view.h"
 #include "lib/text_content.h"
 #include "lib/content.h"
 
-using boost::shared_ptr;
 
-TimelineTextContentView::TimelineTextContentView (Timeline& tl, shared_ptr<Content> c)
+using std::shared_ptr;
+
+
+TimelineTextContentView::TimelineTextContentView (Timeline& tl, shared_ptr<Content> c, shared_ptr<TextContent> caption)
 	: TimelineContentView (tl, c)
+	, _caption (caption)
 {
 
 }
@@ -53,7 +57,5 @@ TimelineTextContentView::foreground_colour () const
 bool
 TimelineTextContentView::active () const
 {
-	shared_ptr<Content> c = _content.lock ();
-	DCPOMATIC_ASSERT (c);
-	return c->subtitle && c->subtitle->use();
+	return _caption->use();
 }