X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=a1336ec900a6434b540ebd210a7c00a6f0bf742c;hb=54d5424caa2ccc2746d67b847898bb18dbcd692c;hp=8ecec3ec76801b6612d1a196a6a9465bde774a91;hpb=bd47b3ee1c76d439fecddcb913270a193f6eab5b;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 8ecec3ec7..a1336ec90 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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
@@ -50,7 +50,7 @@ public:
 	void set_film (boost::shared_ptr<Film>);
 	void set_selection (boost::weak_ptr<Content>);
 
-	boost::signals2::signal<void (std::string)> FileChanged;
+	boost::signals2::signal<void (boost::filesystem::path)> FileChanged;
 
 	/* Stuff for panels */
 	
@@ -62,10 +62,11 @@ public:
 		return _film;
 	}
 
-	boost::shared_ptr<Content> selected_content ();
-	boost::shared_ptr<VideoContent> selected_video_content ();
-	boost::shared_ptr<AudioContent> selected_audio_content ();
-	boost::shared_ptr<SubtitleContent> selected_subtitle_content ();
+	ContentList selected_content ();
+	VideoContentList selected_video_content ();
+	AudioContentList selected_audio_content ();
+	SubtitleContentList selected_subtitle_content ();
+	FFmpegContentList selected_ffmpeg_content ();
 	
 private:
 	void make_dcp_panel ();
@@ -80,6 +81,8 @@ private:
 	void content_add_file_clicked ();
 	void content_add_folder_clicked ();
 	void content_remove_clicked ();
+	void content_earlier_clicked ();
+	void content_later_clicked ();
 	void container_changed ();
 	void dcp_content_type_changed ();
 	void scaler_changed ();
@@ -93,10 +96,12 @@ private:
 	void content_right_click (wxListEvent &);
 	void three_d_changed ();
 	void standard_changed ();
+	void signed_toggled ();
+	void encrypted_toggled ();
 
 	/* Handle changes to the model */
 	void film_changed (Film::Property);
-	void film_content_changed (boost::weak_ptr<Content>, int);
+	void film_content_changed (int);
 
 	void set_general_sensitivity (bool);
 	void setup_dcp_name ();
@@ -105,6 +110,7 @@ private:
 	void setup_content_sensitivity ();
 	
 	void active_jobs_changed (bool);
+	void config_changed ();
 
 	FilmEditorPanel* _video_panel;
 	FilmEditorPanel* _audio_panel;
@@ -143,6 +149,8 @@ private:
 	wxCheckBox* _three_d;
 	wxChoice* _resolution;
 	wxChoice* _standard;
+	wxCheckBox* _signed;
+	wxCheckBox* _encrypted;
 
 	ContentMenu _menu;