X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_video_content_view.cc;h=b0f4b4f5d34dd255a8a5083b7ca883f96b5d160d;hb=4b76291eb0328840de4c5938a1be6340e5dea0fe;hp=a54b91de02ca864b84947e3d2353ba904f929acb;hpb=547f6e46176aa0e012458c591934ecc265e8e132;p=dcpomatic.git diff --git a/src/wx/timeline_video_content_view.cc b/src/wx/timeline_video_content_view.cc index a54b91de0..b0f4b4f5d 100644 --- a/src/wx/timeline_video_content_view.cc +++ b/src/wx/timeline_video_content_view.cc @@ -1,27 +1,29 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#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) @@ -32,12 +34,27 @@ TimelineVideoContentView::TimelineVideoContentView (Timeline& tl, shared_ptr c = _content.lock (); + DCPOMATIC_ASSERT (c); + return c->video && c->video->use(); +}