Use new Windows long filename workaround with disk writer (#1755).

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

diff --git a/src/lib/spl_entry.cc b/src/lib/spl_entry.cc
index 5b011a04654ec747dfe44a97e58c28039e1d3752..440f9861b882f56e5b0edeebcd6ec43aadc4361c 100644 (file)
--- a/src/lib/spl_entry.cc
+++ b/src/lib/spl_entry.cc
@@ -21,10 +21,13 @@
 #include "spl_entry.h"
 #include "dcp_content.h"
 #include "dcpomatic_assert.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 SPLEntry::SPLEntry (shared_ptr<Content> content)
 {
@@ -41,11 +44,11 @@ SPLEntry::construct (shared_ptr<Content> c)
                name = dcp->name ();
                DCPOMATIC_ASSERT (dcp->cpl());
                id = *dcp->cpl();
-               kind = dcp->content_kind().get_value_or(dcp::FEATURE);
+               kind = dcp->content_kind().get_value_or(dcp::ContentKind::FEATURE);
                encrypted = dcp->encrypted ();
        } else {
                name = content->path(0).filename().string();
-               kind = dcp::FEATURE;
+               kind = dcp::ContentKind::FEATURE;
        }
 }