projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.h
diff --git
a/src/lib/transcode_job.h
b/src/lib/transcode_job.h
index 1decea070001717cde392f12eeba1310da99b860..8f78e7f6a899b8d3e5dda3f11da4adce2a1fdfcc 100644
(file)
--- a/
src/lib/transcode_job.h
+++ b/
src/lib/transcode_job.h
@@
-23,6
+23,7
@@
#include <boost/shared_ptr.hpp>
#include "job.h"
#include <boost/shared_ptr.hpp>
#include "job.h"
+#include "options.h"
class Encoder;
class Encoder;
@@
-32,7
+33,7
@@
class Encoder;
class TranscodeJob : public Job
{
public:
class TranscodeJob : public Job
{
public:
- TranscodeJob (boost::shared_ptr<Film> f,
boost::shared_ptr<const Options> o
, boost::shared_ptr<Job> req);
+ TranscodeJob (boost::shared_ptr<Film> f,
DecodeOptions od
, boost::shared_ptr<Job> req);
std::string name () const;
void run ();
std::string name () const;
void run ();
@@
-42,6
+43,6
@@
protected:
int remaining_time () const;
private:
int remaining_time () const;
private:
-
boost::shared_ptr<const Options>
_opt;
+
DecodeOptions _decode
_opt;
boost::shared_ptr<Encoder> _encoder;
};
boost::shared_ptr<Encoder> _encoder;
};