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

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

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index aca8181184b596c7d02b2c9391f3bd984f9b0f6e..ca0d4971946f779336d28da953da681ddfd2b222 100644 (file)
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -20,54 +20,39 @@
 
 
 #include "content_menu.h"
-#include "lib/film.h"
-#include "lib/types.h"
+#include "lib/enum_indexed_vector.h"
+#include "lib/film_property.h"
+#include "lib/text_type.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/splitter.h>
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 
 
+class AudioPanel;
+class ContentListCtrl;
+class ContentSubPanel;
+class Film;
+class FilmEditor;
+class FilmViewer;
+class LimitedContentPanelSplitter;
+class TextPanel;
+class TimelineDialog;
+class TimingPanel;
+class VideoPanel;
+class wxListCtrl;
+class wxListEvent;
 class wxNotebook;
 class wxPanel;
 class wxSizer;
-class wxListCtrl;
-class wxListEvent;
 class wxSplitterWindow;
-class TimelineDialog;
-class FilmEditor;
-class ContentSubPanel;
-class TextPanel;
-class VideoPanel;
-class AudioPanel;
-class TimingPanel;
-class Film;
-class FilmViewer;
-
-
-class LimitedSplitter : public wxSplitterWindow
-{
-public:
-       LimitedSplitter (wxWindow* parent);
-
-       bool OnSashPositionChange (int new_position)
-       {
-               /* Try to stop the top bit of the splitter getting so small that buttons disappear */
-               return new_position > 220;
-       }
-
-       void first_shown (wxWindow* top, wxWindow* bottom);
-
-private:
-       void sized (wxSizeEvent& ev);
-
-       bool _first_shown;
-       int const _top_panel_minimum_size;
-};
 
 
 class ContentPanel
 {
 public:
-       ContentPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
+       ContentPanel(wxNotebook *, std::shared_ptr<Film>, FilmViewer& viewer);
 
        ContentPanel (ContentPanel const&) = delete;
        ContentPanel& operator= (ContentPanel const&) = delete;
@@ -82,14 +67,12 @@ public:
        void set_selection (ContentList cl);
        void select_all ();
 
-       void film_changed (Film::Property p);
+       void film_changed(FilmProperty p);
        void film_content_changed (int p);
 
        void first_shown ();
 
-       wxWindow* window () const {
-               return _splitter;
-       }
+       wxWindow* window () const;
 
        wxNotebook* notebook () const {
                return _notebook;
@@ -105,10 +88,14 @@ public:
        bool remove_clicked (bool hotkey);
        void timeline_clicked ();
 
-       std::weak_ptr<FilmViewer> film_viewer () const {
+       FilmViewer& film_viewer() const {
                return _film_viewer;
        }
 
+       void add_files(std::vector<boost::filesystem::path> files);
+       void add_dcp(boost::filesystem::path dcp);
+       void add_folder(boost::filesystem::path folder);
+
        boost::signals2::signal<void (void)> SelectionChanged;
 
 private:
@@ -125,14 +112,14 @@ private:
 
        void setup ();
        void setup_sensitivity ();
+       void set_selected_state(int item, bool state);
 
-       void add_files (std::list<boost::filesystem::path>);
        std::list<ContentSubPanel *> panels () const;
 
-       LimitedSplitter* _splitter;
+       LimitedContentPanelSplitter* _splitter;
        wxPanel* _top_panel;
        wxNotebook* _notebook;
-       wxListCtrl* _content;
+       ContentListCtrl* _content;
        wxButton* _add_file;
        wxButton* _add_folder;
        wxButton* _add_dcp;
@@ -142,15 +129,15 @@ private:
        wxButton* _timeline;
        VideoPanel* _video_panel = nullptr;
        AudioPanel* _audio_panel = nullptr;
-       TextPanel* _text_panel[static_cast<int>(TextType::COUNT)];
+       EnumIndexedVector<TextPanel*, TextType> _text_panel;
        TimingPanel* _timing_panel;
        ContentMenu* _menu;
-       TimelineDialog* _timeline_dialog = nullptr;
+       wx_ptr<TimelineDialog> _timeline_dialog;
        wxNotebook* _parent;
        wxWindow* _last_selected_tab = nullptr;
 
        std::shared_ptr<Film> _film;
-       std::weak_ptr<FilmViewer> _film_viewer;
+       FilmViewer& _film_viewer;
        bool _generally_sensitive;
        bool _ignore_deselect;
        bool _no_check_selection;