X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fcontent.h;h=ea2aaf8d40e7e43f9b413315a51d2aeb286214d7;hb=c986b12a5a7490cf87ebcd1aa2e7496338531aaf;hp=0ce9d39c146a781d3b5f54d7755e67c33e3c9d9c;hpb=6f344b876689a1234a5eb75041882f06f5d9fe5c;p=dcpomatic.git

diff --git a/src/lib/content.h b/src/lib/content.h
index 0ce9d39c1..ea2aaf8d4 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    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
@@ -156,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;
 	}
@@ -167,6 +178,8 @@ public:
 	boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
 
 	boost::shared_ptr<VideoContent> video;
+	boost::shared_ptr<AudioContent> audio;
+	boost::shared_ptr<SubtitleContent> subtitle;
 
 	void signal_changed (int);
 
@@ -185,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;
 };