Merge branch '1.0' into 1.0-multiple-selection

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

diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index b5c9ef026b5130581428cc596d91d5a77ef92e10..8c519bcbe77b9520b7a152e12ac7f2278a32df96 100644 (file)
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -26,12 +26,17 @@ 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 position_changed ();
        void length_changed ();
+       void trim_start_changed ();
+       void trim_end_changed ();
        
-       Timecode* _start;
+       Timecode* _position;
        Timecode* _length;
+       Timecode* _trim_start;
+       Timecode* _trim_end;
 };