Remove Content::path(), add Content::path_summary().

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index c0ea30fcbb0a051582b24ddceb564d9ceeb873f4..686aaa2f25e4977d16644813016e0f0550e208c3 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -36,6 +36,7 @@ extern "C" {
 #include <libswresample/swresample.h>
 }
 #include "util.h"
+#include "config.h"
 
 class Image;
 class AudioBuffers;
@@ -45,6 +46,7 @@ class DCPVideoFrame;
 class EncodedData;
 class Writer;
 class Job;
+class ServerFinder;
 
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
@@ -56,7 +58,7 @@ class Job;
 class Encoder : public boost::noncopyable
 {
 public:
-       Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<Job>);
+       Encoder (boost::shared_ptr<const Film> f, boost::weak_ptr<Job>);
        virtual ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */
@@ -66,7 +68,7 @@ public:
         *  @param i Video frame image.
         *  @param same true if i is the same as the last time we were called.
         */
-       void process_video (boost::shared_ptr<const Image> i, Eyes eyes, bool same);
+       void process_video (boost::shared_ptr<const Image> i, Eyes eyes, ColourConversion, bool same);
 
        /** Call with some audio data */
        void process_audio (boost::shared_ptr<const AudioBuffers>);
@@ -83,13 +85,15 @@ private:
        
        void encoder_thread (boost::optional<ServerDescription>);
        void terminate_threads ();
+       void add_worker_threads (ServerDescription);
+       void server_found (ServerDescription);
 
        /** Film that we are encoding */
        boost::shared_ptr<const Film> _film;
-       boost::shared_ptr<Job> _job;
+       boost::weak_ptr<Job> _job;
 
        /** Mutex for _time_history and _last_frame */
-       mutable boost::mutex _history_mutex;
+       mutable boost::mutex _state_mutex;
        /** List of the times of completion of the last _history_size frames;
            first is the most recently completed.
        */