X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.h;h=7e832241e82fa211e2572091c6ca2ef52fd9e1f2;hp=070562458b64d396468728892c438027637756bc;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hpb=39029279954b1f346d3ba28ec12c58211bfa7436 diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h index 070562458..7e832241e 100644 --- a/src/lib/dcp_subtitle_decoder.h +++ b/src/lib/dcp_subtitle_decoder.h @@ -1,38 +1,39 @@ /* Copyright (C) 2014 Carl Hetherington - 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 . */ -#include "subtitle_decoder.h" +#include "text_decoder.h" +#include "dcp_subtitle.h" class DCPSubtitleContent; -class DCPSubtitleDecoder : public SubtitleDecoder +class DCPSubtitleDecoder : public DCPSubtitle, public Decoder { public: DCPSubtitleDecoder (boost::shared_ptr); -protected: - void seek (ContentTime time, bool accurate); - bool pass (); + bool pass (boost::shared_ptr film); + void seek (boost::shared_ptr film, ContentTime time, bool accurate); private: - std::list subtitles_during (ContentTimePeriod, bool starting) const; + ContentTimePeriod content_time_period (boost::shared_ptr s) const; - std::list _subtitles; - std::list::const_iterator _next; + std::list > _subtitles; + std::list >::const_iterator _next; };