Merge 1.0 in.

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

diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index b5c9ef026b5130581428cc596d91d5a77ef92e10..b84ea52be644030be6b852958ce3e1899f7d3cf8 100644 (file)
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -29,9 +29,13 @@ public:
        void film_content_changed (boost::shared_ptr<Content>, int);
        
 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;
 };