Hand-apply 33b76b675d747fd828aba91d9d857227cb8a8244 from master; make sure signals...

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 51df0176b575267a50ec75e5596059655811ec9e..a4fe558740de69b8673de52027137120e3d06d58 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -21,9 +21,17 @@
 #define DCPOMATIC_ENCODER_H
 
 /** @file src/encoder.h
- *  @brief Encoder to J2K and WAV for DCP.
+ *  @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 <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
@@ -31,14 +39,6 @@
 #include <boost/optional.hpp>
 #include <list>
 #include <stdint.h>
-extern "C" {
-#include <libavutil/samplefmt.h>
-#include <libswresample/swresample.h>
-}
-#include "util.h"
-#include "config.h"
-#include "cross.h"
-#include "exceptions.h"
 
 class Image;
 class AudioBuffers;
@@ -114,6 +114,8 @@ private:
 
        boost::shared_ptr<Writer> _writer;
        Waker _waker;
+
+       boost::signals2::scoped_connection _server_found_connection;
 };
 
 #endif