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

[dcpomatic.git] / src / wx / content_sub_panel.h

diff --git a/src/wx/content_sub_panel.h b/src/wx/content_sub_panel.h
index 08c61c25f84c617ff30fab855ef7cd10ef0cd4d9..a3916817e45f7057fdca651aef5d22097ab65bfb 100644 (file)
--- a/src/wx/content_sub_panel.h
+++ b/src/wx/content_sub_panel.h
@@ -18,26 +18,32 @@
 
 */
 
+
 #ifndef DCPOMATIC_CONTENT_SUB_PANEL_H
 #define DCPOMATIC_CONTENT_SUB_PANEL_H
 
-#include "lib/film.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+
+#include "lib/film_property.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+#include <memory>
 
 class ContentPanel;
 class Content;
 class DCPContent;
 class wxGridBagSizer;
 
+
 class ContentSubPanel : public wxScrolledWindow
 {
 public:
        ContentSubPanel (ContentPanel *, wxString);
 
-       virtual void film_changed (Film::Property) {}
+       virtual void create () = 0;
+
+       virtual void film_changed(FilmProperty) {}
        /** Called when a given property of one of the selected Contents changes */
        virtual void film_content_changed (int) = 0;
        /** Called when the list of selected Contents changes */
@@ -49,7 +55,8 @@ public:
 
 protected:
 
-       void setup_refer_button (wxCheckBox* button, wxStaticText* note, std::shared_ptr<DCPContent> dcp, bool can_reference, wxString cannot) const;
+       void setup_refer_button (wxCheckBox* button, wxStaticText* note, std::shared_ptr<DCPContent> dcp, bool can_reference, wxString cannot);
+       void layout ();
        virtual void add_to_grid () = 0;
 
        ContentPanel* _parent;