projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: extract encrypt() call from Film::make_kdm().
[dcpomatic.git]
/
src
/
lib
/
piece.h
diff --git
a/src/lib/piece.h
b/src/lib/piece.h
index 688242c064d5b54013217fb6c98a942540445817..9fd53748d42f4a83c3b40365623fe5fc5fe2d935 100644
(file)
--- a/
src/lib/piece.h
+++ b/
src/lib/piece.h
@@
-25,7
+25,7
@@
#include "dcpomatic_time.h"
#include "frame_rate_change.h"
#include "dcpomatic_time.h"
#include "frame_rate_change.h"
-#include
"types.h"
+#include
<vector>
class Content;
class Content;
@@
-44,7
+44,8
@@
public:
std::shared_ptr<Content> content;
std::shared_ptr<Decoder> decoder;
std::shared_ptr<Content> content;
std::shared_ptr<Decoder> decoder;
- boost::optional<dcpomatic::DCPTimePeriod> ignore_video;
+ std::vector<dcpomatic::DCPTimePeriod> ignore_video;
+ std::vector<dcpomatic::DCPTimePeriod> ignore_atmos;
FrameRateChange frc;
bool done;
};
FrameRateChange frc;
bool done;
};