projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Naming tweak.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.h
diff --git
a/src/lib/transcode_job.h
b/src/lib/transcode_job.h
index 9128206d29dc9c9e42460cafecfa4748f0a1c0db..8240977b9e1de83be715db8e339c9ff0fcbf5058 100644
(file)
--- a/
src/lib/transcode_job.h
+++ b/
src/lib/transcode_job.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2019
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-21,25
+22,29
@@
* @brief A job which transcodes from one format to another.
*/
* @brief A job which transcodes from one format to another.
*/
-#include <boost/shared_ptr.hpp>
#include "job.h"
#include "job.h"
+#include <boost/shared_ptr.hpp>
-class
Trans
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> f);
-
+ explicit TranscodeJob (boost::shared_ptr<const Film> film);
+ ~TranscodeJob ();
+
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;
+ void set_encoder (boost::shared_ptr<Encoder> t);
+
private:
int remaining_time () const;
private:
int remaining_time () const;
- boost::shared_ptr<
Transcoder> _trans
coder;
+ boost::shared_ptr<
Encoder> _en
coder;
};
};