Work around deadlock when destroying J2KEncoder with a full writer queue (#2784).

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

diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index 5ae9f5da4d8d66c3cf444f98096313ecec6007a3..d88f747259a5c657787c5fa4123d85893359b5d0 100644 (file)
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -30,13 +30,13 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/examine_ffmpeg_subtitles_job.h"
 #include "lib/job_manager.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/clrpicker.h>
 #include <wx/spinctrl.h>
 #include <wx/gbsizer.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::dynamic_pointer_cast;
@@ -204,11 +204,11 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 
        _outline_width->SetValue (_text->outline_width ());
 
-       _force_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
-       _force_effect_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
-       _force_effect->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
-       _force_fade_in->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
-       _force_fade_out->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
+       _force_colour->bind(&SubtitleAppearanceDialog::setup_sensitivity, this);
+       _force_effect_colour->bind(&SubtitleAppearanceDialog::setup_sensitivity, this);
+       _force_effect->bind(&SubtitleAppearanceDialog::setup_sensitivity, this);
+       _force_fade_in->bind(&SubtitleAppearanceDialog::setup_sensitivity, this);
+       _force_fade_out->bind(&SubtitleAppearanceDialog::setup_sensitivity, this);
        _effect->Bind (wxEVT_CHOICE, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
        _content_connection = _content->Change.connect (bind (&SubtitleAppearanceDialog::content_change, this, _1));
 
@@ -223,7 +223,7 @@ SubtitleAppearanceDialog::content_change (ChangeType type)
        }
 }
 
-wxCheckBox*
+CheckBox*
 SubtitleAppearanceDialog::set_to (wxWindow* w, int& r)
 {
        auto s = new wxBoxSizer (wxHORIZONTAL);