Merge master.

[dcpomatic.git] / src / wx / film_editor.h

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index dadb583ae07b028f1c8324b1a0f30db6513c426e..56e54734b7dcac54e0a3ebad1317be4f6febdf13 100644 (file)
--- 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;
 
@@ -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;
@@ -142,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;
@@ -156,5 +161,5 @@ private:
        std::vector<Ratio const *> _ratios;
 
        bool _generally_sensitive;
-       DCPTimelineDialog* _timeline_dialog;
+       TimelineDialog* _timeline_dialog;
 };