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

[libdcp.git] / src / local_time.h

diff --git a/src/local_time.h b/src/local_time.h
index b1751f8b0e884b8a620ad21ab24f196868fa7895..20658eb4d92b1caf7d92ce32d984e994318027d5 100644 (file)
--- a/src/local_time.h
+++ b/src/local_time.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2014-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/local_time.h
@@ -44,12 +58,17 @@ class LocalTime
 {
 public:
        LocalTime ();
-       LocalTime (boost::posix_time::ptime);
-       LocalTime (std::string);
+       explicit LocalTime (boost::posix_time::ptime);
+       LocalTime (boost::posix_time::ptime, int tz_hour, int tz_minute);
+       explicit LocalTime (std::string);
 
        std::string as_string (bool with_millisecond = false) const;
        std::string date () const;
-       std::string time_of_day (bool with_millisecond = false) const;
+       std::string time_of_day (bool with_second, bool with_millisecond) const;
+
+       bool operator== (LocalTime const & other) const;
+       bool operator!= (LocalTime const & other) const;
+       bool operator< (LocalTime const & other) const;
 
 private:
        friend class ::local_time_test;
@@ -65,10 +84,16 @@ private:
        int _second; ///< second number of the minute (0-59)
        int _millisecond; ///< millisecond number of the second (0-999)
 
-       int _tz_hour;   ///< hours by which this time is offset from UTC
-       int _tz_minute; ///< minutes by which this time is offset from UTC
+       int _tz_hour; ///< hours by which this time is offset from UTC; can be negative
+       /** Minutes by which this time is offset from UTC; if _tz_hour is negative
+        *  this will be either 0 or negative.
+        */
+       int _tz_minute;
 };
 
+std::ostream&
+operator<< (std::ostream& s, LocalTime const & t);
+
 }
 
 #endif