Tidy up font rendering for subtitles.

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

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index 06b4d429ccd95ed4c08eb599d61d02b1a2ff8421..ea0a2bef89bfbe873a83cbad11be48a1a0788985 100644 (file)
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -55,12 +55,15 @@ class PlayerVideo;
  *  This class keeps a queue of frames to be encoded and distributes
  *  the work around threads and encoding servers.
  */
-class J2KEncoder : public boost::noncopyable, public ExceptionStore, public std::enable_shared_from_this<J2KEncoder>
+class J2KEncoder : public ExceptionStore, public std::enable_shared_from_this<J2KEncoder>
 {
 public:
        J2KEncoder (std::shared_ptr<const Film> film, std::shared_ptr<Writer> writer);
        ~J2KEncoder ();
 
+       J2KEncoder (J2KEncoder const&) = delete;
+       J2KEncoder& operator= (J2KEncoder const&) = delete;
+
        /** Called to indicate that a processing run is about to begin */
        void begin ();
 
@@ -93,7 +96,7 @@ private:
        std::shared_ptr<boost::thread_group> _threads;
 
        mutable boost::mutex _queue_mutex;
-       std::list<std::shared_ptr<DCPVideo>> _queue;
+       std::list<DCPVideo> _queue;
        /** condition to manage thread wakeups when we have nothing to do */
        boost::condition _empty_condition;
        /** condition to manage thread wakeups when we have too much to do */