From 6d27b49a7a767a9c8b31dc0f799da940ddb7232f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 9 Apr 2020 20:52:20 +0200
Subject: Tidy up Drive and unmounting a little.

---
 src/tools/dcpomatic_disk.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/tools/dcpomatic_disk.cc')

diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index ba92cf94e..3ceead860 100644
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -178,7 +178,7 @@ private:
 			if (!_nanomsg.send(DISK_WRITER_UNMOUNT "\n", 2000)) {
 				throw CommunicationFailedError ();
 			}
-			if (!_nanomsg.send(drive.internal_name() + "\n", 2000)) {
+			if (!_nanomsg.send(drive.as_xml() + "\n", 2000)) {
 				throw CommunicationFailedError ();
 			}
 			optional<string> reply = _nanomsg.receive (2000);
@@ -218,7 +218,7 @@ private:
 		_drive->Clear ();
 		int re_select = wxNOT_FOUND;
 		int j = 0;
-		_drives = get_drives ();
+		_drives = Drive::get ();
 		BOOST_FOREACH (Drive i, _drives) {
 			wxString const s = std_to_wx(i.description());
 			if (s == current) {
-- 
cgit v1.2.3