Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/active_subtitles.h b/src/lib/active_subtitles.h
index 97ca4c7dbdb660bb539614e425a52ac47a9c5eb5..1496bc5d26b3870196bdcdbf9979ee51ac4dc813 100644 (file)
--- a/src/lib/active_subtitles.h
+++ b/src/lib/active_subtitles.h
@@ -36,7 +36,7 @@ class Piece;
 class ActiveSubtitles : public boost::noncopyable
 {
 public:
-       std::list<PlayerSubtitles> get_burnt (DCPTime time, bool always_burn_subtitles) const;
+       std::list<PlayerSubtitles> get_burnt (DCPTimePeriod period, bool always_burn_subtitles) const;
        void clear_before (DCPTime time);
        void clear ();
        void add_from (boost::weak_ptr<Piece> piece, PlayerSubtitles ps, DCPTime from);