X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ffilm_editor.h;h=96cae3900d66d1b9aea29a4043e285f28dc81f2a;hb=4616b19fb5241a54c9d57f7a91bb975f41aed14b;hp=dadb583ae07b028f1c8324b1a0f30db6513c426e;hpb=1629bd7df2150156109afbc7a16677cb29e82adf;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index dadb583ae..96cae3900 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
@@ -33,9 +33,9 @@ class wxNotebook;
 class wxListCtrl;
 class wxListEvent;
 class Film;
-class DCPTimelineDialog;
+class TimelineDialog;
 class Ratio;
-class DCPTimecode;
+class Timecode;
 class FilmEditorPanel;
 class SubtitleContent;
 
@@ -75,8 +75,8 @@ private:
 	
 	/* Handle changes to the view */
 	void name_changed ();
-	void use_dci_name_toggled ();
-	void edit_dci_button_clicked ();
+	void use_isdcf_name_toggled ();
+	void edit_isdcf_button_clicked ();
 	void content_selection_changed ();
 	void content_add_file_clicked ();
 	void content_add_folder_clicked ();
@@ -87,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 ();
@@ -108,8 +109,10 @@ private:
 	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;
@@ -128,7 +131,7 @@ private:
 	boost::shared_ptr<Film> _film;
 	wxTextCtrl* _name;
 	wxStaticText* _dcp_name;
-	wxCheckBox* _use_dci_name;
+	wxCheckBox* _use_isdcf_name;
 	wxChoice* _container;
 	wxListCtrl* _content;
 	wxButton* _content_add_file;
@@ -138,11 +141,13 @@ private:
 	wxButton* _content_later;
 	wxButton* _content_timeline;
 	wxCheckBox* _sequence_video;
-	wxButton* _edit_dci_button;
+	wxButton* _edit_isdcf_button;
 	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;
@@ -156,5 +161,5 @@ private:
 	std::vector<Ratio const *> _ratios;
 
 	bool _generally_sensitive;
-	DCPTimelineDialog* _timeline_dialog;
+	TimelineDialog* _timeline_dialog;
 };