projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
decoder.h
diff --git
a/src/lib/decoder.h
b/src/lib/decoder.h
index 3908afa2fbfed522b24266846925fad693ee374f..f2f5235168402c136e9c133ac8865c11396a99c7 100644
(file)
--- a/
src/lib/decoder.h
+++ b/
src/lib/decoder.h
@@
-34,9
+34,8
@@
#include "video_source.h"
#include "audio_source.h"
#include "film.h"
#include "video_source.h"
#include "audio_source.h"
#include "film.h"
+#include "options.h"
-class Job;
-class DecodeOptions;
class Image;
class Log;
class DelayLine;
class Image;
class Log;
class DelayLine;
@@
-54,7
+53,7
@@
class FilterGraph;
class Decoder
{
public:
class Decoder
{
public:
- Decoder (boost::shared_ptr<Film>,
boost::shared_ptr<const DecodeOptions>, Job *
);
+ Decoder (boost::shared_ptr<Film>,
DecodeOptions
);
virtual ~Decoder () {}
virtual bool pass () = 0;
virtual ~Decoder () {}
virtual bool pass () = 0;
@@
-66,10
+65,8
@@
public:
protected:
/** our Film */
boost::shared_ptr<Film> _film;
protected:
/** our Film */
boost::shared_ptr<Film> _film;
- /** our options */
- boost::shared_ptr<const DecodeOptions> _opt;
- /** associated Job, or 0 */
- Job* _job;
+ /** our decode options */
+ DecodeOptions _opt;
private:
virtual void film_changed (Film::Property) {}
private:
virtual void film_changed (Film::Property) {}