X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_subtitle_stream.h;h=8b0274a5d5f16032378bff390557d6371a3e1740;hb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;hp=33247558f29a731871875b3f6de9a4aaaa1b03e8;hpb=4337694dfd488e88f56b63898ad35ce8ce9bb3c3;p=dcpomatic.git diff --git a/src/lib/ffmpeg_subtitle_stream.h b/src/lib/ffmpeg_subtitle_stream.h index 33247558f..8b0274a5d 100644 --- a/src/lib/ffmpeg_subtitle_stream.h +++ b/src/lib/ffmpeg_subtitle_stream.h @@ -30,16 +30,15 @@ public: : FFmpegStream (n, i) {} - FFmpegSubtitleStream (cxml::ConstNodePtr, int version); + FFmpegSubtitleStream (cxml::ConstNodePtr node, int version); void as_xml (xmlpp::Node *) const; void add_image_subtitle (std::string id, ContentTimePeriod period); void add_text_subtitle (std::string id, ContentTimePeriod period); void set_subtitle_to (std::string id, ContentTime to); - std::list image_subtitles_during (ContentTimePeriod period, bool starting) const; - std::list text_subtitles_during (ContentTimePeriod period, bool starting) const; ContentTime find_subtitle_to (std::string id) const; + bool unknown_to (std::string id) const; void add_offset (ContentTime offset); void set_colour (RGBA from, RGBA to); std::map colours () const; @@ -52,7 +51,6 @@ private: typedef std::map PeriodMap; void as_xml (xmlpp::Node *, PeriodMap const & subs, std::string node) const; - std::list subtitles_during (ContentTimePeriod period, bool starting, PeriodMap const & subs) const; PeriodMap _image_subtitles; PeriodMap _text_subtitles;