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

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

diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc
index c098aa970dfd2413940e38bcde7651c35b75a6a5..3a1bba3628bf1c48b697aa298b898b33e6d1b44f 100644 (file)
--- a/src/wx/playlist_controls.cc
+++ b/src/wx/playlist_controls.cc
@@ -30,6 +30,7 @@
 #include "lib/cross.h"
 #include "lib/dcp_content.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/film.h"
 #include "lib/internet.h"
 #include "lib/player_video.h"
 #include "lib/scoped_temporary.h"
@@ -69,15 +70,15 @@ PlaylistControls::PlaylistControls(wxWindow* parent, FilmViewer& viewer)
        _spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
        _spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 740);
 
-       wxBoxSizer* left_sizer = new wxBoxSizer (wxVERTICAL);
-       wxBoxSizer* e_sizer = new wxBoxSizer (wxHORIZONTAL);
+       auto left_sizer = new wxBoxSizer(wxVERTICAL);
+       auto e_sizer = new wxBoxSizer(wxHORIZONTAL);
 
        wxFont subheading_font (*wxNORMAL_FONT);
        subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
 
-       wxBoxSizer* spl_header = new wxBoxSizer (wxHORIZONTAL);
+       auto spl_header = new wxBoxSizer(wxHORIZONTAL);
        {
-               wxStaticText* m = new StaticText (this, "Playlists");
+               auto m = new StaticText(this, "Playlists");
                m->SetFont (subheading_font);
                spl_header->Add (m, 1, wxALIGN_CENTER_VERTICAL);
        }
@@ -89,9 +90,9 @@ PlaylistControls::PlaylistControls(wxWindow* parent, FilmViewer& viewer)
 
        _content_view = new ContentView (this);
 
-       wxBoxSizer* content_header = new wxBoxSizer (wxHORIZONTAL);
+       auto content_header = new wxBoxSizer(wxHORIZONTAL);
        {
-               wxStaticText* m = new StaticText (this, "Content");
+               auto m = new StaticText(this, "Content");
                m->SetFont (subheading_font);
                content_header->Add (m, 1, wxALIGN_CENTER_VERTICAL);
        }
@@ -396,12 +397,6 @@ PlaylistControls::config_changed (int property)
        }
 }
 
-void
-PlaylistControls::set_film (shared_ptr<Film> film)
-{
-       Controls::set_film (film);
-       setup_sensitivity ();
-}
 
 void
 PlaylistControls::update_current_content ()