Merge master.

[dcpomatic.git] / src / lib / ffmpeg_content.h

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 1a30fb60693db7683c18efc00b47a642848f1019..67839794b97945496f4158f7379349794273fa66 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -74,7 +74,7 @@ public:
        boost::filesystem::path audio_analysis_path () const;
 
        /* SubtitleContent */
-       bool has_subtitle_during (ContentTimePeriod) const;
+       bool has_subtitles () const;
 
        void set_filters (std::vector<Filter const *> const &);
        
@@ -111,6 +111,8 @@ public:
                return _first_video;
        }
 
+       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+
 private:
        friend class ffmpeg_pts_offset_test;