Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index ab198411ddf5b9296aa19aab163621af55b34bb4..633ea1bd604abdfc646421bb53a4894b8c07d6e3 100644 (file)
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -32,17 +32,18 @@ class TimelineDialog;
 class FilmEditor;
 class ContentSubPanel;
 class Film;
+class FilmViewer;
 
-class ContentPanel
+class ContentPanel : public boost::noncopyable
 {
 public:
-       ContentPanel (wxNotebook *, boost::shared_ptr<Film>);
+       ContentPanel (wxNotebook *, boost::shared_ptr<Film>, FilmViewer* viewer);
 
        boost::shared_ptr<Film> film () const {
                return _film;
        }
 
-       void set_film (boost::shared_ptr<Film> f);
+       void set_film (boost::shared_ptr<Film>);
        void set_general_sensitivity (bool s);
        void set_selection (boost::weak_ptr<Content>);
 
@@ -64,9 +65,8 @@ public:
        FFmpegContentList selected_ffmpeg ();
 
        void add_file_clicked ();
-       
-private:       
-       void sequence_video_changed ();
+
+private:
        void selection_changed ();
        void add_folder_clicked ();
        void remove_clicked ();
@@ -79,6 +79,8 @@ private:
        void setup ();
        void setup_sensitivity ();
 
+       void add_files (std::list<boost::filesystem::path>);
+
        wxPanel* _panel;
        wxSizer* _sizer;
        wxNotebook* _notebook;
@@ -89,7 +91,6 @@ private:
        wxButton* _earlier;
        wxButton* _later;
        wxButton* _timeline;
-       wxCheckBox* _sequence_video;
        ContentSubPanel* _video_panel;
        ContentSubPanel* _audio_panel;
        ContentSubPanel* _subtitle_panel;
@@ -97,6 +98,7 @@ private:
        std::list<ContentSubPanel *> _panels;
        ContentMenu* _menu;
        TimelineDialog* _timeline_dialog;
+       wxNotebook* _parent;
 
        boost::shared_ptr<Film> _film;
        bool _generally_sensitive;