Merge branch '1.0' into 1.0-seek

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

diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index b84ea52be644030be6b852958ce3e1899f7d3cf8..7fea45eb5c4982ead55940d3cced32f83a978053 100644 (file)
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -19,23 +19,26 @@
 
 #include "film_editor_panel.h"
 
-class Timecode;
+class DCPTimecode;
 
 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 position_changed ();
-       void length_changed ();
+       void full_length_changed ();
        void trim_start_changed ();
        void trim_end_changed ();
+       void play_length_changed ();
        
-       Timecode* _position;
-       Timecode* _length;
-       Timecode* _trim_start;
-       Timecode* _trim_end;
+       DCPTimecode* _position;
+       DCPTimecode* _full_length;
+       DCPTimecode* _trim_start;
+       DCPTimecode* _trim_end;
+       DCPTimecode* _play_length;
 };