X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.h;h=904aaed7823a4e778d10af9be8e442b93f80a83a;hb=de2af791bdfdcd653752cba970e59efc7bf810c7;hp=ef62d8b88355f73c6a6f4e308e036664296fce1c;hpb=3b932abd0c7634483911e1d5361e12b2d094ae6f;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index ef62d8b88..904aaed78 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    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,37 +25,42 @@
 #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 : public virtual Decoder
+class SubtitleDecoder : public DecoderPart
 {
 public:
-	SubtitleDecoder (boost::shared_ptr<const SubtitleContent>);
-
-	std::list<ContentImageSubtitle> get_image_subtitles (ContentTimePeriod period, bool starting, bool accurate);
-	std::list<ContentTextSubtitle> get_text_subtitles (ContentTimePeriod period, bool starting, bool accurate);
+	/** Second parameter to the _during functions is true if we
+	 *  want only subtitles that start during the period,
+	 *  otherwise we want subtitles that overlap the period.
+	 */
+	SubtitleDecoder (
+		Decoder* parent,
+		boost::shared_ptr<const SubtitleContent>,
+		boost::shared_ptr<Log> log
+		);
 
-protected:
-	void seek (ContentTime, bool);
+	void emit_image (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
+	void emit_text (ContentTimePeriod period, std::list<dcp::SubtitleString>);
+	void emit_text (ContentTimePeriod period, sub::Subtitle const & subtitle);
 
-	void image_subtitle (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
-	void text_subtitle (ContentTimePeriod period, std::list<dcp::SubtitleString>);
+	boost::shared_ptr<const SubtitleContent> content () const {
+		return _content;
+	}
 
-	std::list<ContentImageSubtitle> _decoded_image_subtitles;
-	std::list<ContentTextSubtitle> _decoded_text_subtitles;
-	boost::shared_ptr<const SubtitleContent> _subtitle_content;
+	boost::signals2::signal<void (ContentImageSubtitle)> ImageData;
+	boost::signals2::signal<void (ContentTextSubtitle)> TextData;
 
 private:
-	template <class T>
-	std::list<T> get (std::list<T> const & subs, std::list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting, bool accurate);
-
-	/** @param starting true if we want only subtitles that start during the period, otherwise
-	 *  we want subtitles that overlap the period.
-	 */
-	virtual std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod period, bool starting) const = 0;
-	virtual std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod period, bool starting) const = 0;
+	boost::shared_ptr<const SubtitleContent> _content;
 };
 
 #endif