X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=116dd5d1920472018d234dd7f535712de64d591f;hb=234623db3306626520e06cac985eb157379eff99;hp=652412ddf01d455941c8760db1b080cf2cef68eb;hpb=b34310b4e90af1442363fe09db082d68e1721130;p=dcpomatic.git

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 652412ddf..116dd5d19 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -78,12 +78,10 @@ Encoder::~Encoder ()
 void
 Encoder::begin ()
 {
-	if (!EncodeServerFinder::instance()->disabled ()) {
-		weak_ptr<Encoder> wp = shared_from_this ();
-		_server_found_connection = EncodeServerFinder::instance()->ServersListChanged.connect (
-			boost::bind (&Encoder::call_servers_list_changed, wp)
-			);
-	}
+	weak_ptr<Encoder> wp = shared_from_this ();
+	_server_found_connection = EncodeServerFinder::instance()->ServersListChanged.connect (
+		boost::bind (&Encoder::call_servers_list_changed, wp)
+		);
 }
 
 /* We don't want the servers-list-changed callback trying to do things
@@ -285,9 +283,9 @@ Encoder::encoder_thread (optional<EncodeServerDescription> server)
 try
 {
 	if (server) {
-		LOG_TIMING ("start-encoder-thread thread=%1 server=%2", boost::this_thread::get_id (), server->host_name ());
+		LOG_TIMING ("start-encoder-thread thread=%1 server=%2", thread_id (), server->host_name ());
 	} else {
-		LOG_TIMING ("start-encoder-thread thread=%1 server=localhost", boost::this_thread::get_id ());
+		LOG_TIMING ("start-encoder-thread thread=%1 server=localhost", thread_id ());
 	}
 
 	/* Number of seconds that we currently wait between attempts
@@ -298,15 +296,15 @@ try
 
 	while (true) {
 
-		LOG_TIMING ("encoder-sleep thread=%1", boost::this_thread::get_id());
+		LOG_TIMING ("encoder-sleep thread=%1", thread_id ());
 		boost::mutex::scoped_lock lock (_queue_mutex);
 		while (_queue.empty ()) {
 			_empty_condition.wait (lock);
 		}
 
-		LOG_TIMING ("encoder-wake thread=%1 queue=%2", boost::this_thread::get_id(), _queue.size());
+		LOG_TIMING ("encoder-wake thread=%1 queue=%2", thread_id(), _queue.size());
 		shared_ptr<DCPVideo> vf = _queue.front ();
-		LOG_TIMING ("encoder-pop thread=%1 frame=%2 eyes=%3", boost::this_thread::get_id(), vf->index(), vf->eyes ());
+		LOG_TIMING ("encoder-pop thread=%1 frame=%2 eyes=%3", thread_id(), vf->index(), (int) vf->eyes ());
 		_queue.pop_front ();
 
 		lock.unlock ();
@@ -338,9 +336,9 @@ try
 
 		} else {
 			try {
-				LOG_TIMING ("start-local-encode thread=%1 frame=%2", boost::this_thread::get_id(), vf->index());
+				LOG_TIMING ("start-local-encode thread=%1 frame=%2", thread_id(), vf->index());
 				encoded = vf->encode_locally (boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
-				LOG_TIMING ("finish-local-encode thread=%1 frame=%2", boost::this_thread::get_id(), vf->index());
+				LOG_TIMING ("finish-local-encode thread=%1 frame=%2", thread_id(), vf->index());
 			} catch (std::exception& e) {
 				LOG_ERROR (N_("Local encode failed (%1)"), e.what ());
 				throw;
@@ -352,7 +350,7 @@ try
 			frame_done ();
 		} else {
 			lock.lock ();
-			LOG_GENERAL (N_("[%1] Encoder thread pushes frame %2 back onto queue after failure"), boost::this_thread::get_id(), vf->index());
+			LOG_GENERAL (N_("[%1] Encoder thread pushes frame %2 back onto queue after failure"), thread_id(), vf->index());
 			_queue.push_front (vf);
 			lock.unlock ();
 		}