Various Doxygen fixes.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 6b830abba15f6585e28fc101137861cbdcae4ea7..fe18f8b2d5a7a8330b0b93217973b96216206085 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -34,6 +34,7 @@
 #include <boost/thread.hpp>
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
+#include <boost/enable_shared_from_this.hpp>
 #include <list>
 #include <stdint.h>
 
@@ -51,39 +52,39 @@ class PlayerVideo;
  *  the work around threads and encoding servers.
  */
 
-class Encoder : public boost::noncopyable, public ExceptionStore
+class Encoder : public boost::noncopyable, public ExceptionStore, public boost::enable_shared_from_this<Encoder>
 {
 public:
-       Encoder (boost::shared_ptr<const Film>, boost::shared_ptr<Writer>);
+       Encoder (boost::shared_ptr<const Film> film, boost::shared_ptr<Writer> writer);
        ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */
        void begin ();
 
-       /** Called to pass in zero or more bits of video to be encoded
-        *  as the next DCP frame.
-        */
-       void encode (std::list<boost::shared_ptr<PlayerVideo> > f);
+       /** Called to pass a bit of video to be encoded as the next DCP frame */
+       void encode (boost::shared_ptr<PlayerVideo> pv, DCPTime time);
 
        /** Called when a processing run has finished */
        void end ();
 
        float current_encoding_rate () const;
-       int video_frames_out () const;
+       int video_frames_enqueued () const;
+
+       void servers_list_changed ();
 
 private:
 
-       void enqueue (boost::shared_ptr<PlayerVideo> f);
+       static void call_servers_list_changed (boost::weak_ptr<Encoder> encoder);
+
        void frame_done ();
 
        void encoder_thread (boost::optional<EncodeServerDescription>);
        void terminate_threads ();
-       void servers_list_changed ();
 
        /** Film that we are encoding */
        boost::shared_ptr<const Film> _film;
 
-       /** Mutex for _time_history and _video_frames_enqueued */
+       /** Mutex for _time_history */
        mutable boost::mutex _state_mutex;
        /** List of the times of completion of the last _history_size frames;
            first is the most recently completed.
@@ -91,8 +92,6 @@ private:
        std::list<struct timeval> _time_history;
        /** Number of frames that we should keep history for */
        static int const _history_size;
-       /** Current DCP frame index */
-       Frame _position;
 
        /** Mutex for _threads */
        mutable boost::mutex _threads_mutex;
@@ -108,6 +107,7 @@ private:
        Waker _waker;
 
        boost::shared_ptr<PlayerVideo> _last_player_video;
+       boost::optional<DCPTime> _last_player_video_time;
 
        boost::signals2::scoped_connection _server_found_connection;
 };