More player debugging for butler video-full states.

[dcpomatic.git] / src / lib / video_content.h

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 432775651d8d08944089c34679a846873fa486bb..7ecc2813a067cf70f83509f5f1fe6aa23bf755ce 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -39,7 +40,6 @@ class VideoContentProperty
 {
 public:
        static int const SIZE;
-       static int const FRAME_RATE;
        static int const FRAME_TYPE;
        static int const CROP;
        static int const SCALE;
@@ -51,13 +51,13 @@ public:
 class VideoContent : public ContentPart, public boost::enable_shared_from_this<VideoContent>
 {
 public:
-       VideoContent (Content* parent, boost::shared_ptr<const Film>);
-       VideoContent (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
-       VideoContent (Content* parent, boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
+       explicit VideoContent (Content* parent);
+       VideoContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
 
        void as_xml (xmlpp::Node *) const;
        std::string technical_summary () const;
        std::string identifier () const;
+       void take_settings_from (boost::shared_ptr<const VideoContent> c);
 
        Frame length () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -78,18 +78,7 @@ public:
                return _size;
        }
 
-       double frame_rate () const;
-
-       /** @return true if this content has a specific video frame rate, false
-        *  if it should use the DCP's rate.
-        */
-       bool has_own_frame_rate () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return static_cast<bool>(_frame_rate);
-       }
-
        void set_frame_type (VideoFrameType);
-       void set_frame_rate (double);
 
        void set_left_crop (int);
        void set_right_crop (int);
@@ -167,18 +156,23 @@ public:
        dcp::Size size_after_3d_split () const;
        dcp::Size size_after_crop () const;
 
-       boost::optional<double> fade (Frame) const;
+       boost::optional<double> fade (boost::shared_ptr<const Film> film, Frame) const;
 
-       void scale_and_crop_to_fit_width ();
-       void scale_and_crop_to_fit_height ();
+       void scale_and_crop_to_fit_width (boost::shared_ptr<const Film> film);
+       void scale_and_crop_to_fit_height (boost::shared_ptr<const Film> film);
 
-       std::string processing_description () const;
+       std::string processing_description (boost::shared_ptr<const Film> film) const;
 
        void set_length (Frame);
 
        void take_from_examiner (boost::shared_ptr<VideoExaminer>);
        void add_properties (std::list<UserProperty> &) const;
 
+       void modify_position (boost::shared_ptr<const Film> film, DCPTime& pos) const;
+       void modify_trim_start (ContentTime& pos) const;
+
+       static boost::shared_ptr<VideoContent> from_xml (Content* parent, cxml::ConstNodePtr, int);
+
 private:
 
        friend struct ffmpeg_pts_offset_test;
@@ -186,11 +180,10 @@ private:
        friend struct best_dcp_frame_rate_test_double;
        friend struct audio_sampling_rate_test;
 
+       VideoContent (Content* parent, cxml::ConstNodePtr, int);
        void setup_default_colour_conversion ();
 
        Frame _length;
-       /** Video frame rate, or not set if this content should use the DCP's frame rate */
-       boost::optional<double> _frame_rate;
        boost::optional<ColourConversion> _colour_conversion;
        dcp::Size _size;
        VideoFrameType _frame_type;