projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various bits.
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index c84ee027addcad0eae79e257e42c36cf0a1478f5..86880bc34942561ba12a1488feb00663c2c9d6d8 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.h
@@
-51,7
+51,6
@@
class ServerDescription;
class DCPVideoFrame;
class EncodedData;
class Writer;
class DCPVideoFrame;
class EncodedData;
class Writer;
-class Playlist;
/** @class Encoder
* @brief Encoder to J2K and WAV for DCP.
/** @class Encoder
* @brief Encoder to J2K and WAV for DCP.
@@
-63,7
+62,7
@@
class Playlist;
class Encoder : public VideoSink, public AudioSink
{
public:
class Encoder : public VideoSink, public AudioSink
{
public:
- Encoder (boost::shared_ptr<Film> f
, boost::shared_ptr<Playlist>
);
+ Encoder (boost::shared_ptr<Film> f);
virtual ~Encoder ();
/** Called to indicate that a processing run is about to begin */
virtual ~Encoder ();
/** Called to indicate that a processing run is about to begin */
@@
-96,7
+95,6
@@
private:
/** Film that we are encoding */
boost::shared_ptr<Film> _film;
/** Film that we are encoding */
boost::shared_ptr<Film> _film;
- boost::shared_ptr<Playlist> _playlist;
/** Mutex for _time_history and _last_frame */
mutable boost::mutex _history_mutex;
/** Mutex for _time_history and _last_frame */
mutable boost::mutex _history_mutex;