X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.h;h=6d0479638c6462a34ffbba190d3c9607b4b36743;hb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;hp=317755107abaca3b6445c972ea56ae68c84aa6b2;hpb=504c63b3d62038bc486ca8a09e77fbb403907edd;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 317755107..6d0479638 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2016 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/>.
 
 */
 
@@ -24,11 +25,17 @@
 #include "rect.h"
 #include "types.h"
 #include "content_subtitle.h"
+#include "decoder_part.h"
 #include <dcp/subtitle_string.h>
+#include <boost/signals2.hpp>
+
+namespace sub {
+	class Subtitle;
+}
 
 class Image;
 
-class SubtitleDecoder
+class SubtitleDecoder : public DecoderPart
 {
 public:
 	/** Second parameter to the _during functions is true if we
@@ -38,33 +45,27 @@ public:
 	SubtitleDecoder (
 		Decoder* parent,
 		boost::shared_ptr<const SubtitleContent>,
-		boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> image_subtitles_during,
-		boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> text_subtitles_during
+		boost::shared_ptr<Log> log
 		);
 
-	std::list<ContentImageSubtitle> get_image_subtitles (ContentTimePeriod period, bool starting, bool accurate);
-	std::list<ContentTextSubtitle> get_text_subtitles (ContentTimePeriod period, bool starting, bool accurate);
-
-	void seek (ContentTime, bool);
+	ContentTime position () const {
+		return _position;
+	}
 
-	void image_subtitle (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
-	void text_subtitle (ContentTimePeriod period, std::list<dcp::SubtitleString>);
+	void emit_image (ContentTimePeriod period, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
+	void emit_text (ContentTimePeriod period, std::list<dcp::SubtitleString> s);
+	void emit_text (ContentTimePeriod period, sub::Subtitle const & subtitle);
 
 	boost::shared_ptr<const SubtitleContent> content () const {
-		return _subtitle_content;
+		return _content;
 	}
 
-private:
-	Decoder* _parent;
-	std::list<ContentImageSubtitle> _decoded_image_subtitles;
-	std::list<ContentTextSubtitle> _decoded_text_subtitles;
-	boost::shared_ptr<const SubtitleContent> _subtitle_content;
-
-	template <class T>
-	std::list<T> get (std::list<T> const & subs, std::list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting, bool accurate);
+	boost::signals2::signal<void (ContentImageSubtitle)> ImageData;
+	boost::signals2::signal<void (ContentTextSubtitle)> TextData;
 
-	boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> _image_subtitles_during;
-	boost::function<std::list<ContentTimePeriod> (ContentTimePeriod, bool)> _text_subtitles_during;
+private:
+	boost::shared_ptr<const SubtitleContent> _content;
+	ContentTime _position;
 };
 
 #endif