summaryrefslogtreecommitdiff
path: root/src/wx/film_editor.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-05-12 23:29:21 +0100
committerCarl Hetherington <cth@carlh.net>2014-05-12 23:29:21 +0100
commit93facb40ea1d2bf88053230afdc80af2737d7b99 (patch)
tree9dec85dd42776e859ce3a0830011a82c155a3260 /src/wx/film_editor.h
parent1a944e0bd39abf49bbe863b23c3b4b84eb7459fc (diff)
Add option to use any DCP frame rate, rather than just the
"allowed" set. Requested-by: Noah Orozco
Diffstat (limited to 'src/wx/film_editor.h')
-rw-r--r--src/wx/film_editor.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index a1336ec90..56e54734b 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -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,6 +109,7 @@ private:
void setup_content ();
void setup_container ();
void setup_content_sensitivity ();
+ void setup_frame_rate_widget ();
void active_jobs_changed (bool);
void config_changed ();
@@ -143,7 +145,9 @@ 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;