projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tinker with layout.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.h
diff --git
a/src/lib/transcode_job.h
b/src/lib/transcode_job.h
index 7880a925ebb56e4921fea0b2745ab1b3f1882788..5419a46f3342985d2cbe91359f5957847473aa49 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
-2015
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,8
+22,8
@@
* @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 Transcoder;
class Transcoder;
@@
-32,9
+33,10
@@
class Transcoder;
class TranscodeJob : public Job
{
public:
class TranscodeJob : public Job
{
public:
- TranscodeJob (boost::shared_ptr<
Film> f
);
-
+ TranscodeJob (boost::shared_ptr<
const Film>
);
+
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;