projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; fix crash on new film.
[dcpomatic.git]
/
src
/
lib
/
ab_transcoder.h
diff --git
a/src/lib/ab_transcoder.h
b/src/lib/ab_transcoder.h
index b1b01d724f7b4818400122c7347aafe8d9f0bcad..1fef66b8870a3ae72de2d8a645e056d656239350 100644
(file)
--- a/
src/lib/ab_transcoder.h
+++ b/
src/lib/ab_transcoder.h
@@
-36,6
+36,7
@@
class DelayLine;
class Gain;
class Combiner;
class Player;
class Gain;
class Combiner;
class Player;
+class Trimmer;
/** @class ABTranscoder
* @brief A transcoder which uses one Film for the left half of the screen, and a different one
/** @class ABTranscoder
* @brief A transcoder which uses one Film for the left half of the screen, and a different one
@@
-63,5
+64,6
@@
private:
boost::shared_ptr<Matcher> _matcher;
boost::shared_ptr<DelayLine> _delay_line;
boost::shared_ptr<Gain> _gain;
boost::shared_ptr<Matcher> _matcher;
boost::shared_ptr<DelayLine> _delay_line;
boost::shared_ptr<Gain> _gain;
+ boost::shared_ptr<Trimmer> _trimmer;
boost::shared_ptr<Image> _image;
};
boost::shared_ptr<Image> _image;
};