X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.h;h=fe48e1e93d12246eff6183a6b7452116d68ba0f4;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=6b94e7d5b0d5997d14b9aa2a243363c844d10e25;hpb=a112eeb4d052b1212f94e95efd83a215213da691;p=dcpomatic.git

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 6b94e7d5b..fe48e1e93 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -32,17 +33,18 @@ class TimelineDialog;
 class FilmEditor;
 class ContentSubPanel;
 class Film;
+class FilmViewer;
 
 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>);
 
@@ -58,17 +60,17 @@ public:
 	}
 
 	ContentList selected ();
-	VideoContentList selected_video ();
-	AudioContentList selected_audio ();
-	SubtitleContentList selected_subtitle ();
+	ContentList selected_video ();
+	ContentList selected_audio ();
+	ContentList selected_subtitle ();
 	FFmpegContentList selected_ffmpeg ();
 
 	void add_file_clicked ();
-	
-private:	
+	bool remove_clicked (bool hotkey);
+
+private:
 	void selection_changed ();
 	void add_folder_clicked ();
-	void remove_clicked ();
 	void earlier_clicked ();
 	void later_clicked ();
 	void right_click (wxListEvent &);
@@ -78,6 +80,8 @@ private:
 	void setup ();
 	void setup_sensitivity ();
 
+	void add_files (std::list<boost::filesystem::path>);
+
 	wxPanel* _panel;
 	wxSizer* _sizer;
 	wxNotebook* _notebook;
@@ -95,7 +99,10 @@ private:
 	std::list<ContentSubPanel *> _panels;
 	ContentMenu* _menu;
 	TimelineDialog* _timeline_dialog;
+	wxNotebook* _parent;
+	ContentList _last_selected;
 
 	boost::shared_ptr<Film> _film;
+	FilmViewer* _film_viewer;
 	bool _generally_sensitive;
 };