Fix up device name on Windows.
authorCarl Hetherington <cth@carlh.net>
Fri, 27 Mar 2020 19:41:19 +0000 (20:41 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 28 Mar 2020 18:47:28 +0000 (19:47 +0100)
src/lib/cross_linux.cc
src/tools/dcpomatic_dist_writer.cc

index 5073abe08e9813bbc9e9a80dfaebab8ca7a5ac6f..06c9b521be31aa4eae1f03b29e4186d2cd4ae76a 100644 (file)
@@ -300,7 +300,7 @@ get_drives ()
                                        mounted = true;
                                }
                        }
-                       drives.push_back(Drive(i->path().filename().string(), size, mounted, vendor, model));
+                       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]"));
                }
        }
index c965666e691c527d9e74644003f830f422b9c4b5..404136878eb811f74f7df478a64c92710379deee 100644 (file)
@@ -366,7 +366,7 @@ idle ()
        }
 
        dcp_path = *s;
-       device = "/dev/" + nanomsg->blocking_get ();
+       device = nanomsg->blocking_get();
 
        LOG_DIST ("Here we go writing %1 to %2", dcp_path, device);