X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.h;h=e1a66770c446633fcf72cfda2d9140b26833c26e;hb=02cc8c7680381c123a31c23a43f6b34a04c2115a;hp=8d11e6289f57f2bc912247c3b7be245c584719bc;hpb=c7a0c827d30b7d82ac50e4cf559be2a3606ab6c3;p=dcpomatic.git

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 8d11e6289..e1a66770c 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 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/>.
 
 */
 
@@ -31,6 +32,7 @@ class wxListEvent;
 class TimelineDialog;
 class FilmEditor;
 class ContentSubPanel;
+class AudioPanel;
 class Film;
 class FilmViewer;
 
@@ -59,17 +61,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 ();
+	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 &);
@@ -92,13 +94,14 @@ private:
 	wxButton* _later;
 	wxButton* _timeline;
 	ContentSubPanel* _video_panel;
-	ContentSubPanel* _audio_panel;
+	AudioPanel* _audio_panel;
 	ContentSubPanel* _subtitle_panel;
 	ContentSubPanel* _timing_panel;
 	std::list<ContentSubPanel *> _panels;
 	ContentMenu* _menu;
 	TimelineDialog* _timeline_dialog;
 	wxNotebook* _parent;
+	ContentList _last_selected;
 
 	boost::shared_ptr<Film> _film;
 	FilmViewer* _film_viewer;