X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_text_content_view.cc;h=722a9f30a30e45cce7628bda6eaff1f727f8eace;hb=7371f01c57d5f690c4175b1875d339fa5cbd49ae;hp=30158941c2fe711536ebde5ed9d7feafd8675e12;hpb=cbd4450197a083bf58bda510e626f73ba583cb66;p=dcpomatic.git diff --git a/src/wx/timeline_text_content_view.cc b/src/wx/timeline_text_content_view.cc index 30158941c..722a9f30a 100644 --- a/src/wx/timeline_text_content_view.cc +++ b/src/wx/timeline_text_content_view.cc @@ -19,12 +19,12 @@ */ #include "timeline_text_content_view.h" -#include "lib/caption_content.h" +#include "lib/text_content.h" #include "lib/content.h" -using boost::shared_ptr; +using std::shared_ptr; -TimelineTextContentView::TimelineTextContentView (Timeline& tl, shared_ptr c, shared_ptr caption) +TimelineTextContentView::TimelineTextContentView (Timeline& tl, shared_ptr c, shared_ptr caption) : TimelineContentView (tl, c) , _caption (caption) { @@ -54,7 +54,5 @@ TimelineTextContentView::foreground_colour () const bool TimelineTextContentView::active () const { - shared_ptr c = _content.lock (); - DCPOMATIC_ASSERT (c); return _caption->use(); }