projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
src
/
lib
/
dcp_decoder.h
diff --git
a/src/lib/dcp_decoder.h
b/src/lib/dcp_decoder.h
index 7238f3bb200224af81da71dba1a3dbead5998212..4068696eafe397620b824d3665a0f0e9e541752d 100644
(file)
--- 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/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;
namespace dcp {
class Reel;
@@
-39,13
+40,13
@@
struct dcp_subtitle_within_dcp_test;
class DCPDecoder : public DCP, public Decoder
{
public:
class DCPDecoder : public DCP, public Decoder
{
public:
- DCPDecoder (boost::shared_ptr<const
DCPContent>, boost::shared_ptr<Log> log
, bool fast);
+ DCPDecoder (boost::shared_ptr<const
Film> film, boost::shared_ptr<const DCPContent>
, bool fast);
std::list<boost::shared_ptr<dcp::Reel> > reels () const {
return _reels;
}
std::list<boost::shared_ptr<dcp::Reel> > reels () const {
return _reels;
}
- void set_decode_referenced ();
+ void set_decode_referenced (
bool r
);
void set_forced_reduction (boost::optional<int> reduction);
bool pass ();
void set_forced_reduction (boost::optional<int> reduction);
bool pass ();
@@
-56,7
+57,15
@@
private:
void next_reel ();
void get_readers ();
void next_reel ();
void get_readers ();
- void pass_subtitles (ContentTime next);
+ void pass_texts (ContentTime next, dcp::Size size);
+ void pass_texts (
+ ContentTime next,
+ boost::shared_ptr<dcp::SubtitleAsset> asset,
+ bool reference,
+ int64_t entry_point,
+ boost::shared_ptr<TextDecoder> decoder,
+ dcp::Size size
+ );
/** Time of next thing to return from pass relative to the start of _reel */
ContentTime _next;
/** Time of next thing to return from pass relative to the start of _reel */
ContentTime _next;