Fix warning cause by previous libdcp bump.

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

diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index 1702d93a908500a03a98d87061362566c5f75a35..0757b3f17316fbca64b58f4bdbec023710e0f823 100644 (file)
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -27,12 +27,12 @@ class FilmViewer;
 class TimingPanel : public ContentSubPanel
 {
 public:
-       TimingPanel (ContentPanel *, std::weak_ptr<FilmViewer> viewer);
+       TimingPanel(ContentPanel *, FilmViewer& viewer);
 
        void create () override;
-       void film_changed (Film::Property);
-       void film_content_changed (int);
-       void content_selection_changed ();
+       void film_changed(FilmProperty) override;
+       void film_content_changed (int) override;
+       void content_selection_changed () override;
 
 private:
        void position_changed ();
@@ -46,14 +46,11 @@ private:
        void update_full_length ();
        void update_play_length ();
        void setup_sensitivity ();
-       void add_to_grid ();
+       void add_to_grid () override;
 
-       std::weak_ptr<FilmViewer> _viewer;
+       FilmViewer& _viewer;
 
-       wxStaticText* _h_label;
-       wxStaticText* _m_label;
-       wxStaticText* _s_label;
-       wxStaticText* _f_label;
+       std::vector<wxStaticText*> _label;
        wxStaticText* _colon[3];
        wxStaticText* _position_label;
        Timecode<dcpomatic::DCPTime>* _position;