X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fcontent_subtitle.h;h=8751d56cb58f512d971428176f1545d762963017;hb=931b81e323c41a05b5f5612350ebc42ff20e97cb;hp=3c0ce523e8497e969836cf0305957fc323f2c46e;hpb=318a778b1b5c98b79b202dc953ff2ac131371a1b;p=dcpomatic.git

diff --git a/src/lib/content_subtitle.h b/src/lib/content_subtitle.h
index 3c0ce523e..8751d56cb 100644
--- a/src/lib/content_subtitle.h
+++ b/src/lib/content_subtitle.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 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/>.
 
 */
 
@@ -31,23 +32,23 @@ class Image;
 class ContentSubtitle
 {
 public:
-	ContentSubtitle (ContentTimePeriod p)
-		: _period (p)
+	ContentSubtitle (ContentTime f)
+		: _from (f)
 	{}
 
-	ContentTimePeriod period () const {
-		return _period;
+	ContentTime from () const {
+		return _from;
 	}
 
 private:
-	ContentTimePeriod _period;
+	ContentTime _from;
 };
 
 class ContentImageSubtitle : public ContentSubtitle
 {
 public:
-	ContentImageSubtitle (ContentTimePeriod p, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
-		: ContentSubtitle (p)
+	ContentImageSubtitle (ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
+		: ContentSubtitle (f)
 		, sub (im, r)
 	{}
 
@@ -62,8 +63,8 @@ public:
 class ContentTextSubtitle : public ContentSubtitle
 {
 public:
-	ContentTextSubtitle (ContentTimePeriod p, std::list<dcp::SubtitleString> s)
-		: ContentSubtitle (p)
+	ContentTextSubtitle (ContentTime f, std::list<dcp::SubtitleString> s)
+		: ContentSubtitle (f)
 		, subs (s)
 	{}