No-op; fix GPL address and use the explicit-program-name version.

[dcpomatic.git] / src / lib / dcpomatic_time.h

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index 4fa6db0a4c690311dbb31974861ec349ad2d2392..c538357ccbe12c57093fb59bbc91758f8e1a1138 100644 (file)
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -1,19 +1,20 @@
 /*
     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 DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -132,7 +133,11 @@ public:
 
        template <typename T>
        int64_t frames_round (T r) const {
-               return llrint (_t * r / HZ);
+               /* We must cast to double here otherwise if T is integer
+                  the calculation will round down before we get the chance
+                  to llrint().
+               */
+               return llrint (_t * double(r) / HZ);
        }
 
        template <typename T>
@@ -142,7 +147,11 @@ public:
 
        template <typename T>
        int64_t frames_ceil (T r) const {
-               return ceil (_t * r / HZ);
+               /* We must cast to double here otherwise if T is integer
+                  the calculation will round down before we get the chance
+                  to ceil().
+               */
+               return ceil (_t * double(r) / HZ);
        }
 
        /** @param r Frames per second */
@@ -239,9 +248,15 @@ public:
                , to (t)
        {}
 
+       /** start time of sampling interval that the period is from */
        T from;
+       /** start time of next sampling interval after the period */
        T to;
 
+       T duration () const {
+               return to - from;
+       }
+
        TimePeriod<T> operator+ (T const & o) const {
                return TimePeriod<T> (from + o, to + o);
        }
@@ -254,7 +269,7 @@ public:
                return (from <= other && other < to);
        }
 
-       bool operator== (TimePeriod<T> const & other) {
+       bool operator== (TimePeriod<T> const & other) const {
                return from == other.from && to == other.to;
        }
 };
@@ -268,5 +283,6 @@ ContentTime min (ContentTime a, ContentTime b);
 ContentTime max (ContentTime a, ContentTime b);
 std::ostream& operator<< (std::ostream& s, ContentTime t);
 std::ostream& operator<< (std::ostream& s, DCPTime t);
+std::ostream& operator<< (std::ostream& s, DCPTimePeriod p);
 
 #endif