Change video content scaling so that it either:

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

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 84cb870f24209f6d055d84a490ac9848d2c5b096..44a8973716bdd3dca7f3df7fe761f5fd1a019f40 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -34,11 +34,12 @@ class TimelineView;
 class TimelineTimeAxisView;
 class TimelineReelsView;
 class TimelineLabelsView;
+class FilmViewer;
 
 class Timeline : public wxPanel
 {
 public:
-       Timeline (wxWindow *, ContentPanel *, boost::shared_ptr<Film>);
+       Timeline (wxWindow *, ContentPanel *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
 
        boost::shared_ptr<const Film> film () const;
 
@@ -103,6 +104,7 @@ private:
        void set_pixels_per_second (double pps);
        void set_pixels_per_track (int h);
        void zoom_all ();
+       void update_playhead ();
 
        boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
        TimelineContentViewList selected_views () const;
@@ -113,6 +115,7 @@ private:
        wxScrolledCanvas* _main_canvas;
        ContentPanel* _content_panel;
        boost::weak_ptr<Film> _film;
+       boost::weak_ptr<FilmViewer> _viewer;
        TimelineViewList _views;
        boost::shared_ptr<TimelineTimeAxisView> _time_axis_view;
        boost::shared_ptr<TimelineReelsView> _reels_view;
@@ -134,6 +137,7 @@ private:
        int _y_scroll_rate;
        int _pixels_per_track;
        bool _first_resize;
+       wxTimer _timer;
 
        static double const _minimum_pixels_per_second;
        static int const _minimum_pixels_per_track;