Basic (untested) ebur128 (#368).

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 9bb84a11cac03ad86da1b41684f5e73677869bff..bfb21abba515c3e0fed011b006e7adc8fa0a14cd 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -37,6 +37,7 @@ class PlayerVideo;
 class Playlist;
 class Font;
 class AudioBuffers;
+class ReferencedReelAsset;
 
 /** @class Player
  *  @brief A class which can `play' a Playlist.
@@ -48,9 +49,9 @@ public:
 
        std::list<boost::shared_ptr<PlayerVideo> > get_video (DCPTime time, bool accurate);
        boost::shared_ptr<AudioBuffers> get_audio (DCPTime time, DCPTime length, bool accurate);
-       PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt);
+       PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt, bool accurate);
        std::list<boost::shared_ptr<Font> > get_subtitle_fonts ();
-       std::list<boost::shared_ptr<dcp::ReelAsset> > get_reel_assets ();
+       std::list<ReferencedReelAsset> get_reel_assets ();
 
        void set_video_container_size (dcp::Size);
        void set_ignore_video ();
@@ -105,7 +106,7 @@ private:
                                continue;
                        }
 
-                       if ((*i)->content->position() <= to && (*i)->content->end() >= from) {
+                       if ((*i)->content->position() < to && (*i)->content->end() > from) {
                                overlaps.push_back (*i);
                        }
                }