projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; fix destruction of Server; some test cleanups.
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index a8ee220aaac8cdea58ec3f0cd7c493dddeff93c0..678cdf04eae219bbcd8218765ff0d11facab3725 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.h
@@
-38,6
+38,7
@@
extern "C" {
#include "util.h"
#include "config.h"
#include "cross.h"
#include "util.h"
#include "config.h"
#include "cross.h"
+#include "exceptions.h"
class Image;
class AudioBuffers;
class Image;
class AudioBuffers;
@@
-67,10
+68,9
@@
public:
void process_begin ();
/** Call with a frame of video.
void process_begin ();
/** Call with a frame of video.
- * @param pvf Video frame image.
- * @param same true if pvf is the same as the last time we were called.
+ * @param f Video frame.
*/
*/
- void process_video (boost::shared_ptr<PlayerVideoFrame>
pvf, bool same
);
+ void process_video (boost::shared_ptr<PlayerVideoFrame>
f
);
/** Call with some audio data */
void process_audio (boost::shared_ptr<const AudioBuffers>);
/** Call with some audio data */
void process_audio (boost::shared_ptr<const AudioBuffers>);
@@
-106,7
+106,6
@@
private:
/** Number of video frames written for the DCP so far */
int _video_frames_out;
/** Number of video frames written for the DCP so far */
int _video_frames_out;
- bool _have_a_real_frame[EYES_COUNT];
bool _terminate;
std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
std::list<boost::thread *> _threads;
bool _terminate;
std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
std::list<boost::thread *> _threads;