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' into content-rework-take5
[dcpomatic.git]
/
src
/
lib
/
ab_transcoder.h
diff --git
a/src/lib/ab_transcoder.h
b/src/lib/ab_transcoder.h
index c75398b5c7013dca8e1613c80f305edb12209515..b1b01d724f7b4818400122c7347aafe8d9f0bcad 100644
(file)
--- a/
src/lib/ab_transcoder.h
+++ b/
src/lib/ab_transcoder.h
@@
-28,12
+28,14
@@
class Job;
class Encoder;
class Job;
class Encoder;
-class Decoder;
-class Options;
class Image;
class Log;
class Image;
class Log;
-class Subtitle;
class Film;
class Film;
+class Matcher;
+class DelayLine;
+class Gain;
+class Combiner;
+class Player;
/** @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
@@
-45,24
+47,21
@@
public:
ABTranscoder (
boost::shared_ptr<Film> a,
boost::shared_ptr<Film> b,
ABTranscoder (
boost::shared_ptr<Film> a,
boost::shared_ptr<Film> b,
- boost::shared_ptr<const Options> o,
- Job* j,
- boost::shared_ptr<Encoder> e
+ boost::shared_ptr<Job> j
);
);
- ~ABTranscoder ();
-
void go ();
private:
void go ();
private:
- void process_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>, int);
-
boost::shared_ptr<Film> _film_a;
boost::shared_ptr<Film> _film_b;
boost::shared_ptr<Film> _film_a;
boost::shared_ptr<Film> _film_b;
- boost::shared_ptr<const Options> _opt;
- Job* _job;
+ boost::shared_ptr<Player> _player_a;
+ boost::shared_ptr<Player> _player_b;
+ boost::shared_ptr<Job> _job;
boost::shared_ptr<Encoder> _encoder;
boost::shared_ptr<Encoder> _encoder;
- boost::shared_ptr<Decoder> _da;
- boost::shared_ptr<Decoder> _db;
+ boost::shared_ptr<Combiner> _combiner;
+ boost::shared_ptr<Matcher> _matcher;
+ boost::shared_ptr<DelayLine> _delay_line;
+ boost::shared_ptr<Gain> _gain;
boost::shared_ptr<Image> _image;
};
boost::shared_ptr<Image> _image;
};