summaryrefslogtreecommitdiff
path: root/src/lib/dcp_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-21 15:16:18 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-21 15:16:18 +0100
commitcbd4450197a083bf58bda510e626f73ba583cb66 (patch)
tree2be308772512539570beab36beab02bde72d6d4b /src/lib/dcp_decoder.h
parent1013175d5f6adfa0e6a7442e4c9aebb893787748 (diff)
Basics of multiple captions per content so that DCPContent can
hold subs and closed captions.
Diffstat (limited to 'src/lib/dcp_decoder.h')
-rw-r--r--src/lib/dcp_decoder.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 483c057ac..898b84e5d 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -27,6 +27,7 @@
#include <dcp/mono_picture_asset_reader.h>
#include <dcp/stereo_picture_asset_reader.h>
#include <dcp/sound_asset_reader.h>
+#include <dcp/subtitle_asset.h>
namespace dcp {
class Reel;
@@ -56,7 +57,8 @@ private:
void next_reel ();
void get_readers ();
- void pass_subtitles (ContentTime next);
+ void pass_captions (ContentTime next);
+ void pass_captions (ContentTime next, boost::shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, boost::shared_ptr<CaptionDecoder> decoder);
/** Time of next thing to return from pass relative to the start of _reel */
ContentTime _next;