X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.h;h=475567d28e46e5ada0940e429fc34b1814d4d3eb;hb=15a5f157f7867a05211ce494d9d86b9c47fdf72b;hp=9e6cf9f24b24a714c85b94a1e705d4942f3a1438;hpb=694d242518613145fd115d26ea19c383c710dc45;p=dcpomatic.git

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 9e6cf9f24..475567d28 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -1,19 +1,20 @@
 /*
     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;
 
@@ -46,6 +48,7 @@ public:
 	void set_film (boost::shared_ptr<Film>);
 	void set_general_sensitivity (bool s);
 	void set_selection (boost::weak_ptr<Content>);
+	void set_selection (ContentList cl);
 
 	void film_changed (Film::Property p);
 	void film_content_changed (int p);
@@ -59,17 +62,20 @@ 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);
 
+	boost::signals2::signal<void (void)> SelectionChanged;
+
 private:
 	void selection_changed ();
 	void add_folder_clicked ();
+	void add_dcp_clicked ();
 	void earlier_clicked ();
 	void later_clicked ();
 	void right_click (wxListEvent &);
@@ -87,12 +93,13 @@ private:
 	wxListCtrl* _content;
 	wxButton* _add_file;
 	wxButton* _add_folder;
+	wxButton* _add_dcp;
 	wxButton* _remove;
 	wxButton* _earlier;
 	wxButton* _later;
 	wxButton* _timeline;
 	ContentSubPanel* _video_panel;
-	ContentSubPanel* _audio_panel;
+	AudioPanel* _audio_panel;
 	ContentSubPanel* _subtitle_panel;
 	ContentSubPanel* _timing_panel;
 	std::list<ContentSubPanel *> _panels;