X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fframe_rate_change.h;h=ae3615328d7ce3e5dfccddc596611ad8c40cdeb1;hb=f17c1575ec037e3ac2ec95f2725335ca306fd700;hp=92af0ec0174635586161726426ed0295a7e512e7;hpb=0da7c88a1afb221f97e2e96c159b1a984e4e2f71;p=dcpomatic.git

diff --git a/src/lib/frame_rate_change.h b/src/lib/frame_rate_change.h
index 92af0ec01..ae3615328 100644
--- a/src/lib/frame_rate_change.h
+++ b/src/lib/frame_rate_change.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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/>.
 
 */
 
@@ -24,12 +25,12 @@
 
 struct FrameRateChange
 {
-	FrameRateChange (float, int);
+	FrameRateChange (double, int);
 
 	/** @return factor by which to multiply a source frame rate
 	    to get the effective rate after any skip or repeat has happened.
 	*/
-	float factor () const {
+	double factor () const {
 		if (skip) {
 			return 0.5;
 		}
@@ -37,6 +38,9 @@ struct FrameRateChange
 		return repeat;
 	}
 
+	double source;
+	int dcp;
+
 	/** true to skip every other frame */
 	bool skip;
 	/** number of times to use each frame (e.g. 1 is normal, 2 means repeat each frame once, and so on) */
@@ -55,9 +59,9 @@ struct FrameRateChange
 	/** Amount by which the video is being sped-up in the DCP; e.g. for a
 	 *  24fps source in a 25fps DCP this would be 25/24.
 	 */
-	float speed_up;
+	double speed_up;
 
-	std::string description;
+	std::string description () const;
 };
 
 #endif