X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ffilm_editor.h;h=56e54734b7dcac54e0a3ebad1317be4f6febdf13;hb=308488324dbc4d8b709d3fb1dc9fee0479346c21;hp=06a65dd9f661e2716adee8ab16d7acb7de28dc27;hpb=6b35b4764ac5446c845a1dde9a01e0401862d835;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 06a65dd9f..56e54734b 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 ();
@@ -86,7 +87,8 @@ private:
 	void dcp_content_type_changed ();
 	void scaler_changed ();
 	void j2k_bandwidth_changed ();
-	void frame_rate_changed ();
+	void frame_rate_choice_changed ();
+	void frame_rate_spin_changed ();
 	void best_frame_rate_clicked ();
 	void content_timeline_clicked ();
 	void audio_channels_changed ();
@@ -95,19 +97,22 @@ 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 ();
 	void setup_content ();
 	void setup_container ();
 	void setup_content_sensitivity ();
+	void setup_frame_rate_widget ();
 	
 	void active_jobs_changed (bool);
+	void config_changed ();
 
 	FilmEditorPanel* _video_panel;
 	FilmEditorPanel* _audio_panel;
@@ -140,12 +145,15 @@ private:
 	wxChoice* _scaler;
  	wxSpinCtrl* _j2k_bandwidth;
 	wxChoice* _dcp_content_type;
-	wxChoice* _frame_rate;
+	wxChoice* _frame_rate_choice;
+	wxSpinCtrl* _frame_rate_spin;
+	wxSizer* _frame_rate_sizer;
 	wxSpinCtrl* _audio_channels;
 	wxButton* _best_frame_rate;
 	wxCheckBox* _three_d;
 	wxChoice* _resolution;
 	wxChoice* _standard;
+	wxCheckBox* _signed;
 	wxCheckBox* _encrypted;
 
 	ContentMenu _menu;