X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.h;h=633ea1bd604abdfc646421bb53a4894b8c07d6e3;hb=7bc94f069f011a1a7e8554aa5cc88167e409c1f8;hp=88aac70495d0d66a48f97e1edf359fd24e377f39;hpb=ff36cdf2ea9f18ad7a00cb2d8091552c765a934f;p=dcpomatic.git

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 88aac7049..633ea1bd6 100644
--- 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,8 +65,8 @@ public:
 	FFmpegContentList selected_ffmpeg ();
 
 	void add_file_clicked ();
-	
-private:	
+
+private:
 	void selection_changed ();
 	void add_folder_clicked ();
 	void remove_clicked ();
@@ -78,6 +79,8 @@ private:
 	void setup ();
 	void setup_sensitivity ();
 
+	void add_files (std::list<boost::filesystem::path>);
+
 	wxPanel* _panel;
 	wxSizer* _sizer;
 	wxNotebook* _notebook;
@@ -95,6 +98,7 @@ private:
 	std::list<ContentSubPanel *> _panels;
 	ContentMenu* _menu;
 	TimelineDialog* _timeline_dialog;
+	wxNotebook* _parent;
 
 	boost::shared_ptr<Film> _film;
 	bool _generally_sensitive;