X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.h;h=0756a278f4b475212e2313b2efe40c2dbf76d7d1;hp=52e40041683f61119a7445dc0fcc11d1ff1b9387;hb=00ae2c28501bb757a6a45ba47ad4ecbe32412933;hpb=9922c1f2eaea674ba2ff6cce5f5853655fd8ad7a

diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h
index 52e400416..0756a278f 100644
--- a/src/lib/dcp_subtitle_decoder.h
+++ b/src/lib/dcp_subtitle_decoder.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/>.
 
 */
 
@@ -22,19 +23,17 @@
 
 class DCPSubtitleContent;
 
-class DCPSubtitleDecoder : public SubtitleDecoder, public DCPSubtitle
+class DCPSubtitleDecoder : public DCPSubtitle, public Decoder
 {
 public:
-	DCPSubtitleDecoder (boost::shared_ptr<const DCPSubtitleContent>);
+	DCPSubtitleDecoder (boost::shared_ptr<const DCPSubtitleContent>, boost::shared_ptr<Log> log);
 
-protected:
-	bool pass (PassReason);
+	bool pass ();
 	void seek (ContentTime time, bool accurate);
 
 private:
-	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
-	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
+	ContentTimePeriod content_time_period (boost::shared_ptr<dcp::Subtitle> s) const;
 
-	std::list<dcp::SubtitleString> _subtitles;
-	std::list<dcp::SubtitleString>::const_iterator _next;
+	std::list<boost::shared_ptr<dcp::Subtitle> > _subtitles;
+	std::list<boost::shared_ptr<dcp::Subtitle> >::const_iterator _next;
 };