#include "compose.hpp"
#include "dcpomatic_assert.h"
#include "dcpomatic_log.h"
-#include "warnings.h"
#include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
#include <boost/algorithm/string.hpp>
#include <iostream>
}
-/* Take soem OSXDisk objects, representing disks that `DARegisterDiskAppearedCallback` told us about,
+/* Take some OSXDisk objects, representing disks that `DARegisterDiskAppearedCallback` told us about,
* and find those drives that we could write a DCP to. The drives returned are "real" (not synthesized)
* and are whole disks (not partitions). They may be mounted, or contain mounted partitions, in which
* their mounted() method will return true.