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' of ssh://main.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
src
/
lib
/
transcode_job.h
diff --git
a/src/lib/transcode_job.h
b/src/lib/transcode_job.h
index d185cb65dfa6a73721865d39d2247032a8c9f6bb..6e3c1ead9314cc5af7bb2877f208c38ae4358fa3 100644
(file)
--- a/
src/lib/transcode_job.h
+++ b/
src/lib/transcode_job.h
@@
-24,7
+24,7
@@
#include <boost/shared_ptr.hpp>
#include "job.h"
#include <boost/shared_ptr.hpp>
#include "job.h"
-class
En
coder;
+class
Trans
coder;
/** @class TranscodeJob
* @brief A job which transcodes from one format to another.
/** @class TranscodeJob
* @brief A job which transcodes from one format to another.
@@
-32,16
+32,15
@@
class Encoder;
class TranscodeJob : public Job
{
public:
class TranscodeJob : public Job
{
public:
- TranscodeJob (boost::shared_ptr<const Film
State> s, boost::shared_ptr<const Options> o, Log* l, boost::shared_ptr<Job> req
);
+ TranscodeJob (boost::shared_ptr<const Film
> f
);
std::string name () const;
std::string name () const;
+ std::string json_name () const;
void run ();
std::string status () const;
void run ();
std::string status () const;
-pr
otected
:
+pr
ivate
:
int remaining_time () const;
int remaining_time () const;
-private:
- boost::shared_ptr<const Options> _opt;
- boost::shared_ptr<Encoder> _encoder;
+ boost::shared_ptr<Transcoder> _transcoder;
};
};