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..885393c10fa8de5645a78f13071af00b393d975d 100644 (file)
--- a/src/dcp_time.h
+++ b/src/dcp_time.h
@@ -24,7 +24,11 @@
 #ifndef LIBDCP_TIME_H
 #define LIBDCP_TIME_H
 
-namespace libdcp {
+#include <string>
+#include <iostream>
+#include <stdint.h>
+
+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.
         */