projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove gain/delay_line/matcher/trimmer.
[dcpomatic.git]
/
src
/
lib
/
ab_transcoder.h
diff --git
a/src/lib/ab_transcoder.h
b/src/lib/ab_transcoder.h
index 7bfcb393cb32182d833bde5cc52eeae0e47327a1..54d7ed0be3f336862f43b879ce99b8299c60c6c7 100644
(file)
--- a/
src/lib/ab_transcoder.h
+++ b/
src/lib/ab_transcoder.h
@@
-25,21
+25,14
@@
#include <boost/shared_ptr.hpp>
#include <stdint.h>
#include "util.h"
#include <boost/shared_ptr.hpp>
#include <stdint.h>
#include "util.h"
-#include "decoder_factory.h"
class Job;
class Encoder;
class Job;
class Encoder;
-class VideoDecoder;
-class AudioDecoder;
-class DecodeOptions;
class Image;
class Log;
class Image;
class Log;
-class Subtitle;
class Film;
class Film;
-class Matcher;
-class DelayLine;
-class Gain;
class Combiner;
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
@@
-51,23
+44,16
@@
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 DecodeOptions> o,
- Job* j,
- boost::shared_ptr<Encoder> e
+ boost::shared_ptr<Job> j
);
void go ();
private:
);
void go ();
private:
- boost::shared_ptr<
Film> _film
_a;
- boost::shared_ptr<
Film> _film
_b;
-
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;
- Decoders _da;
- Decoders _db;
boost::shared_ptr<Combiner> _combiner;
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;
};