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 4f1b14e48ef27bea3072510ae58088046c784ca0..1fef66b8870a3ae72de2d8a645e056d656239350 100644
(file)
--- a/
src/lib/ab_transcoder.h
+++ b/
src/lib/ab_transcoder.h
@@
-25,20
+25,17
@@
#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 Image;
class Log;
class Image;
class Log;
-class Subtitle;
class Film;
class Matcher;
class DelayLine;
class Gain;
class Combiner;
class Film;
class Matcher;
class DelayLine;
class Gain;
class Combiner;
+class Player;
class Trimmer;
/** @class ABTranscoder
class Trimmer;
/** @class ABTranscoder
@@
-51,9
+48,7
@@
public:
ABTranscoder (
boost::shared_ptr<Film> a,
boost::shared_ptr<Film> b,
ABTranscoder (
boost::shared_ptr<Film> a,
boost::shared_ptr<Film> b,
- DecodeOptions o,
- Job* j,
- boost::shared_ptr<Encoder> e
+ boost::shared_ptr<Job> j
);
void go ();
);
void go ();
@@
-61,10
+56,10
@@
public:
private:
boost::shared_ptr<Film> _film_a;
boost::shared_ptr<Film> _film_b;
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<Matcher> _matcher;
boost::shared_ptr<DelayLine> _delay_line;
boost::shared_ptr<Combiner> _combiner;
boost::shared_ptr<Matcher> _matcher;
boost::shared_ptr<DelayLine> _delay_line;