Cleanup: use simpler ownership for FilmViewer.

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

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index d6c81a8d2a794b5cf1fa9867f24c3bce379402d2..3aeb9db17328475984f04bab805cbee9e62b6dbb 100644 (file)
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -20,6 +20,7 @@
 
 
 #include "content_menu.h"
+#include "lib/enum_indexed_vector.h"
 #include "lib/film.h"
 #include "lib/types.h"
 #include <dcp/warnings.h>
@@ -70,7 +71,7 @@ private:
 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;
@@ -108,10 +109,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:
@@ -128,8 +133,8 @@ private:
 
        void setup ();
        void setup_sensitivity ();
+       void set_selected_state(int item, bool state);
 
-       void add_files (std::vector<boost::filesystem::path>);
        std::list<ContentSubPanel *> panels () const;
 
        LimitedSplitter* _splitter;
@@ -145,7 +150,7 @@ 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;
@@ -153,7 +158,7 @@ private:
        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;