summaryrefslogtreecommitdiff
path: root/src/lib/encoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-07-01 14:28:04 +0100
committerCarl Hetherington <cth@carlh.net>2014-07-01 14:28:04 +0100
commit15f23b356b757a9697bf1a9ec30c243ab8070404 (patch)
tree5b86b032ea47f606bbadb0c32801e16064d341a9 /src/lib/encoder.h
parent45e6a6df959188bfdb8dfc4906c35d1a3c234b0a (diff)
DCPVideoFrame -> DCPVideo and PlayerVideoFrame -> PlayerVideo.
Diffstat (limited to 'src/lib/encoder.h')
-rw-r--r--src/lib/encoder.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 6bb97012a..4502b7151 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -44,12 +44,12 @@ class Image;
class AudioBuffers;
class Film;
class ServerDescription;
-class DCPVideoFrame;
+class DCPVideo;
class EncodedData;
class Writer;
class Job;
class ServerFinder;
-class PlayerVideoFrame;
+class PlayerVideo;
/** @class Encoder
* @brief Encoder to J2K and WAV for DCP.
@@ -70,7 +70,7 @@ public:
/** Call with a frame of video.
* @param f Video frame.
*/
- void process_video (boost::shared_ptr<PlayerVideoFrame> f);
+ void process_video (boost::shared_ptr<PlayerVideo> f);
/** Call with some audio data */
void process_audio (boost::shared_ptr<const AudioBuffers>);
@@ -107,7 +107,7 @@ private:
int _video_frames_out;
bool _terminate;
- std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
+ std::list<boost::shared_ptr<DCPVideo> > _queue;
std::list<boost::thread *> _threads;
mutable boost::mutex _mutex;
/** condition to manage thread wakeups when we have nothing to do */