Another call to wxTimer::Start() with 0 delay, which fails on OS X.

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

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index fe48e1e93d12246eff6183a6b7452116d68ba0f4..cf5782baa6d45e268b94ce6bd391cea85e01c363 100644 (file)
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -32,6 +32,7 @@ class wxListEvent;
 class TimelineDialog;
 class FilmEditor;
 class ContentSubPanel;
+class AudioPanel;
 class Film;
 class FilmViewer;
 
@@ -47,6 +48,7 @@ public:
        void set_film (boost::shared_ptr<Film>);
        void set_general_sensitivity (bool s);
        void set_selection (boost::weak_ptr<Content>);
+       void set_selection (ContentList cl);
 
        void film_changed (Film::Property p);
        void film_content_changed (int p);
@@ -71,6 +73,7 @@ public:
 private:
        void selection_changed ();
        void add_folder_clicked ();
+       void add_dcp_clicked ();
        void earlier_clicked ();
        void later_clicked ();
        void right_click (wxListEvent &);
@@ -88,12 +91,13 @@ private:
        wxListCtrl* _content;
        wxButton* _add_file;
        wxButton* _add_folder;
+       wxButton* _add_dcp;
        wxButton* _remove;
        wxButton* _earlier;
        wxButton* _later;
        wxButton* _timeline;
        ContentSubPanel* _video_panel;
-       ContentSubPanel* _audio_panel;
+       AudioPanel* _audio_panel;
        ContentSubPanel* _subtitle_panel;
        ContentSubPanel* _timing_panel;
        std::list<ContentSubPanel *> _panels;