X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server.h;h=14dc77398a660b730258974cc7b3fee8f9f2d74e;hb=7c730205e50014347bd96ab9735346d0b5922798;hp=d0c061eb3755d01d0887ee2a2ac906da95412728;hpb=6fa353595ce8f784b7d5004a6c38c78bddae94c7;p=dcpomatic.git

diff --git a/src/lib/encode_server.h b/src/lib/encode_server.h
index d0c061eb3..14dc77398 100644
--- a/src/lib/encode_server.h
+++ b/src/lib/encode_server.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -41,7 +42,7 @@ class Log;
 class EncodeServer : public Server, public ExceptionStore
 {
 public:
-	EncodeServer (boost::shared_ptr<Log> log, bool verbose, int num_threads);
+	EncodeServer (bool verbose, int num_threads);
 	~EncodeServer ();
 
 	void run ();
@@ -57,7 +58,6 @@ private:
 	std::list<boost::shared_ptr<Socket> > _queue;
 	boost::condition _full_condition;
 	boost::condition _empty_condition;
-	boost::shared_ptr<Log> _log;
 	bool _verbose;
 	int _num_threads;
 
@@ -68,6 +68,7 @@ private:
 			, socket (0)
 		{}
 
+		boost::mutex mutex;
 		boost::thread* thread;
 		boost::asio::ip::udp::socket* socket;
 		char buffer[64];