X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=3b8c233bb82710e619f20c1f6609aa9fb44d487e;hb=5c0a67869dbddb924c9f5ccb4126aa06d85b9b8b;hp=51df0176b575267a50ec75e5596059655811ec9e;hpb=9e4c091e6ef0f79fab10664e95240de2f14e5702;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 51df0176b..3b8c233bb 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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,24 +39,14 @@
 #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;
 class Film;
 class ServerDescription;
 class DCPVideo;
-class EncodedData;
 class Writer;
 class Job;
-class ServerFinder;
 class PlayerVideo;
 
 /** @class Encoder
@@ -114,6 +112,8 @@ private:
 
 	boost::shared_ptr<Writer> _writer;
 	Waker _waker;
+
+	boost::signals2::scoped_connection _server_found_connection;
 };
 
 #endif