X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.h;h=452d4a4f853c259584d5c53b4930fe9cfdbc61e1;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=1f64d51c63bd8bf86332f9574b32efb54e0c60af;hpb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;p=dcpomatic.git

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 1f64d51c6..452d4a4f8 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>);
 
@@ -63,10 +64,10 @@ public:
 	SubtitleContentList selected_subtitle ();
 	FFmpegContentList selected_ffmpeg ();
 
-private:	
-	void sequence_video_changed ();
-	void selection_changed ();
 	void add_file_clicked ();
+
+private:
+	void selection_changed ();
 	void add_folder_clicked ();
 	void remove_clicked ();
 	void earlier_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;
@@ -88,7 +91,6 @@ private:
 	wxButton* _earlier;
 	wxButton* _later;
 	wxButton* _timeline;
-	wxCheckBox* _sequence_video;
 	ContentSubPanel* _video_panel;
 	ContentSubPanel* _audio_panel;
 	ContentSubPanel* _subtitle_panel;