X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_video_content_view.cc;h=b0f4b4f5d34dd255a8a5083b7ca883f96b5d160d;hb=9ff22e1694a53f09a84b01685b64dcb83e830365;hp=731108c93ac7e890414c838b41c48174c00caeef;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/wx/timeline_video_content_view.cc b/src/wx/timeline_video_content_view.cc index 731108c93..b0f4b4f5d 100644 --- a/src/wx/timeline_video_content_view.cc +++ b/src/wx/timeline_video_content_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -18,11 +18,12 @@ */ -#include "timeline_video_content_view.h" #include "lib/image_content.h" +#include "lib/video_content.h" +#include "timeline_video_content_view.h" -using boost::dynamic_pointer_cast; -using boost::shared_ptr; +using std::dynamic_pointer_cast; +using std::shared_ptr; TimelineVideoContentView::TimelineVideoContentView (Timeline& tl, shared_ptr c) : TimelineContentView (tl, c) @@ -33,12 +34,27 @@ TimelineVideoContentView::TimelineVideoContentView (Timeline& tl, shared_ptr c = _content.lock (); + DCPOMATIC_ASSERT (c); + return c->video && c->video->use(); +}