X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp_time.h;h=2a9f13d849c75e3d3d208e6901a5001e021089e2;hb=db536bd9f9f16b79286c5f0bb54d0f283050f7dd;hp=44e3cf0234bd7ccc37dab548ed81215052cebb5e;hpb=f6b789850b0cd50971707084632c4ec08e145d0f;p=libdcp.git

diff --git a/src/dcp_time.h b/src/dcp_time.h
index 44e3cf02..2a9f13d8 100644
--- a/src/dcp_time.h
+++ b/src/dcp_time.h
@@ -1,20 +1,34 @@
 /*
     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 libdcp.
+
+    libdcp 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,
+    libdcp 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 libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/dcp_time.h
@@ -25,6 +39,7 @@
 #define LIBDCP_TIME_H
 
 #include "types.h"
+#include <boost/optional.hpp>
 #include <stdint.h>
 #include <string>
 #include <iostream>
@@ -45,7 +60,7 @@ public:
 	 *  @param frames_per_second Frames per second.
 	 *  @param tcr Timecode rate.
 	 */
-	Time (int frame, int frames_per_second, int tcr);
+	Time (int frame, double frames_per_second, int tcr);
 
 	/** Construct a Time from hours, minutes, seconds, editable units and a timecode rate.
 	 *  @param h_ Hours.
@@ -64,7 +79,7 @@ public:
 
 	Time (double seconds, int tcr);
 
-	Time (std::string time, int tcr);
+	Time (std::string time, boost::optional<int> tcr);
 
 	int h; ///<   hours
 	int m; ///<   minutes