projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Destory TranscodeJob earlier, hopefully to fix #1570.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.h
diff --git
a/src/lib/transcode_job.h
b/src/lib/transcode_job.h
index 9e827e41259d1b0981a17edc2fa9488758577e0a..8240977b9e1de83be715db8e339c9ff0fcbf5058 100644
(file)
--- a/
src/lib/transcode_job.h
+++ b/
src/lib/transcode_job.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-25,23
+25,26
@@
#include "job.h"
#include <boost/shared_ptr.hpp>
#include "job.h"
#include <boost/shared_ptr.hpp>
-class
DCPTrans
coder;
+class
En
coder;
/** @class TranscodeJob
/** @class TranscodeJob
- * @brief A job which transcodes
from one format to another
.
+ * @brief A job which transcodes
a Film to another format
.
*/
class TranscodeJob : public Job
{
public:
*/
class TranscodeJob : public Job
{
public:
- TranscodeJob (boost::shared_ptr<const Film> film);
+ explicit TranscodeJob (boost::shared_ptr<const Film> film);
+ ~TranscodeJob ();
std::string name () const;
std::string json_name () const;
void run ();
std::string status () const;
std::string name () const;
std::string json_name () const;
void run ();
std::string status () const;
+ void set_encoder (boost::shared_ptr<Encoder> t);
+
private:
int remaining_time () const;
private:
int remaining_time () const;
- boost::shared_ptr<
DCPTranscoder> _trans
coder;
+ boost::shared_ptr<
Encoder> _en
coder;
};
};