Fix silent stereo mixdown exports when the project audio channel count is > 6.

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

diff --git a/src/lib/subtitle_analysis.cc b/src/lib/subtitle_analysis.cc
index 0838816b04a823fcd8e3201da5001c6f9a41f77d..ff1969a3a37c227cd32fde4a2dc793760648908a 100644 (file)
--- a/src/lib/subtitle_analysis.cc
+++ b/src/lib/subtitle_analysis.cc
@@ -21,12 +21,13 @@
 
 #include "subtitle_analysis.h"
 #include "exceptions.h"
-#include "warnings.h"
 #include <libcxml/cxml.h>
+#include <dcp/filesystem.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
 
 
 using std::make_shared;
@@ -42,7 +43,7 @@ SubtitleAnalysis::SubtitleAnalysis (boost::filesystem::path path)
 {
        cxml::Document f ("SubtitleAnalysis");
 
-       f.read_file (path);
+       f.read_file(dcp::filesystem::fix_long_path(path));
 
        if (f.optional_number_child<int>("Version").get_value_or(1) < _current_state_version) {
                /* Too old.  Throw an exception so that this analysis is re-run. */