projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix _position with VIDEO_FRAME_TYPE_3D_ALTERNATE.
[dcpomatic.git]
/
src
/
lib
/
dcp_decoder.h
diff --git
a/src/lib/dcp_decoder.h
b/src/lib/dcp_decoder.h
index 6e1f95356a06f674a4562f3a385fd4d67f89b1f3..71687ad15df1e3eabe711466f7d27cc21f78e776 100644
(file)
--- a/
src/lib/dcp_decoder.h
+++ b/
src/lib/dcp_decoder.h
@@
-24,12
+24,12
@@
#include "decoder.h"
#include "dcp.h"
#include "decoder.h"
#include "dcp.h"
+#include <dcp/mono_picture_asset_reader.h>
+#include <dcp/stereo_picture_asset_reader.h>
+#include <dcp/sound_asset_reader.h>
namespace dcp {
class Reel;
namespace dcp {
class Reel;
- class MonoPictureAssetReader;
- class StereoPictureAssetReader;
- class SoundAssetReader;
}
class DCPContent;
}
class DCPContent;
@@
-47,17
+47,15
@@
public:
void set_decode_referenced ();
void set_decode_referenced ();
+ bool pass ();
+ void seek (ContentTime t, bool accurate);
+
private:
friend struct dcp_subtitle_within_dcp_test;
private:
friend struct dcp_subtitle_within_dcp_test;
- bool pass (PassReason, bool accurate);
- void seek (ContentTime t, bool accurate);
void next_reel ();
void get_readers ();
void next_reel ();
void get_readers ();
- std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
- std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
-
/** Time of next thing to return from pass relative to the start of _reel */
ContentTime _next;
std::list<boost::shared_ptr<dcp::Reel> > _reels;
/** Time of next thing to return from pass relative to the start of _reel */
ContentTime _next;
std::list<boost::shared_ptr<dcp::Reel> > _reels;