Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic

[dcpomatic.git] / src / lib / encoder.h

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 8b02f70041af349d5e95dbd4a855c15c151a493e..86880bc34942561ba12a1488feb00663c2c9d6d8 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -21,7 +21,7 @@
 #define DVDOMATIC_ENCODER_H
 
 /** @file src/encoder.h
- *  @brief Parent class for classes which can encode video and audio frames.
+ *  @brief Encoder to J2K and WAV for DCP.
  */
 
 #include <boost/shared_ptr.hpp>
@@ -88,10 +88,10 @@ private:
        
        void frame_done ();
        
-       void write_audio (boost::shared_ptr<const AudioBuffers> audio);
+       void write_audio (boost::shared_ptr<const AudioBuffers> data);
 
        void encoder_thread (ServerDescription *);
-       void terminate_worker_threads ();
+       void terminate_threads ();
 
        /** Film that we are encoding */
        boost::shared_ptr<Film> _film;
@@ -115,11 +115,11 @@ private:
 #endif
 
        bool _have_a_real_frame;
-       bool _terminate_encoder;
-       std::list<boost::shared_ptr<DCPVideoFrame> > _encode_queue;
-       std::list<boost::thread *> _worker_threads;
-       mutable boost::mutex _worker_mutex;
-       boost::condition _worker_condition;
+       bool _terminate;
+       std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
+       std::list<boost::thread *> _threads;
+       mutable boost::mutex _mutex;
+       boost::condition _condition;
 
        boost::shared_ptr<Writer> _writer;
 };