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
/
transcoder.h
diff --git
a/src/lib/transcoder.h
b/src/lib/transcoder.h
index 7bf214a88de6ccbbb3b53bacc43fb8c8791de410..ed0a6b1b561bb45a628080819d0866944e8a37f8 100644
(file)
--- a/
src/lib/transcoder.h
+++ b/
src/lib/transcoder.h
@@
-21,7
+21,6
@@
#include "encoder.h"
class Film;
#include "encoder.h"
class Film;
-class Job;
class Encoder;
class VideoFilter;
class Player;
class Encoder;
class VideoFilter;
class Player;
@@
-30,20
+29,22
@@
class Player;
class Transcoder : public boost::noncopyable
{
public:
class Transcoder : public boost::noncopyable
{
public:
- Transcoder (
- boost::shared_ptr<const Film> f,
- boost::shared_ptr<Job> j
- );
+ Transcoder (boost::shared_ptr<const Film>, boost::shared_ptr<Job>);
void go ();
float current_encoding_rate () const;
void go ();
float current_encoding_rate () const;
- Encoder::State state () const;
int video_frames_out () const;
int video_frames_out () const;
+ /** @return true if we are in the process of calling Encoder::process_end */
+ bool finishing () const {
+ return _finishing;
+ }
+
private:
private:
- /** A Job that is running this Transcoder, or 0 */
- boost::shared_ptr<Job> _job;
+ boost::shared_ptr<const Film> _film;
boost::shared_ptr<Player> _player;
boost::shared_ptr<Player> _player;
+ boost::shared_ptr<Writer> _writer;
boost::shared_ptr<Encoder> _encoder;
boost::shared_ptr<Encoder> _encoder;
+ bool _finishing;
};
};