X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.h;h=caaa2decc22ae6aab6fd9532bcc77257f1c7cbc4;hb=65b331d32c383f3a9049f29bf03ab3fe3193b31a;hp=1f64d51c63bd8bf86332f9574b32efb54e0c60af;hpb=22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5;p=dcpomatic.git

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 1f64d51c6..caaa2decc 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-2016 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>);
 
@@ -58,17 +59,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 ();
 
-private:	
-	void sequence_video_changed ();
-	void selection_changed ();
 	void add_file_clicked ();
+	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 +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;
@@ -96,7 +98,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;
 };