Note that newer libsub version is required.

[dcpomatic.git] / src / wx / text_panel.cc

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 76dd21489f831b54c1a56a51a58f0d42eeb38ea4..78c024565eb95434805ae3a5836b4a03abafb16a 100644 (file)
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -32,7 +32,6 @@
 #include "subtitle_appearance_dialog.h"
 #include "text_panel.h"
 #include "text_view.h"
-#include "wx_ptr.h"
 #include "wx_util.h"
 #include "lib/analyse_subtitles_job.h"
 #include "lib/dcp_content.h"
@@ -41,12 +40,14 @@
 #include "lib/decoder_factory.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_subtitle_stream.h"
+#include "lib/film.h"
 #include "lib/job_manager.h"
-#include "lib/scope_guard.h"
 #include "lib/string_text_file_content.h"
 #include "lib/string_text_file_decoder.h"
 #include "lib/subtitle_analysis.h"
 #include "lib/text_content.h"
+#include <dcp/filesystem.h>
+#include <dcp/scope_guard.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
@@ -401,9 +402,9 @@ TextPanel::dcp_track_changed ()
 
 
 void
-TextPanel::film_changed (Film::Property property)
+TextPanel::film_changed(FilmProperty property)
 {
-       if (property == Film::Property::CONTENT || property == Film::Property::REEL_TYPE || property == Film::Property::INTEROP) {
+       if (property == FilmProperty::CONTENT || property == FilmProperty::REEL_TYPE || property == FilmProperty::INTEROP) {
                setup_sensitivity ();
        }
 }
@@ -812,7 +813,7 @@ TextPanel::try_to_load_analysis ()
        }
 
        _loading_analysis = true;
-       ScopeGuard sg = [this]() {
+       dcp::ScopeGuard sg = [this]() {
                _loading_analysis = false;
                setup_sensitivity();
        };
@@ -827,7 +828,7 @@ TextPanel::try_to_load_analysis ()
 
        auto const path = _parent->film()->subtitle_analysis_path(content);
 
-       if (!boost::filesystem::exists(path)) {
+       if (!dcp::filesystem::exists(path)) {
                for (auto i: JobManager::instance()->get()) {
                        if (dynamic_pointer_cast<AnalyseSubtitlesJob>(i) && !i->finished()) {
                                i->cancel ();
@@ -898,7 +899,7 @@ TextPanel::analysis_finished(Job::Result result)
                return;
        }
 
-       if (!boost::filesystem::exists(_parent->film()->subtitle_analysis_path(content))) {
+       if (!dcp::filesystem::exists(_parent->film()->subtitle_analysis_path(content))) {
                /* We analysed and still nothing showed up, so maybe it failed.  Give up. */
                error_dialog (_parent->window(), _("Could not analyse subtitles."));
                clear_outline_subtitles ();