X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp_time.h;h=1fae786c03e274fc35b12cd63208bc901562bfd7;hb=9d3e7f716accd67985f23048b4c36e7581348848;hp=697ca230745b4cd46f53d65c5cad9a8e34484df0;hpb=bfb33feb40c5b014e9eae3958b1ecb8161f1d090;p=libdcp.git

diff --git a/src/dcp_time.h b/src/dcp_time.h
index 697ca230..1fae786c 100644
--- a/src/dcp_time.h
+++ b/src/dcp_time.h
@@ -1,20 +1,34 @@
 /*
-    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 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,44 +49,51 @@ namespace dcp {
 /** @class Time
  *  @brief A representation of time within a DCP.
  */
-	
 class Time
 {
 public:
-	Time () : h (0), m (0), s (0), t (0) {}
+	/** Construct a zero Time */
+	Time () : h (0), m (0), s (0), e (0), tcr (1) {}
 
-	Time (int64_t ticks);
-
-	/** Construct a Time from a frame index (starting from 0)
-	 *  and a frames per second count.
+	/** 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);
+	Time (int frame, double frames_per_second, int tcr);
 
-	/** Construct a Time from hours, minutes, seconds and ticks.
+	/** Construct a Time from hours, minutes, seconds, editable units and a timecode rate.
 	 *  @param h_ Hours.
 	 *  @param m_ Minutes.
 	 *  @param s_ Seconds.
-	 *  @param t_ Ticks (where 1 tick is 4 milliseconds).
+	 *  @param e_ Editable units (where 1 editable unit is 1 / tcr_ seconds)
+	 *  @param tcr_ Timecode rate; i.e. number of editable units per second.
 	 */
-	Time (int h_, int m_, int s_, int t_)
+	Time (int h_, int m_, int s_, int e_, int tcr_)
 		: h (h_)
 		, m (m_)
 		, s (s_)
-		, t (t_)
+		, e (e_)
+		, tcr (tcr_)
 	{}
 
-	Time (std::string time);
+	Time (double seconds, int tcr);
+
+	Time (std::string time, boost::optional<int> tcr);
 
-	int h; ///< hours
-	int m; ///< minutes
-	int s; ///< seconds
-	int t; ///< `ticks', where 1 tick is 4 milliseconds
+	int h; ///<   hours
+	int m; ///<   minutes
+	int s; ///<   seconds
+	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;
-	int64_t to_ticks () 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:
-	void set (double);
+	void set (double seconds, int tcr);
 };
 
 extern bool operator== (Time const & a, Time const & b);
@@ -78,9 +101,10 @@ 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 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 const & b);	
-extern Time operator- (Time a, Time const & b);
+extern Time operator+ (Time a, Time b);
+extern Time operator- (Time a, Time b);
 extern float operator/ (Time a, Time const & b);
 
 }