X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdcp_time.h;h=1fae786c03e274fc35b12cd63208bc901562bfd7;hb=d4b350cc524543b8142ac803232b31af751885e2;hp=907a83065c129cb5ca8dbaf738c5f38890ae88cd;hpb=e0906dd7b37e5fa45d87132bee49815f2e63a53e;p=libdcp.git

diff --git a/src/dcp_time.h b/src/dcp_time.h
index 907a8306..1fae786c 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
@@ -24,6 +38,8 @@
 #ifndef LIBDCP_TIME_H
 #define LIBDCP_TIME_H
 
+#include "types.h"
+#include <boost/optional.hpp>
 #include <stdint.h>
 #include <string>
 #include <iostream>
@@ -33,16 +49,18 @@ namespace dcp {
 /** @class Time
  *  @brief A representation of time within a DCP.
  */
-	
 class Time
 {
 public:
+	/** Construct a zero Time */
 	Time () : h (0), m (0), s (0), e (0), tcr (1) {}
 
-	/** Construct a Time from a frame index (starting from 0),
-	 *  a frames per second count and a timecode rate.
+	/** Construct a Time.
+	 *  @param frame Frame index (starting from 0).
+	 *  @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.
@@ -59,9 +77,9 @@ public:
 		, tcr (tcr_)
 	{}
 
-	Time (double seconds);
+	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
@@ -69,9 +87,9 @@ public:
 	int e; ///<   editable units (where 1 editable unit is 1 / tcr_ seconds)
 	int tcr; ///< timecode rate: the number of editable units per second.
 
-	std::string to_string () const;
-	double to_seconds () const;
-	int64_t to_editable_units (int tcr_) const;
+	std::string as_string (Standard standard) const;
+	double as_seconds () const;
+	int64_t as_editable_units (int tcr_) const;
 	Time rebase (int tcr_) const;
 
 private:
@@ -85,7 +103,7 @@ extern bool operator< (Time const & a, Time const & b);
 extern bool operator> (Time const & a, Time const & b);
 extern bool operator>= (Time const & a, Time const & b);
 extern std::ostream & operator<< (std::ostream & s, Time const & t);
-extern Time operator+ (Time a, Time b);	
+extern Time operator+ (Time a, Time b);
 extern Time operator- (Time a, Time b);
 extern float operator/ (Time a, Time const & b);