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

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

diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index 2c6bac14a0ae0013525eda7c25187176c0c90bd0..72a57740e4f2d024dede4d96608a0174a868a8d5 100644 (file)
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "hints_dialog.h"
 #include "wx_util.h"
 #include "static_text.h"
@@ -25,10 +26,11 @@
 #include "lib/film.h"
 #include "lib/hints.h"
 #include "lib/config.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/richtext/richtextctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+
 
 using std::max;
 using std::vector;
@@ -42,13 +44,14 @@ using std::dynamic_pointer_cast;
 using namespace boost::placeholders;
 #endif
 
+
 HintsDialog::HintsDialog (wxWindow* parent, std::weak_ptr<Film> film, bool ok)
        : wxDialog (parent, wxID_ANY, _("Hints"))
        , _film (film)
        , _hints (0)
        , _finished (false)
 {
-       wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+       auto sizer = new wxBoxSizer (wxVERTICAL);
 
        _gauge = new wxGauge (this, wxID_ANY, 100);
        sizer->Add (_gauge, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
@@ -59,48 +62,54 @@ HintsDialog::HintsDialog (wxWindow* parent, std::weak_ptr<Film> film, bool ok)
        sizer->Add (_text, 1, wxEXPAND | wxALL, 6);
 
        if (!ok) {
-               wxCheckBox* b = new CheckBox (this, _("Don't show hints again"));
+               auto b = new CheckBox(this, _("Don't show hints again"));
                sizer->Add (b, 0, wxALL, 6);
-               b->Bind (wxEVT_CHECKBOX, bind (&HintsDialog::shut_up, this, _1));
+               b->bind(&HintsDialog::shut_up, this, _1);
        }
 
-       wxStdDialogButtonSizer* buttons = CreateStdDialogButtonSizer (0);
+       auto buttons = CreateStdDialogButtonSizer (0);
        sizer->Add (CreateSeparatedSizer(buttons), wxSizerFlags().Expand().DoubleBorder());
+       wxButton* default_button = nullptr;
        if (ok) {
-               buttons->SetAffirmativeButton (new wxButton (this, wxID_OK));
+               default_button = new wxButton(this, wxID_OK);
+               buttons->SetAffirmativeButton(default_button);
        } else {
-               buttons->SetAffirmativeButton (new wxButton (this, wxID_OK, _("Make DCP")));
+               default_button = new wxButton(this, wxID_OK, _("Make DCP"));
+               buttons->SetAffirmativeButton(default_button);
                buttons->SetNegativeButton (new wxButton (this, wxID_CANCEL, _("Go back")));
        }
 
        buttons->Realize ();
 
+       default_button->SetFocus();
+
        SetSizer (sizer);
        sizer->Layout ();
        sizer->SetSizeHints (this);
 
        _text->GetCaret()->Hide ();
 
-       std::shared_ptr<Film> locked_film = _film.lock ();
+       auto locked_film = _film.lock ();
        if (locked_film) {
                _film_change_connection = locked_film->Change.connect (boost::bind (&HintsDialog::film_change, this, _1));
                _film_content_change_connection = locked_film->ContentChange.connect (boost::bind (&HintsDialog::film_content_change, this, _1));
        }
 
-       film_change (CHANGE_TYPE_DONE);
+       film_change (ChangeType::DONE);
 }
 
+
 void
 HintsDialog::film_change (ChangeType type)
 {
-       if (type != CHANGE_TYPE_DONE) {
+       if (type != ChangeType::DONE) {
                return;
        }
 
        _text->Clear ();
        _current.clear ();
 
-       std::shared_ptr<Film> film = _film.lock ();
+       auto film = _film.lock ();
        if (!film) {
                return;
        }
@@ -113,10 +122,10 @@ HintsDialog::film_change (ChangeType type)
        _finished = false;
 
        _hints.reset (new Hints (_film));
-       _hints->Hint.connect (bind (&HintsDialog::hint, this, _1));
-       _hints->Progress.connect (bind (&HintsDialog::progress, this, _1));
-       _hints->Pulse.connect (bind (&HintsDialog::pulse, this));
-       _hints->Finished.connect (bind (&HintsDialog::finished, this));
+       _hints_hint_connection = _hints->Hint.connect(bind(&HintsDialog::hint, this, _1));
+       _hints_progress_connection = _hints->Progress.connect(bind(&HintsDialog::progress, this, _1));
+       _hints_pulse_connection = _hints->Pulse.connect(bind(&HintsDialog::pulse, this));
+       _hints_finished_connection = _hints->Finished.connect(bind(&HintsDialog::finished, this));
        _hints->start ();
 }