X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross_linux.cc;h=bf319bcac80dcdbaf0bc1910cfbfb4fdcd56c4af;hb=7c998afc2711a112dc70a0b247746932bc9ae4ea;hp=239d10c31b03d728037eef97c38fa974d8104dfc;hpb=66188f33fbe6b042e765fdf6f73d51cba5ffd488;p=dcpomatic.git

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index 239d10c31..bf319bcac 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -141,9 +141,9 @@ openssl_path ()
 }
 
 boost::filesystem::path
-dist_writer_path ()
+disk_writer_path ()
 {
-	return boost::dll::program_location().parent_path() / "dcpomatic2_dist_writer";
+	return boost::dll::program_location().parent_path() / "dcpomatic2_disk_writer";
 }
 
 /* Apparently there is no way to create an ofstream using a UTF-8
@@ -267,7 +267,7 @@ get_drives ()
 		boost::algorithm::split (bits, line, boost::is_any_of(" "));
 		if (bits.size() > 0 && boost::algorithm::starts_with(bits[0], "/dev/")) {
 			mounted_devices.push_back(bits[0]);
-			LOG_DIST("Mounted device %1", bits[0]);
+			LOG_DISK("Mounted device %1", bits[0]);
 		}
 	}
 
@@ -302,7 +302,7 @@ get_drives ()
 				}
 			}
 			drives.push_back(Drive("/dev/" + i->path().filename().string(), size, mounted, vendor, model));
-			LOG_DIST("Block device %1 size %2 %3 vendor %4 model %5", name, size, mounted ? "mounted" : "not mounted", vendor.get_value_or("[none]"), model.get_value_or("[none]"));
+			LOG_DISK("Block device %1 size %2 %3 vendor %4 model %5", name, size, mounted ? "mounted" : "not mounted", vendor.get_value_or("[none]"), model.get_value_or("[none]"));
 		}
 	}