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 f9cd482d678ccae640eba9f5927689ea46978d25..b84ea52be644030be6b852958ce3e1899f7d3cf8 100644 (file)
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -26,16 +26,16 @@ class TimingPanel : public FilmEditorPanel
 public:
        TimingPanel (FilmEditor *);
 
-       void film_content_changed (
-               boost::shared_ptr<Content>,
-               boost::shared_ptr<SubtitleContent>,
-               boost::shared_ptr<FFmpegContent>,
-               int);
+       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;
 };