Cleanup: use some more vector instead of list.

[dcpomatic.git] / src / lib / cross_osx.cc

diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index c54dd99f3f8f5e87da82a30c46d465399b37e3f8..0f25732f2aa3e667050998f94e4cfc07f578542d 100644 (file)
--- a/src/lib/cross_osx.cc
+++ b/src/lib/cross_osx.cc
@@ -103,13 +103,18 @@ libdcp_resources_path ()
 
 
 void
-run_ffprobe (boost::filesystem::path content, boost::filesystem::path out)
+run_ffprobe(boost::filesystem::path content, boost::filesystem::path out, bool err, string args)
 {
        auto path = directory_containing_executable () / "ffprobe";
+       if (!boost::filesystem::exists(path)) {
+               /* This is a hack but we need ffprobe during tests */
+               path = "/Users/ci/workspace/bin/ffprobe";
+       }
+       string const redirect = err ? "2>" : ">";
 
-       string ffprobe = "\"" + path.string() + "\" \"" + content.string() + "\" 2> \"" + out.string() + "\"";
+       auto const ffprobe = String::compose("\"%1\" %2 \"%3\" %4 \"%5\"", path, args.empty() ? " " : args, content.string(), redirect, out.string());
        LOG_GENERAL (N_("Probing with %1"), ffprobe);
-       system (ffprobe.c_str ());
+       system (ffprobe.c_str());
 }
 
 
@@ -405,16 +410,23 @@ config_path (optional<string> version)
 }
 
 
+struct UnmountState
+{
+       bool success = false;
+       bool callback = false;
+};
+
+
 void done_callback(DADiskRef, DADissenterRef dissenter, void* context)
 {
        LOG_DISK_NC("Unmount finished");
-       bool* success = reinterpret_cast<bool*> (context);
+       auto state = reinterpret_cast<UnmountState*>(context);
+       state->callback = true;
        if (dissenter) {
                LOG_DISK("Error: %1", DADissenterGetStatus(dissenter));
-               *success = false;
        } else {
                LOG_DISK_NC("Successful");
-               *success = true;
+               state->success = true;
        }
 }
 
@@ -434,19 +446,22 @@ Drive::unmount ()
                return false;
        }
        LOG_DISK("Requesting unmount of %1 from %2", _device, thread_id());
-       bool success = false;
-       DADiskUnmount(disk, kDADiskUnmountOptionWhole, &done_callback, &success);
+       UnmountState state;
+       DADiskUnmount(disk, kDADiskUnmountOptionWhole, &done_callback, &state);
        CFRelease (disk);
 
        CFRunLoopRef run_loop = CFRunLoopGetCurrent ();
        DASessionScheduleWithRunLoop (session, run_loop, kCFRunLoopDefaultMode);
        CFRunLoopStop (run_loop);
-       CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.5, 0);
        CFRunLoopRunInMode(kCFRunLoopDefaultMode, 5, 0);
        CFRelease(session);
 
-       LOG_DISK_NC("End of unmount");
-       return success;
+       if (!state.callback) {
+               LOG_DISK_NC("End of unmount: timeout");
+       } else {
+               LOG_DISK("End of unmount: %1", state.success ? "success" : "failure");
+       }
+       return state.success;
 }