X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_text_content_view.cc;h=a57398599d4392d00296d40deeccd479aa7f7531;hb=865316f0129c85cdd0248b87502fe97dec94b3f0;hp=934bf1fc4be12eb812da60a0a9253d08bf99536d;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git diff --git a/src/wx/timeline_text_content_view.cc b/src/wx/timeline_text_content_view.cc index 934bf1fc4..a57398599 100644 --- a/src/wx/timeline_text_content_view.cc +++ b/src/wx/timeline_text_content_view.cc @@ -18,11 +18,14 @@ */ + #include "timeline_text_content_view.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) : TimelineContentView (tl, c) @@ -54,7 +57,5 @@ TimelineTextContentView::foreground_colour () const bool TimelineTextContentView::active () const { - shared_ptr c = _content.lock (); - DCPOMATIC_ASSERT (c); return _caption->use(); }