Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

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

diff --git a/src/lib/content.h b/src/lib/content.h
index 60dd89b97ef99cc71a579f4c72c2bd7738951f41..6b647790f2d635b9a038b5038513f40fce96dd8e 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/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/>.
 
 */
 
@@ -54,6 +55,7 @@ public:
        static int const LENGTH;
        static int const TRIM_START;
        static int const TRIM_END;
+       static int const VIDEO_FRAME_RATE;
 };
 
 /** @class Content
@@ -93,8 +95,6 @@ public:
         */
        virtual std::list<DCPTime> reel_split_points () const;
 
-       virtual void changed (int) {}
-
        boost::shared_ptr<Content> clone () const;
 
        void set_path (boost::filesystem::path);
@@ -158,6 +158,15 @@ public:
 
        DCPTime length_after_trim () const;
 
+       boost::optional<double> video_frame_rate () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _video_frame_rate;
+       }
+
+       void set_video_frame_rate (double r);
+
+       double active_video_frame_rate () const;
+
        void set_change_signals_frequent (bool f) {
                _change_signals_frequent = f;
        }
@@ -176,7 +185,7 @@ public:
 
 protected:
 
-       virtual void add_properties (std::list<UserProperty> &) const {}
+       virtual void add_properties (std::list<UserProperty> &) const;
 
        boost::weak_ptr<const Film> _film;
 
@@ -189,10 +198,20 @@ protected:
        std::vector<boost::filesystem::path> _paths;
 
 private:
+       friend struct ffmpeg_pts_offset_test;
+       friend struct best_dcp_frame_rate_test_single;
+       friend struct best_dcp_frame_rate_test_double;
+       friend struct audio_sampling_rate_test;
+
        std::string _digest;
        DCPTime _position;
        ContentTime _trim_start;
        ContentTime _trim_end;
+       /** The video frame rate that this content is or was prepared to be used with,
+        *  or empty if the effective rate of this content should be dictated by something
+        *  else (either some video happening at the same time, or the rate of the DCP).
+        */
+       boost::optional<double> _video_frame_rate;
        bool _change_signals_frequent;
 };