Fix erroneous reports of unresolved assets when checking OV/VF pairs.

[libdcp.git] / src / dcp_time.h

diff --git a/src/dcp_time.h b/src/dcp_time.h
index 387988f5484db88aa9b7c01d5cb3bf3042c27d35..1fae786c03e274fc35b12cd63208bc901562bfd7 100644 (file)
--- a/src/dcp_time.h
+++ b/src/dcp_time.h
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     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>
@@ -41,7 +56,7 @@ public:
        Time () : h (0), m (0), s (0), e (0), tcr (1) {}
 
        /** Construct a Time.
-        *  @param Frame index (starting from 0).
+        *  @param frame Frame index (starting from 0).
         *  @param frames_per_second Frames per second.
         *  @param tcr Timecode rate.
         */
@@ -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