std::shared_ptr

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

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index cc8a854eb1f852515bcf80adb4d7bbd7d6d467d9..afa010ace01cb71c38398e6a03cb1931fc1a7330 100644 (file)
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -29,13 +29,11 @@
 #include "cross.h"
 #include "event_history.h"
 #include "exception_store.h"
-#include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/thread.hpp>
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include <list>
 #include <stdint.h>
 
@@ -53,29 +51,29 @@ class PlayerVideo;
  *  the work around threads and encoding servers.
  */
 
-class J2KEncoder : public boost::noncopyable, public ExceptionStore, public boost::enable_shared_from_this<J2KEncoder>
+class J2KEncoder : public boost::noncopyable, public ExceptionStore, public std::enable_shared_from_this<J2KEncoder>
 {
 public:
-       J2KEncoder (boost::shared_ptr<const Film> film, boost::shared_ptr<Writer> writer);
+       J2KEncoder (std::shared_ptr<const Film> film, std::shared_ptr<Writer> writer);
        ~J2KEncoder ();
 
        /** Called to indicate that a processing run is about to begin */
        void begin ();
 
        /** Called to pass a bit of video to be encoded as the next DCP frame */
-       void encode (boost::shared_ptr<PlayerVideo> pv, DCPTime time);
+       void encode (std::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
 
        /** Called when a processing run has finished */
        void end ();
 
-       float current_encoding_rate () const;
+       boost::optional<float> current_encoding_rate () const;
        int video_frames_enqueued () const;
 
        void servers_list_changed ();
 
 private:
 
-       static void call_servers_list_changed (boost::weak_ptr<J2KEncoder> encoder);
+       static void call_servers_list_changed (std::weak_ptr<J2KEncoder> encoder);
 
        void frame_done ();
 
@@ -83,25 +81,25 @@ private:
        void terminate_threads ();
 
        /** Film that we are encoding */
-       boost::shared_ptr<const Film> _film;
+       std::shared_ptr<const Film> _film;
 
        EventHistory _history;
 
-       /** Mutex for _threads */
-       mutable boost::mutex _threads_mutex;
-       std::list<boost::thread *> _threads;
+       boost::mutex _threads_mutex;
+       std::shared_ptr<boost::thread_group> _threads;
+
        mutable boost::mutex _queue_mutex;
-       std::list<boost::shared_ptr<DCPVideo> > _queue;
+       std::list<std::shared_ptr<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 */
        boost::condition _full_condition;
 
-       boost::shared_ptr<Writer> _writer;
+       std::shared_ptr<Writer> _writer;
        Waker _waker;
 
-       boost::shared_ptr<PlayerVideo> _last_player_video;
-       boost::optional<DCPTime> _last_player_video_time;
+       std::shared_ptr<PlayerVideo> _last_player_video[EYES_COUNT];
+       boost::optional<dcpomatic::DCPTime> _last_player_video_time;
 
        boost::signals2::scoped_connection _server_found_connection;
 };