X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_subtitle.h;h=f834fe197c202eba95fb2f78d26d01dae4412527;hb=c6871fe8617b3de03662b7630355059393bf8043;hp=6a28c37bf2c79b19eb3ffde4040f66559c6b277a;hpb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;p=dcpomatic.git

diff --git a/src/lib/content_subtitle.h b/src/lib/content_subtitle.h
index 6a28c37bf..f834fe197 100644
--- a/src/lib/content_subtitle.h
+++ b/src/lib/content_subtitle.h
@@ -1,67 +1,73 @@
 /*
     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/>.
 
 */
 
 #ifndef DCPOMATIC_CONTENT_SUBTITLE_H
 #define DCPOMATIC_CONTENT_SUBTITLE_H
 
-#include <list>
-#include <dcp/subtitle_string.h>
 #include "dcpomatic_time.h"
 #include "rect.h"
+#include "image_subtitle.h"
+#include <dcp/subtitle_string.h>
+#include <list>
 
 class Image;
 
 class ContentSubtitle
 {
 public:
-	virtual ContentTimePeriod period () const = 0;
+	explicit ContentSubtitle (ContentTime f)
+		: _from (f)
+	{}
+
+	ContentTime from () const {
+		return _from;
+	}
+
+private:
+	ContentTime _from;
 };
 
 class ContentImageSubtitle : public ContentSubtitle
 {
 public:
-	ContentImageSubtitle (ContentTimePeriod p, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
-		: image (im)
-		, rectangle (r)
-		, _period (p)
+	ContentImageSubtitle (ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
+		: ContentSubtitle (f)
+		, sub (im, r)
 	{}
 
-	ContentTimePeriod period () const {
-		return _period;
-	}
-
-	boost::shared_ptr<Image> image;
-	dcpomatic::Rect<double> rectangle;
-
-private:
-	ContentTimePeriod _period;
+	/* Our subtitle, with its rectangle unmodified by any offsets or scales that the content specifies */
+	ImageSubtitle sub;
 };
 
+/** A text subtitle.  We store the time period separately (as well as in the dcp::SubtitleStrings)
+ *  as the dcp::SubtitleString timings are sometimes quite heavily quantised and this causes problems
+ *  when we want to compare the quantised periods to the unquantised ones.
+ */
 class ContentTextSubtitle : public ContentSubtitle
 {
 public:
-	ContentTextSubtitle (std::list<dcp::SubtitleString> s)
-		: subs (s)
+	ContentTextSubtitle (ContentTime f, std::list<dcp::SubtitleString> s)
+		: ContentSubtitle (f)
+		, subs (s)
 	{}
 
-	ContentTimePeriod period () const;
-	
 	std::list<dcp::SubtitleString> subs;
 };