projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.h
diff --git
a/src/lib/transcode_job.h
b/src/lib/transcode_job.h
index 97f655e15c212e78aba5ad9f6564dbfc84f9f7e9..23a856069d15b6529be66aa6cfebd4f3355c8bfc 100644
(file)
--- a/
src/lib/transcode_job.h
+++ b/
src/lib/transcode_job.h
@@
-1,5
+1,5
@@
/*
/*
- 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
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-21,12
+21,10
@@
* @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 Encoder;
-class DecodeOptions;
-class EncodeOptions;
+class Transcoder;
/** @class TranscodeJob
* @brief A job which transcodes from one format to another.
/** @class TranscodeJob
* @brief A job which transcodes from one format to another.
@@
-34,17
+32,15
@@
class EncodeOptions;
class TranscodeJob : public Job
{
public:
class TranscodeJob : public Job
{
public:
- TranscodeJob (boost::shared_ptr<
Film> f, boost::shared_ptr<const DecodeOptions> od, boost::shared_ptr<const EncodeOptions> oe, boost::shared_ptr<Job> req
);
-
+ 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;
-pr
otected
:
+pr
ivate
:
int remaining_time () const;
int remaining_time () const;
-private:
- boost::shared_ptr<const DecodeOptions> _decode_opt;
- boost::shared_ptr<const EncodeOptions> _encode_opt;
- boost::shared_ptr<Encoder> _encoder;
+ boost::shared_ptr<Transcoder> _transcoder;
};
};