X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flocal_time.h;h=e818ba6e32a9165fc9bb9ef53cab161967c1d309;hb=9eda188e03afb8cc4b7767a3dc073069b9669230;hp=4a7f3cd8a14001fdaf866cd2c4496452b1ba04d6;hpb=9e523d8a4062ad52330dff6c2ba50e54184c9bb2;p=libdcp.git

diff --git a/src/local_time.h b/src/local_time.h
index 4a7f3cd8..e818ba6e 100644
--- a/src/local_time.h
+++ b/src/local_time.h
@@ -1,20 +1,34 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 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
@@ -27,7 +41,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <string>
 
-class local_time_test;
+class local_time_basic_test;
 
 namespace dcp {
 
@@ -44,19 +58,44 @@ class LocalTime
 {
 public:
 	LocalTime ();
-	LocalTime (boost::posix_time::ptime);
-	LocalTime (std::string);
+	explicit LocalTime (struct tm tm);
+	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;
+
+	int day () const {
+		return _day;
+	}
+
+	int month () const {
+		return _month;
+	}
+
+	int year () const {
+		return _year;
+	}
+
+	void set_year (int y) {
+		_year = y;
+	}
+
+	void add_days (int d);
+	void add_months (int a);
+	void add_minutes (int a);
 
 	bool operator== (LocalTime const & other) const;
 	bool operator!= (LocalTime const & other) const;
+	bool operator< (LocalTime const & other) const;
 
 private:
-	friend class ::local_time_test;
+	friend class ::local_time_basic_test;
 
+	void set (struct tm const * tm);
+	void set (boost::posix_time::ptime);
 	void set_local_time_zone ();
 
 	/* Local time */
@@ -68,8 +107,11 @@ 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&