Separate ExceptionStore.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 85bc6ae99d57b823058d6cc95251cc955c416d82..fbae07a9a8ebe7cd2a4b20b9f656239631158e6c 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -20,28 +20,22 @@
 #ifndef DCPOMATIC_ENCODER_H
 #define DCPOMATIC_ENCODER_H
 
-/** @file src/encoder.h
+/** @file  src/encoder.h
  *  @brief Encoder class.
  */
 
 #include "util.h"
-#include "config.h"
 #include "cross.h"
-#include "exceptions.h"
-extern "C" {
-#include <libavutil/samplefmt.h>
-#include <libswresample/swresample.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 <list>
 #include <stdint.h>
 
-class Image;
-class AudioBuffers;
 class Film;
 class ServerDescription;
 class DCPVideo;
@@ -82,7 +76,6 @@ private:
 
        void encoder_thread (boost::optional<ServerDescription>);
        void terminate_threads ();
-       void add_worker_threads (ServerDescription);
        void servers_list_changed ();
 
        /** Film that we are encoding */
@@ -100,6 +93,8 @@ private:
 
        /** Number of video frames enqueued so far */
        int _video_frames_enqueued;
+       bool _left_done;
+       bool _right_done;
 
        bool _terminate;
        std::list<boost::shared_ptr<DCPVideo> > _queue;