Merge branch 'master' into 1.0

[libdcp.git] / src / dcp_time.h

diff --git a/src/dcp_time.h b/src/dcp_time.h
index 1b73e3e8bc96f72655f721f4ce40cf75058b60b3..697ca230745b4cd46f53d65c5cad9a8e34484df0 100644 (file)
--- a/src/dcp_time.h
+++ b/src/dcp_time.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,13 +18,17 @@
 */
 
 /** @file  src/dcp_time.h
- *  @brief A representation of time within a DCP.
+ *  @brief Time class.
  */
 
 #ifndef LIBDCP_TIME_H
 #define LIBDCP_TIME_H
 
-namespace libdcp {
+#include <stdint.h>
+#include <string>
+#include <iostream>
+
+namespace dcp {
 
 /** @class Time
  *  @brief A representation of time within a DCP.
@@ -35,6 +39,8 @@ class Time
 public:
        Time () : h (0), m (0), s (0), t (0) {}
 
+       Time (int64_t ticks);
+
        /** Construct a Time from a frame index (starting from 0)
         *  and a frames per second count.
         */