Merge master.

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

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 5b094e39f0c2c3cf6d67d36eba70a804acf73017..72b00ddeb4867065943d41b7ca41ad1295d632a8 100644 (file)
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -26,8 +26,9 @@ class Timecode : public wxPanel
 public:
        Timecode (wxWindow *);
 
-       void set (Time, int);
-       Time get (int) const;
+       void set (DCPTime, int);
+       DCPTime get (int) const;
+       void clear ();
 
        void set_editable (bool);
 
@@ -40,7 +41,6 @@ private:
        wxSizer* _sizer;
        wxPanel* _editable;
        wxTextCtrl* _hours;
-       wxStaticText* _hours_label;
        wxTextCtrl* _minutes;
        wxTextCtrl* _seconds;
        wxTextCtrl* _frames;