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
/
transcode_job.h
diff --git
a/src/lib/transcode_job.h
b/src/lib/transcode_job.h
index 7880a925ebb56e4921fea0b2745ab1b3f1882788..6e3c1ead9314cc5af7bb2877f208c38ae4358fa3 100644
(file)
--- a/
src/lib/transcode_job.h
+++ b/
src/lib/transcode_job.h
@@
-32,9
+32,10
@@
class Transcoder;
class TranscodeJob : public Job
{
public:
- TranscodeJob (boost::shared_ptr<Film> f);
+ TranscodeJob (boost::shared_ptr<
const
Film> f);
std::string name () const;
+ std::string json_name () const;
void run ();
std::string status () const;