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

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index d604f678df508908b54e27b076d7536d2e054a10..9f54db58e027e9b651f830d098d41045c0e91775 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -24,23 +24,24 @@
  */
 
 
-#include "wx_util.h"
-#include "film_editor.h"
-#include "dcp_panel.h"
 #include "content_panel.h"
-#include "lib/film.h"
-#include "lib/job_manager.h"
+#include "dcp_panel.h"
+#include "film_editor.h"
+#include "wx_util.h"
 #include "lib/content.h"
 #include "lib/dcp_content.h"
-#include <wx/wx.h>
+#include "lib/film.h"
+#include "lib/job_manager.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/notebook.h>
-#include <iostream>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 
 
-using std::cout;
-using std::string;
 using std::list;
 using std::shared_ptr;
+using std::string;
 using std::weak_ptr;
 using boost::optional;
 #if BOOST_VERSION >= 106100
@@ -48,18 +49,18 @@ using namespace boost::placeholders;
 #endif
 
 
-FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
+FilmEditor::FilmEditor(wxWindow* parent, FilmViewer& viewer)
        : wxPanel (parent)
 {
        auto s = new wxBoxSizer (wxVERTICAL);
 
-       _main_notebook = new wxNotebook (this, wxID_ANY);
-       s->Add (_main_notebook, 1);
+       auto notebook = new wxNotebook(this, wxID_ANY);
+       s->Add(notebook, 1, wxEXPAND);
 
-       _content_panel = new ContentPanel (_main_notebook, _film, viewer);
-       _main_notebook->AddPage (_content_panel->window(), _("Content"), true);
-       _dcp_panel = new DCPPanel (_main_notebook, _film, viewer);
-       _main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
+       _content_panel = new ContentPanel(notebook, _film, viewer);
+       notebook->AddPage(_content_panel->window(), _("Content"), true);
+       _dcp_panel = new DCPPanel(notebook, _film, viewer);
+       notebook->AddPage(_dcp_panel->panel (), _("DCP"), false);
 
        JobManager::instance()->ActiveJobsChanged.connect (
                bind(&FilmEditor::active_jobs_changed, this, _2)
@@ -75,7 +76,7 @@ FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
  *  @param p Property of the Film that has changed.
  */
 void
-FilmEditor::film_change (ChangeType type, Film::Property p)
+FilmEditor::film_change(ChangeType type, FilmProperty p)
 {
        if (type != ChangeType::DONE) {
                return;
@@ -90,7 +91,7 @@ FilmEditor::film_change (ChangeType type, Film::Property p)
        _content_panel->film_changed (p);
        _dcp_panel->film_changed (p);
 
-       if (p == Film::Property::CONTENT && !_film->content().empty()) {
+       if (p == FilmProperty::CONTENT && !_film->content().empty()) {
                /* Select newly-added content */
                _content_panel->set_selection (_film->content().back ());
        }
@@ -134,19 +135,12 @@ FilmEditor::set_film (shared_ptr<Film> film)
        _dcp_panel->set_film (_film);
 
        if (!_film) {
-               FileChanged ("");
                return;
        }
 
        _film->Change.connect (bind(&FilmEditor::film_change, this, _1, _2));
        _film->ContentChange.connect (bind(&FilmEditor::film_content_change, this, _1, _3));
 
-       if (_film->directory()) {
-               FileChanged (_film->directory().get());
-       } else {
-               FileChanged ("");
-       }
-
        if (!_film->content().empty()) {
                _content_panel->set_selection (_film->content().front());
        }