Cleanup: can now remove the _NC log variants.

25 files changed, 76 insertions, 76 deletions

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index f9d7b4396..1f42c56c6 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -57,7 +57,7 @@ AnalyseAudioJob::AnalyseAudioJob(shared_ptr<const Film> film, shared_ptr<const P
 	, _path(film->audio_analysis_path(playlist))
 	, _whole_film(whole_film)
 {
-	LOG_DEBUG_AUDIO_ANALYSIS_NC("AnalyseAudioJob::AnalyseAudioJob");
+	LOG_DEBUG_AUDIO_ANALYSIS("AnalyseAudioJob::AnalyseAudioJob");
 }
 
 
@@ -84,7 +84,7 @@ AnalyseAudioJob::json_name() const
 void
 AnalyseAudioJob::run()
 {
-	LOG_DEBUG_AUDIO_ANALYSIS_NC("AnalyseAudioJob::run");
+	LOG_DEBUG_AUDIO_ANALYSIS("AnalyseAudioJob::run");
 
 	auto player = make_shared<Player>(_film, _playlist, false);
 	player->set_ignore_video();
@@ -108,13 +108,13 @@ AnalyseAudioJob::run()
 		while (!player->pass()) {}
 	}
 
-	LOG_DEBUG_AUDIO_ANALYSIS_NC("Loop complete");
+	LOG_DEBUG_AUDIO_ANALYSIS("Loop complete");
 
 	_analyser.finish();
 	auto analysis = _analyser.get();
 	analysis.write(_path);
 
-	LOG_DEBUG_AUDIO_ANALYSIS_NC("Job finished");
+	LOG_DEBUG_AUDIO_ANALYSIS("Job finished");
 	set_progress(1);
 	set_state(FINISHED_OK);
 }
diff --git a/src/lib/audio_analyser.cc b/src/lib/audio_analyser.cc
index 9597bbb14..d50fba0c5 100644
--- a/src/lib/audio_analyser.cc
+++ b/src/lib/audio_analyser.cc
@@ -187,7 +187,7 @@ AudioAnalyser::analyse(shared_ptr<AudioBuffers> b, DCPTime time)
 
 	DCPTime const length = _playlist->length(_film);
 	_set_progress((time.seconds() - _start.seconds()) / (length.seconds() - _start.seconds()));
-	LOG_DEBUG_AUDIO_ANALYSIS_NC("Frames processed");
+	LOG_DEBUG_AUDIO_ANALYSIS("Frames processed");
 }
 
 
diff --git a/src/lib/copy_to_drive_job.cc b/src/lib/copy_to_drive_job.cc
index dde12d244..bd46ba469 100644
--- a/src/lib/copy_to_drive_job.cc
+++ b/src/lib/copy_to_drive_job.cc
@@ -82,7 +82,7 @@ CopyToDriveJob::run ()
 	}
 	request += "\n";
 	if (!_nanomsg.send(request, 2000)) {
-		LOG_DISK_NC("Failed to send write request.");
+		LOG_DISK("Failed to send write request.");
 		throw CommunicationFailedError ();
 	}
 
diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index c9d1322fe..d9ab73706 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -289,7 +289,7 @@ Drive::get ()
 				}
 			}
 			drives.push_back(Drive("/dev/" + name, mount_points, size, vendor, model));
-			LOG_DISK_NC(drives.back().log_summary());
+			LOG_DISK(drives.back().log_summary());
 		}
 	}
 
diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index acb51283d..65c21b52d 100644
--- a/src/lib/cross_osx.cc
+++ b/src/lib/cross_osx.cc
@@ -196,7 +196,7 @@ start_tool(string executable, string app)
 		int const r = system(exe_path.string().c_str());
 		exit(WEXITSTATUS(r));
 	} else if (pid == -1) {
-		LOG_ERROR_NC("Fork failed in start_tool");
+		LOG_ERROR("Fork failed in start_tool");
 	}
 }
 
@@ -298,7 +298,7 @@ disk_appeared(DADiskRef disk, void* context)
 {
 	auto bsd_name = DADiskGetBSDName(disk);
 	if (!bsd_name) {
-		LOG_DISK_NC("Disk with no BSDName appeared");
+		LOG_DISK("Disk with no BSDName appeared");
 		return;
 	}
 	LOG_DISK("{} appeared", bsd_name);
@@ -319,7 +319,7 @@ disk_appeared(DADiskRef disk, void* context)
 
 	auto media_size_cstr = CFDictionaryGetValue(description, kDADiskDescriptionMediaSizeKey);
 	if (!media_size_cstr) {
-		LOG_DISK_NC("Could not read media size");
+		LOG_DISK("Could not read media size");
 		return;
 	}
 
@@ -349,14 +349,14 @@ Drive::get()
 	using namespace boost::algorithm;
 	vector<OSXDisk> disks;
 
-	LOG_DISK_NC("Drive::get() starts");
+	LOG_DISK("Drive::get() starts");
 
 	auto session = DASessionCreate(kCFAllocatorDefault);
 	if (!session) {
 		return {};
 	}
 
-	LOG_DISK_NC("Drive::get() has session");
+	LOG_DISK("Drive::get() has session");
 
 	DARegisterDiskAppearedCallback(session, NULL, disk_appeared, &disks);
 	auto run_loop = CFRunLoopGetCurrent();
@@ -431,13 +431,13 @@ struct UnmountState
 
 void done_callback(DADiskRef, DADissenterRef dissenter, void* context)
 {
-	LOG_DISK_NC("Unmount finished");
+	LOG_DISK("Unmount finished");
 	auto state = reinterpret_cast<UnmountState*>(context);
 	state->callback = true;
 	if (dissenter) {
 		LOG_DISK("Error: {}", DADissenterGetStatus(dissenter));
 	} else {
-		LOG_DISK_NC("Successful");
+		LOG_DISK("Successful");
 		state->success = true;
 	}
 }
@@ -446,7 +446,7 @@ void done_callback(DADiskRef, DADissenterRef dissenter, void* context)
 bool
 Drive::unmount()
 {
-	LOG_DISK_NC("Unmount operation started");
+	LOG_DISK("Unmount operation started");
 
 	auto session = DASessionCreate(kCFAllocatorDefault);
 	if (!session) {
@@ -469,7 +469,7 @@ Drive::unmount()
 	CFRelease(session);
 
 	if (!state.callback) {
-		LOG_DISK_NC("End of unmount: timeout");
+		LOG_DISK("End of unmount: timeout");
 	} else {
 		LOG_DISK("End of unmount: {}", state.success ? "success" : "failure");
 	}
diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc
index 2076f3928..b173d2d61 100644
--- a/src/lib/cross_windows.cc
+++ b/src/lib/cross_windows.cc
@@ -135,12 +135,12 @@ run_ffprobe(boost::filesystem::path content, boost::filesystem::path out, bool e
 	HANDLE child_out_read;
 	HANDLE child_out_write;
 	if (!CreatePipe(&child_out_read, &child_out_write, &security, 0)) {
-		LOG_ERROR_NC("ffprobe call failed (could not CreatePipe)");
+		LOG_ERROR("ffprobe call failed (could not CreatePipe)");
 		return;
 	}
 
 	if (!SetHandleInformation(child_out_read, HANDLE_FLAG_INHERIT, 0)) {
-		LOG_ERROR_NC("ffprobe call failed (could not SetHandleInformation)");
+		LOG_ERROR("ffprobe call failed (could not SetHandleInformation)");
 		return;
 	}
 
@@ -174,13 +174,13 @@ run_ffprobe(boost::filesystem::path content, boost::filesystem::path out, bool e
 	PROCESS_INFORMATION process_info;
 	ZeroMemory(&process_info, sizeof(process_info));
 	if (!CreateProcess(0, command, 0, 0, TRUE, CREATE_NO_WINDOW, 0, dir, &startup_info, &process_info)) {
-		LOG_ERROR_NC(N_("ffprobe call failed (could not CreateProcess)"));
+		LOG_ERROR(N_("ffprobe call failed (could not CreateProcess)"));
 		return;
 	}
 
 	dcp::File o(out, "w");
 	if (!o) {
-		LOG_ERROR_NC(N_("ffprobe call failed (could not create output file)"));
+		LOG_ERROR(N_("ffprobe call failed (could not create output file)"));
 		return;
 	}
 
@@ -417,7 +417,7 @@ get_device_number(HDEVINFO device_info, SP_DEVINFO_DATA* device_info_data)
 	r = SetupDiGetDeviceInterfaceDetailW(device_info, &device_interface_data, 0, 0, &size, 0);
 	PSP_DEVICE_INTERFACE_DETAIL_DATA_W device_detail_data = static_cast<PSP_DEVICE_INTERFACE_DETAIL_DATA_W>(malloc(size));
 	if (!device_detail_data) {
-		LOG_DISK_NC("malloc failed");
+		LOG_DISK("malloc failed");
 		return optional<int>();
 	}
 
@@ -426,7 +426,7 @@ get_device_number(HDEVINFO device_info, SP_DEVINFO_DATA* device_info_data)
 	/* And get the path */
 	r = SetupDiGetDeviceInterfaceDetailW(device_info, &device_interface_data, device_detail_data, size, &size, 0);
 	if (!r) {
-		LOG_DISK_NC("SetupDiGetDeviceInterfaceDetailW failed");
+		LOG_DISK("SetupDiGetDeviceInterfaceDetailW failed");
 		free(device_detail_data);
 		return optional<int>();
 	}
@@ -547,7 +547,7 @@ Drive::get()
 	/* Get a `device information set' containing information about all disks */
 	auto device_info = SetupDiGetClassDevsA(&GUID_DEVICE_INTERFACE_DISK, 0, 0, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
 	if (device_info == INVALID_HANDLE_VALUE) {
-		LOG_DISK_NC("SetupDiClassDevsA failed");
+		LOG_DISK("SetupDiClassDevsA failed");
 		return drives;
 	}
 
@@ -580,7 +580,7 @@ Drive::get()
 				);
 
 		if (device == INVALID_HANDLE_VALUE) {
-			LOG_DISK_NC("Could not open PHYSICALDRIVE");
+			LOG_DISK("Could not open PHYSICALDRIVE");
 			continue;
 		}
 
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index b94d88486..f2e9c5643 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -332,7 +332,7 @@ DCPExaminer::DCPExaminer(shared_ptr<const DCPContent> content, bool tolerant)
 
 	_kdm_valid = true;
 
-	LOG_GENERAL_NC("Check that everything encrypted has a key");
+	LOG_GENERAL("Check that everything encrypted has a key");
 
 	/* Check first that anything encrypted has a key.  We must do this, as if we try to
 	 * read encrypted data with asdcplib without even offering a key it will just return
@@ -346,7 +346,7 @@ DCPExaminer::DCPExaminer(shared_ptr<const DCPContent> content, bool tolerant)
 				auto pic = i->main_picture()->asset();
 				if (pic->encrypted() && !pic->key()) {
 					_kdm_valid = false;
-					LOG_GENERAL_NC("Picture has no key");
+					LOG_GENERAL("Picture has no key");
 					break;
 				}
 				auto j2k_mono = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(pic);
@@ -376,7 +376,7 @@ DCPExaminer::DCPExaminer(shared_ptr<const DCPContent> content, bool tolerant)
 				auto sound = i->main_sound()->asset();
 				if (sound->encrypted() && !sound->key()) {
 					_kdm_valid = false;
-					LOG_GENERAL_NC("Sound has no key");
+					LOG_GENERAL("Sound has no key");
 					break;
 				}
 				auto reader = sound->start_read();
@@ -389,7 +389,7 @@ DCPExaminer::DCPExaminer(shared_ptr<const DCPContent> content, bool tolerant)
 				auto mxf_sub = dynamic_pointer_cast<dcp::MXF>(sub);
 				if (mxf_sub && mxf_sub->encrypted() && !mxf_sub->key()) {
 					_kdm_valid = false;
-					LOG_GENERAL_NC("Subtitle has no key");
+					LOG_GENERAL("Subtitle has no key");
 					break;
 				}
 				sub->texts();
@@ -400,7 +400,7 @@ DCPExaminer::DCPExaminer(shared_ptr<const DCPContent> content, bool tolerant)
 				auto mxf_cap = dynamic_pointer_cast<dcp::MXF>(cap);
 				if (mxf_cap && mxf_cap->encrypted() && !mxf_cap->key()) {
 					_kdm_valid = false;
-					LOG_GENERAL_NC("Caption has no key");
+					LOG_GENERAL("Caption has no key");
 					break;
 				}
 				cap->texts();
@@ -410,7 +410,7 @@ DCPExaminer::DCPExaminer(shared_ptr<const DCPContent> content, bool tolerant)
 				if (auto atmos = i->atmos()->asset()) {
 					if (atmos->encrypted() && !atmos->key()) {
 						_kdm_valid = false;
-						LOG_GENERAL_NC("ATMOS sound has no key");
+						LOG_GENERAL("ATMOS sound has no key");
 						break;
 					}
 					auto reader = atmos->start_read();
diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 2a3fad06b..80d25a358 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -143,7 +143,7 @@ EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st
 	*/
 	if (xml->number_child<int> ("Version") != SERVER_LINK_VERSION) {
 		cerr << "Mismatched server/client versions\n";
-		LOG_ERROR_NC ("Mismatched server/client versions");
+		LOG_ERROR ("Mismatched server/client versions");
 		return -1;
 	}
 
diff --git a/src/lib/ext.cc b/src/lib/ext.cc
index 1cf63603e..2ba63a5a5 100644
--- a/src/lib/ext.cc
+++ b/src/lib/ext.cc
@@ -319,7 +319,7 @@ try
 	if (!bd) {
 		throw CopyError("Failed to open drive", 0, ext4_blockdev_errno);
 	}
-	LOG_DISK_NC("Opened drive");
+	LOG_DISK("Opened drive");
 
 	struct ext4_mbr_parts parts;
 	parts.division[0] = 100;
@@ -332,7 +332,7 @@ try
 	if (r) {
 		throw CopyError("Failed to write MBR", r, ext4_blockdev_errno);
 	}
-	LOG_DISK_NC("Wrote MBR");
+	LOG_DISK("Wrote MBR");
 
 	struct ext4_mbr_bdevs bdevs;
 	r = ext4_mbr_scan(bd, &bdevs);
@@ -371,25 +371,25 @@ try
 	if (!bd) {
 		throw CopyError("Failed to open partition", 0, ext4_blockdev_errno);
 	}
-	LOG_DISK_NC("Opened partition");
+	LOG_DISK("Opened partition");
 
 	r = ext4_mkfs(&fs, bd, &info, F_SET_EXT2, format_progress, nanomsg);
 	if (r != EOK) {
 		throw CopyError("Failed to make filesystem", r, ext4_blockdev_errno);
 	}
-	LOG_DISK_NC("Made filesystem");
+	LOG_DISK("Made filesystem");
 
 	r = ext4_device_register(bd, "ext4_fs");
 	if (r != EOK) {
 		throw CopyError("Failed to register device", r, ext4_blockdev_errno);
 	}
-	LOG_DISK_NC("Registered device");
+	LOG_DISK("Registered device");
 
 	r = ext4_mount("ext4_fs", "/mp/", false);
 	if (r != EOK) {
 		throw CopyError("Failed to mount device", r, ext4_blockdev_errno);
 	}
-	LOG_DISK_NC("Mounted device");
+	LOG_DISK("Mounted device");
 
 	uint64_t total_bytes = 0;
 	count(dcp_paths, total_bytes);
@@ -409,7 +409,7 @@ try
 	if (r != EOK) {
 		throw CopyError("Failed to mount device", r, ext4_blockdev_errno);
 	}
-	LOG_DISK_NC("Re-mounted device");
+	LOG_DISK("Re-mounted device");
 
 	verify(copied_files, total_bytes, nanomsg);
 
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 024b87391..3764cbb46 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -113,7 +113,7 @@ FFmpegDecoder::flush ()
 	switch (_flush_state) {
 	case FlushState::CODECS:
 		if (flush_codecs() == FlushResult::DONE) {
-			LOG_DEBUG_PLAYER_NC("Finished flushing codecs");
+			LOG_DEBUG_PLAYER("Finished flushing codecs");
 			_flush_state = FlushState::AUDIO_DECODER;
 		}
 		break;
@@ -121,12 +121,12 @@ FFmpegDecoder::flush ()
 		if (audio) {
 			audio->flush();
 		}
-		LOG_DEBUG_PLAYER_NC("Finished flushing audio decoder");
+		LOG_DEBUG_PLAYER("Finished flushing audio decoder");
 		_flush_state = FlushState::FILL;
 		break;
 	case FlushState::FILL:
 		if (flush_fill() == FlushResult::DONE) {
-			LOG_DEBUG_PLAYER_NC("Finished flushing fills");
+			LOG_DEBUG_PLAYER("Finished flushing fills");
 			return FlushResult::DONE;
 		}
 		break;
@@ -562,7 +562,7 @@ FFmpegDecoder::decode_and_process_audio_packet (AVPacket* packet)
 		r = avcodec_receive_frame (context, frame);
 		if (r == AVERROR(EAGAIN)) {
 			/* More input is required */
-			LOG_DEBUG_PLAYER_NC("EAGAIN after trying to receive audio frame");
+			LOG_DEBUG_PLAYER("EAGAIN after trying to receive audio frame");
 			return;
 		}
 
@@ -630,7 +630,7 @@ FFmpegDecoder::process_video_frame ()
 				ContentTime::from_seconds(pts)
 				);
 		} else {
-			LOG_WARNING_NC ("Dropping frame without PTS");
+			LOG_WARNING ("Dropping frame without PTS");
 		}
 	}
 }
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index d2e1c9d40..6b60f6de3 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -208,7 +208,7 @@ FFmpegExaminer::FFmpegExaminer(shared_ptr<const FFmpegContent> c, shared_ptr<Job
 	if (temporal_reference.find("T2T3B2B3T2T3B2B3") != string::npos || temporal_reference.find("B2B3T2T3B2B3T2T3") != string::npos) {
 		/* The magical sequence (taken from mediainfo) suggests that 2:3 pull-down is in use */
 		_pulldown = true;
-		LOG_GENERAL_NC("Suggest that this may be 2:3 pull-down (soft telecine)");
+		LOG_GENERAL("Suggest that this may be 2:3 pull-down (soft telecine)");
 	}
 
 	check_for_duplicate_ids();
diff --git a/src/lib/font_config.cc b/src/lib/font_config.cc
index 410f27541..9d505e51a 100644
--- a/src/lib/font_config.cc
+++ b/src/lib/font_config.cc
@@ -142,7 +142,7 @@ FontConfig::system_font_with_name(string name)
 		}
 		FcFontSetDestroy(font_set);
 	} else {
-		LOG_GENERAL_NC("No candidate fonts found");
+		LOG_GENERAL("No candidate fonts found");
 	}
 
 	FcObjectSetDestroy(object_set);
diff --git a/src/lib/http_server.cc b/src/lib/http_server.cc
index 5ca7a5298..3dab26d1e 100644
--- a/src/lib/http_server.cc
+++ b/src/lib/http_server.cc
@@ -153,7 +153,7 @@ HTTPServer::request(vector<string> const& request)
 	} catch (std::exception& e) {
 		LOG_ERROR("Error while handling HTTP request: {}", e.what());
 	} catch (...) {
-		LOG_ERROR_NC("Unknown exception while handling HTTP request");
+		LOG_ERROR("Unknown exception while handling HTTP request");
 	}
 
 	LOG_HTTP("404 {}", parts[0]);
@@ -242,7 +242,7 @@ HTTPServer::handle(shared_ptr<Socket> socket)
 			auto response = request(reader.get());
 			response.send(socket);
 		} catch (runtime_error& e) {
-			LOG_ERROR_NC(e.what());
+			LOG_ERROR(e.what());
 		}
 	}
 
diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index 97f190d17..19f6dbfaa 100644
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -207,7 +207,7 @@ J2KEncoder::end()
 	}
 	lock.unlock ();
 
-	LOG_GENERAL_NC (N_("Terminating encoder threads"));
+	LOG_GENERAL (N_("Terminating encoder threads"));
 
 	terminate_threads ();
 
diff --git a/src/lib/j2k_encoder_thread.cc b/src/lib/j2k_encoder_thread.cc
index b6f927ceb..1754a0d94 100644
--- a/src/lib/j2k_encoder_thread.cc
+++ b/src/lib/j2k_encoder_thread.cc
@@ -51,7 +51,7 @@ J2KEncoderThread::stop()
 	} catch (std::exception& e) {
 		LOG_ERROR("join() threw an exception: {}", e.what());
 	} catch (...) {
-		LOG_ERROR_NC("join() threw an exception");
+		LOG_ERROR("join() threw an exception");
 	}
 }
 
diff --git a/src/lib/make_dcp.cc b/src/lib/make_dcp.cc
index dcbb81bce..dd8162d95 100644
--- a/src/lib/make_dcp.cc
+++ b/src/lib/make_dcp.cc
@@ -80,7 +80,7 @@ make_dcp (shared_ptr<Film> film, TranscodeJob::ChangedBehaviour behaviour)
 	film->set_isdcf_date_today ();
 
 	for (auto info: environment_info()) {
-		LOG_GENERAL_NC (info);
+		LOG_GENERAL (info);
 	}
 
 	for (auto content: film->content()) {
diff --git a/src/lib/nanomsg.cc b/src/lib/nanomsg.cc
index 96c10e53e..fe3827247 100644
--- a/src/lib/nanomsg.cc
+++ b/src/lib/nanomsg.cc
@@ -106,7 +106,7 @@ Nanomsg::recv_and_parse (int flags)
 			return;
 		}
 
-		LOG_DISK_NC("nn_recv failed");
+		LOG_DISK("nn_recv failed");
 		throw CommunicationFailedError ();
 	}
 
diff --git a/src/lib/player.cc b/src/lib/player.cc
index f69603a95..417c30449 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -711,7 +711,7 @@ Player::pass()
 
 	if (_suspended) {
 		/* We can't pass in this state */
-		LOG_DEBUG_PLAYER_NC("Player is suspended");
+		LOG_DEBUG_PLAYER("Player is suspended");
 		return false;
 	}
 
diff --git a/src/lib/shuffler.cc b/src/lib/shuffler.cc
index 66f29a8e1..2bfdfd471 100644
--- a/src/lib/shuffler.cc
+++ b/src/lib/shuffler.cc
@@ -63,7 +63,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 	DCPOMATIC_ASSERT (piece);
 
 	if (!_last && video.eyes == Eyes::LEFT) {
-		LOG_DEBUG_THREE_D_NC ("Shuffler first after clear");
+		LOG_DEBUG_THREE_D ("Shuffler first after clear");
 		/* We haven't seen anything since the last clear() and we have some eyes-left so assume everything is OK */
 		Video (weak_piece, video);
 		_last = video;
@@ -112,7 +112,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 void
 Shuffler::clear ()
 {
-	LOG_DEBUG_THREE_D_NC ("Shuffler::clear");
+	LOG_DEBUG_THREE_D ("Shuffler::clear");
 	_store.clear ();
 	_last = optional<ContentVideo>();
 }
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 6ff113bfa..04a9ddcd4 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -115,12 +115,12 @@ TranscodeJob::run()
 				set_state(FINISHED_ERROR);
 				return;
 			default:
-				LOG_GENERAL_NC(_("Some files have been changed since they were added to the project."));
+				LOG_GENERAL(_("Some files have been changed since they were added to the project."));
 				break;
 			}
 		}
 
-		LOG_GENERAL_NC(N_("Transcode job starting"));
+		LOG_GENERAL(N_("Transcode job starting"));
 
 		DCPOMATIC_ASSERT(_encoder);
 		_encoder->go();
diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc
index 1cb778667..90e9c171f 100644
--- a/src/lib/upload_job.cc
+++ b/src/lib/upload_job.cc
@@ -76,7 +76,7 @@ UploadJob::json_name() const
 void
 UploadJob::run()
 {
-	LOG_GENERAL_NC(N_("Upload job starting"));
+	LOG_GENERAL(N_("Upload job starting"));
 
 	scoped_ptr<Uploader> uploader;
 	switch (Config::instance()->tms_protocol()) {
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 6a74718c3..20bf2cab8 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -578,18 +578,18 @@ void
 Writer::finish()
 {
 	if (_thread.joinable()) {
-		LOG_GENERAL_NC("Terminating writer thread");
+		LOG_GENERAL("Terminating writer thread");
 		terminate_thread(true);
 	}
 
-	LOG_GENERAL_NC("Finishing ReelWriters");
+	LOG_GENERAL("Finishing ReelWriters");
 
 	for (auto& reel: _reels) {
 		write_hanging_text(reel);
 		reel.finish(_output_dir);
 	}
 
-	LOG_GENERAL_NC("Writing XML");
+	LOG_GENERAL("Writing XML");
 
 	dcp::DCP dcp(_output_dir);
 
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");
 		}
 	}