Merge branch 'prefs' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic into prefs

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

diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index b5c9ef026b5130581428cc596d91d5a77ef92e10..d9696a20135671a711fe27a14bc2bd5565df237a 100644 (file)
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -26,12 +26,23 @@ class TimingPanel : public FilmEditorPanel
 public:
        TimingPanel (FilmEditor *);
 
-       void film_content_changed (boost::shared_ptr<Content>, int);
+       void film_content_changed (int);
+       void content_selection_changed ();
        
 private:
-       void start_changed ();
-       void length_changed ();
+       void position_changed ();
+       void full_length_changed ();
+       void trim_start_changed ();
+       void trim_end_changed ();
+       void play_length_changed ();
+       void video_frame_rate_changed ();
+       void set_video_frame_rate ();
        
-       Timecode* _start;
-       Timecode* _length;
+       Timecode* _position;
+       Timecode* _full_length;
+       Timecode* _trim_start;
+       Timecode* _trim_end;
+       Timecode* _play_length;
+       wxTextCtrl* _video_frame_rate;
+       wxButton* _set_video_frame_rate;
 };