Tidy up Drive and unmounting a little.

[dcpomatic.git] / src / tools / dcpomatic_disk_writer.cc

diff --git a/src/tools/dcpomatic_disk_writer.cc b/src/tools/dcpomatic_disk_writer.cc
index 5e76341ebe48559e7849893b790f1f53587ba059..4a93cba98b85ef974f6adb8c521c344740255a81 100644 (file)
--- a/src/tools/dcpomatic_disk_writer.cc
+++ b/src/tools/dcpomatic_disk_writer.cc
@@ -403,11 +403,12 @@ try
                exit (EXIT_SUCCESS);
        } else if (*s == DISK_WRITER_UNMOUNT) {
                /* XXX: should do Linux polkit stuff here */
-               optional<string> device = nanomsg->receive (LONG_TIMEOUT);
-               if (!device) {
+               optional<string> xml_head = nanomsg->receive (LONG_TIMEOUT);
+               optional<string> xml_body = nanomsg->receive (LONG_TIMEOUT);
+               if (!xml_head || !xml_body) {
                        throw CommunicationFailedError ();
                }
-               if (unmount_drive(*device)) {
+               if (Drive(*xml_head + *xml_body).unmount()) {
                        if (!nanomsg->send (DISK_WRITER_OK "\n", LONG_TIMEOUT)) {
                                throw CommunicationFailedError();
                        }
@@ -449,8 +450,8 @@ try
 
                bool on_drive_list = false;
                bool mounted = false;
-               for (auto const& i: get_drives()) {
-                       if (i.internal_name() == *device) {
+               for (auto const& i: Drive::get()) {
+                       if (i.device() == *device) {
                                on_drive_list = true;
                                mounted = i.mounted();
                        }