Move _state_timer into VideoView.

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

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 15e0fb6e1506d810a7d12bc9fe8ae947e68f5ff3..13393f632701edab5a13107a962363ffc1d931da 100644 (file)
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,28 +18,33 @@
 
 */
 
-#include <list>
-#include <boost/shared_ptr.hpp>
+#include "content_menu.h"
 #include "lib/types.h"
 #include "lib/film.h"
-#include "content_menu.h"
+#include <wx/splitter.h>
+#include <boost/shared_ptr.hpp>
+#include <list>
 
 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 ContentPanel : public boost::noncopyable
 {
 public:
-       ContentPanel (wxNotebook *, boost::shared_ptr<Film>, FilmViewer* viewer);
+       ContentPanel (wxNotebook *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
 
        boost::shared_ptr<Film> film () const {
                return _film;
@@ -53,8 +58,8 @@ public:
        void film_changed (Film::Property p);
        void film_content_changed (int p);
 
-       wxPanel* panel () const {
-               return _panel;
+       wxWindow* window () const {
+               return _splitter;
        }
 
        wxNotebook* notebook () const {
@@ -64,17 +69,24 @@ public:
        ContentList selected ();
        ContentList selected_video ();
        ContentList selected_audio ();
-       ContentList selected_subtitle ();
+       ContentList selected_text ();
        FFmpegContentList selected_ffmpeg ();
 
        void add_file_clicked ();
        bool remove_clicked (bool hotkey);
        void timeline_clicked ();
 
+       boost::weak_ptr<FilmViewer> film_viewer () const {
+               return _film_viewer;
+       }
+
        boost::signals2::signal<void (void)> SelectionChanged;
 
 private:
-       void selection_changed ();
+       void item_selected ();
+       void item_deselected ();
+       void item_deselected_idle ();
+       void check_selection ();
        void add_folder_clicked ();
        void add_dcp_clicked ();
        void earlier_clicked ();
@@ -86,9 +98,9 @@ private:
        void setup_sensitivity ();
 
        void add_files (std::list<boost::filesystem::path>);
+       std::list<ContentSubPanel *> panels () const;
 
-       wxPanel* _panel;
-       wxSizer* _sizer;
+       wxSplitterWindow* _splitter;
        wxNotebook* _notebook;
        wxListCtrl* _content;
        wxButton* _add_file;
@@ -98,17 +110,18 @@ private:
        wxButton* _earlier;
        wxButton* _later;
        wxButton* _timeline;
-       ContentSubPanel* _video_panel;
+       VideoPanel* _video_panel;
        AudioPanel* _audio_panel;
-       ContentSubPanel* _subtitle_panel;
-       ContentSubPanel* _timing_panel;
-       std::list<ContentSubPanel *> _panels;
+       TextPanel* _text_panel[TEXT_COUNT];
+       TimingPanel* _timing_panel;
        ContentMenu* _menu;
        TimelineDialog* _timeline_dialog;
        wxNotebook* _parent;
-       ContentList _last_selected;
+       wxWindow* _last_selected_tab;
 
        boost::shared_ptr<Film> _film;
-       FilmViewer* _film_viewer;
+       boost::weak_ptr<FilmViewer> _film_viewer;
        bool _generally_sensitive;
+       bool _ignore_deselect;
+       bool _no_check_selection;
 };