Cleanup: can now remove the _NC log variants.

3 files changed, 16 insertions, 16 deletions

diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 176fbd208..b8d451c23 100644
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -208,7 +208,7 @@ public:
 
 #ifdef DCPOMATIC_LINUX
 		if (getenv("DCPOMATIC_NO_START_WRITER")) {
-			LOG_DISK_NC("Not starting writer process as DCPOMATIC_NO_START_WRITER is set");
+			LOG_DISK("Not starting writer process as DCPOMATIC_NO_START_WRITER is set");
 		} else {
 			LOG_DISK("Starting writer process {}", disk_writer_path().string());
 #ifdef DCPOMATIC_BOOST_PROCESS_V1
@@ -220,7 +220,7 @@ public:
 #endif
 
 #ifdef DCPOMATIC_OSX
-		LOG_DISK_NC("Sending notification to writer daemon");
+		LOG_DISK("Sending notification to writer daemon");
 		notify_post ("com.dcpomatic.disk.writer.start");
 #endif
 	}
@@ -344,7 +344,7 @@ private:
 			dialog.ShowModal();
 			return;
 #else
-			LOG_DISK_NC ("Failed to ping writer");
+			LOG_DISK ("Failed to ping writer");
 			throw CommunicationFailedError ();
 #endif
 		}
@@ -359,11 +359,11 @@ private:
 
 			LOG_DISK("Sending unmount request to disk writer for {}", drive.as_xml());
 			if (!_nanomsg.send(DISK_WRITER_UNMOUNT "\n", 2000)) {
-				LOG_DISK_NC("Failed to send unmount request.");
+				LOG_DISK("Failed to send unmount request.");
 				throw CommunicationFailedError ();
 			}
 			if (!_nanomsg.send(drive.as_xml(), 2000)) {
-				LOG_DISK_NC("Failed to send drive for unmount request.");
+				LOG_DISK("Failed to send drive for unmount request.");
 				throw CommunicationFailedError ();
 			}
 			/* The reply may have to wait for the user to authenticate, so let's wait a while */
diff --git a/src/tools/dcpomatic_disk_writer.cc b/src/tools/dcpomatic_disk_writer.cc
index 94c1af40f..4c0042d53 100644
--- a/src/tools/dcpomatic_disk_writer.cc
+++ b/src/tools/dcpomatic_disk_writer.cc
@@ -107,9 +107,9 @@ polkit_callback (GObject *, GAsyncResult* res, gpointer data)
 		} else {
 			failed = true;
 			if (polkit_authorization_result_get_is_challenge(result)) {
-				LOG_DISK_NC("polkit authority check failed (challenge)");
+				LOG_DISK("polkit authority check failed (challenge)");
 			} else {
-				LOG_DISK_NC("polkit authority check failed (not authorized)");
+				LOG_DISK("polkit authority check failed (not authorized)");
 			}
 		}
 	}
@@ -168,7 +168,7 @@ try
 		auto xml_head = nanomsg->receive (LONG_TIMEOUT);
 		auto xml_body = nanomsg->receive (LONG_TIMEOUT);
 		if (!xml_head || !xml_body) {
-			LOG_DISK_NC("Failed to receive unmount request");
+			LOG_DISK("Failed to receive unmount request");
 			throw CommunicationFailedError ();
 		}
 		auto xml = *xml_head + *xml_body;
@@ -183,20 +183,20 @@ try
 					sent_reply = DiskWriterBackEndResponse::error("Could not unmount drive", 1, 0).write_to_nanomsg(*nanomsg, LONG_TIMEOUT);
 				}
 				if (!sent_reply) {
-					LOG_DISK_NC("CommunicationFailedError in unmount_finished");
+					LOG_DISK("CommunicationFailedError in unmount_finished");
 					throw CommunicationFailedError ();
 				}
 			},
 			[]() {
 				if (!DiskWriterBackEndResponse::error("Could not get permission to unmount drive", 1, 0).write_to_nanomsg(*nanomsg, LONG_TIMEOUT)) {
-					LOG_DISK_NC("CommunicationFailedError in unmount_finished");
+					LOG_DISK("CommunicationFailedError in unmount_finished");
 					throw CommunicationFailedError ();
 				}
 			});
 	} else if (*s == DISK_WRITER_WRITE) {
 		auto device_opt = nanomsg->receive (LONG_TIMEOUT);
 		if (!device_opt) {
-			LOG_DISK_NC("Failed to receive write request");
+			LOG_DISK("Failed to receive write request");
 			throw CommunicationFailedError();
 		}
 		auto device = *device_opt;
@@ -205,7 +205,7 @@ try
 		while (true) {
 			auto dcp_path_opt = nanomsg->receive (LONG_TIMEOUT);
 			if (!dcp_path_opt) {
-				LOG_DISK_NC("Failed to receive write request");
+				LOG_DISK("Failed to receive write request");
 				throw CommunicationFailedError();
 			}
 			if (*dcp_path_opt != "") {
@@ -313,7 +313,7 @@ main ()
 	 * a better place to put them.
 	 */
 	dcpomatic_log.reset(new FileLog(State::write_path("disk_writer.log"), LogEntry::TYPE_DISK));
-	LOG_DISK_NC("dcpomatic_disk_writer started");
+	LOG_DISK("dcpomatic_disk_writer started");
 #endif
 
 #ifdef DCPOMATIC_OSX
@@ -326,11 +326,11 @@ main ()
 	try {
 		nanomsg = new Nanomsg (false);
 	} catch (runtime_error& e) {
-		LOG_DISK_NC("Could not set up nanomsg socket");
+		LOG_DISK("Could not set up nanomsg socket");
 		exit (EXIT_FAILURE);
 	}
 
-	LOG_DISK_NC("Entering main loop");
+	LOG_DISK("Entering main loop");
 	auto ml = Glib::MainLoop::create ();
 	Glib::signal_timeout().connect(sigc::ptr_fun(&idle), 500);
 	ml->run ();
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index b0873da09..21b62822f 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -335,7 +335,7 @@ public:
 		} catch (std::exception& e) {
 			LOG_ERROR("Destructor threw {}", e.what());
 		} catch (...) {
-			LOG_ERROR_NC("Destructor threw");
+			LOG_ERROR("Destructor threw");
 		}
 	}