Tidying.

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

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index afa010ace01cb71c38398e6a03cb1931fc1a7330..2139eee3d5c174c254cb0368952dfa6ccd40a4da 100644 (file)
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,45 +18,53 @@
 
 */
 
+
 #ifndef DCPOMATIC_J2K_ENCODER_H
 #define DCPOMATIC_J2K_ENCODER_H
 
+
 /** @file  src/j2k_encoder.h
  *  @brief J2KEncoder class.
  */
 
-#include "util.h"
+
 #include "cross.h"
 #include "event_history.h"
 #include "exception_store.h"
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition.hpp>
-#include <boost/thread.hpp>
+#include "util.h"
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/condition.hpp>
+#include <boost/thread/mutex.hpp>
 #include <list>
 #include <stdint.h>
 
+
 class Film;
 class EncodeServerDescription;
 class DCPVideo;
 class Writer;
+class J2KEncoderBackend;
 class Job;
 class PlayerVideo;
 
+
 /** @class J2KEncoder
  *  @brief Class to manage encoding to J2K.
  *
  *  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 ();
 
@@ -77,19 +85,21 @@ private:
 
        void frame_done ();
 
-       void encoder_thread (boost::optional<EncodeServerDescription>);
+       void encoder_thread (std::shared_ptr<J2KEncoderBackend> backend);
        void terminate_threads ();
 
-       /** Film that we are encoding */
        std::shared_ptr<const Film> _film;
 
+
        EventHistory _history;
 
        boost::mutex _threads_mutex;
        std::shared_ptr<boost::thread_group> _threads;
 
+       int _frames_in_parallel = 0;
+
        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 */
@@ -98,10 +108,11 @@ private:
        std::shared_ptr<Writer> _writer;
        Waker _waker;
 
-       std::shared_ptr<PlayerVideo> _last_player_video[EYES_COUNT];
+       std::shared_ptr<PlayerVideo> _last_player_video[static_cast<int>(Eyes::COUNT)];
        boost::optional<dcpomatic::DCPTime> _last_player_video_time;
 
        boost::signals2::scoped_connection _server_found_connection;
 };
 
+
 #endif