X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=107a9564426e46e83b3f440a36a2a3016862e1b4;hb=20467713a9efeaf4e32d4e9c644af8afb507da65;hp=aa382d68b9e5f53fa233e70a6d4925ae65a73b9e;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index aa382d68b..107a95644 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 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 . */ @@ -28,10 +29,12 @@ #include "film.h" #include "safe_stringstream.h" #include "job.h" +#include "compose.hpp" #include "raw_convert.h" #include #include #include +#include #include "i18n.h" @@ -40,6 +43,7 @@ using std::list; using std::cout; using std::vector; using std::max; +using std::pair; using boost::shared_ptr; int const ContentProperty::PATH = 400; @@ -47,6 +51,7 @@ int const ContentProperty::POSITION = 401; int const ContentProperty::LENGTH = 402; int const ContentProperty::TRIM_START = 403; int const ContentProperty::TRIM_END = 404; +int const ContentProperty::VIDEO_FRAME_RATE = 405; Content::Content (shared_ptr film) : _film (film) @@ -87,9 +92,9 @@ Content::Content (shared_ptr film, cxml::ConstNodePtr node) _paths.push_back ((*i)->content ()); } _digest = node->optional_string_child ("Digest").get_value_or ("X"); - _position = DCPTime (node->number_child ("Position")); - _trim_start = DCPTime (node->number_child ("TrimStart")); - _trim_end = DCPTime (node->number_child ("TrimEnd")); + _position = DCPTime (node->number_child ("Position")); + _trim_start = ContentTime (node->number_child ("TrimStart")); + _trim_end = ContentTime (node->number_child ("TrimEnd")); } Content::Content (shared_ptr film, vector > c) @@ -100,11 +105,11 @@ Content::Content (shared_ptr film, vector > c) , _change_signals_frequent (false) { for (size_t i = 0; i < c.size(); ++i) { - if (i > 0 && c[i]->trim_start() > DCPTime()) { + if (i > 0 && c[i]->trim_start() > ContentTime ()) { throw JoinError (_("Only the first piece of content to be joined can have a start trim.")); } - if (i < (c.size() - 1) && c[i]->trim_end () > DCPTime()) { + if (i < (c.size() - 1) && c[i]->trim_end () > ContentTime ()) { throw JoinError (_("Only the last piece of content to be joined can have an end trim.")); } @@ -152,7 +157,11 @@ Content::examine (shared_ptr job) void Content::signal_changed (int p) { - emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent)); + try { + emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent)); + } catch (boost::bad_weak_ptr) { + /* This must be during construction; never mind */ + } } void @@ -171,7 +180,7 @@ Content::set_position (DCPTime p) } void -Content::set_trim_start (DCPTime t) +Content::set_trim_start (ContentTime t) { { boost::mutex::scoped_lock lm (_mutex); @@ -182,7 +191,7 @@ Content::set_trim_start (DCPTime t) } void -Content::set_trim_end (DCPTime t) +Content::set_trim_end (ContentTime t) { { boost::mutex::scoped_lock lm (_mutex); @@ -220,11 +229,11 @@ Content::technical_summary () const DCPTime Content::length_after_trim () const { - return max (DCPTime (), full_length() - trim_start() - trim_end()); + return max (DCPTime (), full_length() - DCPTime (trim_start() + trim_end(), film()->active_frame_rate_change (position ()))); } -/** @return string which includes everything about how this content affects - * its playlist. +/** @return string which changes when something about this content changes which affects + * the appearance of its video. */ string Content::identifier () const @@ -273,3 +282,60 @@ Content::path_summary () const return s; } + +/** @return a list of properties that might be interesting to the user */ +list +Content::user_properties () const +{ + list p; + add_properties (p); + return p; +} + +shared_ptr +Content::film () const +{ + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + return film; +} + +/** @return DCP times of points within this content where a reel split could occur */ +list +Content::reel_split_points () const +{ + list t; + /* XXX: this is questionable; perhaps the position itself should be forced to be on a frame boundary */ + t.push_back (position().round_up (film()->video_frame_rate())); + return t; +} + +void +Content::set_video_frame_rate (double r) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _video_frame_rate = r; + } + + signal_changed (ContentProperty::VIDEO_FRAME_RATE); +} + +double +Content::active_video_frame_rate () const +{ + { + boost::mutex::scoped_lock lm (_mutex); + if (_video_frame_rate) { + return _video_frame_rate.get (); + } + } + + /* No frame rate specified, so assume this content has been + prepared for any concurrent video content or perhaps + just the DCP rate. + */ + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + return film->active_frame_rate_change(position()).source; +}