summaryrefslogtreecommitdiff
path: root/src/lib/player.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-10-12 15:05:09 +0100
committerCarl Hetherington <cth@carlh.net>2015-10-12 15:05:09 +0100
commitf9068dcbfbb09082e29e2a779ef1a7a2f6ee849e (patch)
tree40054a96c986c133b2edb00c7c9a127d8d36a1a2 /src/lib/player.h
parentbccc426dd0924bf6be63000835d7c86fd390ff59 (diff)
Rename split-by-video content slightly; fix referencing to multi-reel DCPs.
Diffstat (limited to 'src/lib/player.h')
-rw-r--r--src/lib/player.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/player.h b/src/lib/player.h
index 9bb84a11c..cd1423e9f 100644
--- 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.
@@ -50,7 +51,7 @@ public:
boost::shared_ptr<AudioBuffers> get_audio (DCPTime time, DCPTime length, bool accurate);
PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt);
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 ();