Merge master.

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

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 9b6fe66542e9fec1c1bc8d15d26ccd1c7133fbc6..b13e8c3c084b9c35514e805f59e752927fe46ae1 100644 (file)
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -26,18 +26,24 @@ class Timecode : public wxPanel
 public:
        Timecode (wxWindow *);
 
-       void set (Time, int);
-       Time get (int) const;
+       void set (DCPTime, int);
+       DCPTime get (int) const;
+
+       void set_editable (bool);
 
        boost::signals2::signal<void ()> Changed;
 
 private:
-       void changed (wxCommandEvent &);
+       void changed ();
+       void set_clicked ();
        
+       wxSizer* _sizer;
+       wxPanel* _editable;
        wxTextCtrl* _hours;
        wxTextCtrl* _minutes;
        wxTextCtrl* _seconds;
        wxTextCtrl* _frames;
-
-       bool _in_set;
+       wxButton* _set_button;
+       wxStaticText* _fixed;
 };
+