Move video frame rate ('prepared-for') into Content.

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

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index e8ae2120f7ad392f4def9eda9b6fb759df9f1484..519f00afbd1abb9a6efe26dfa7efab5d67e4240c 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -32,6 +32,7 @@ class ContentPanel;
 class TimelineView;
 class TimelineTimeAxisView;
 class TimelineReelsView;
+class TimelineLabelsView;
 
 class Timeline : public wxPanel
 {
@@ -42,10 +43,6 @@ public:
 
        void force_redraw (dcpomatic::Rect<int> const &);
 
-       int x_offset () const {
-               return 8;
-       }
-
        int width () const {
                return GetSize().GetWidth ();
        }
@@ -59,7 +56,7 @@ public:
        }
 
        Position<int> tracks_position () const {
-               return Position<int> (8, 8);
+               return _tracks_position;
        }
 
        int tracks () const;
@@ -83,7 +80,7 @@ private:
        void right_down (wxMouseEvent &);
        void mouse_moved (wxMouseEvent &);
        void film_changed (Film::Property);
-       void film_content_changed (int);
+       void film_content_changed (int, bool frequent);
        void resized ();
        void assign_tracks ();
        void set_position_from_event (wxMouseEvent &);
@@ -100,6 +97,7 @@ private:
        TimelineViewList _views;
        boost::shared_ptr<TimelineTimeAxisView> _time_axis_view;
        boost::shared_ptr<TimelineReelsView> _reels_view;
+       boost::shared_ptr<TimelineLabelsView> _labels_view;
        int _tracks;
        boost::optional<double> _pixels_per_second;
        bool _left_down;
@@ -109,6 +107,9 @@ private:
        bool _first_move;
        ContentMenu _menu;
        bool _snap;
+       std::list<DCPTime> _start_snaps;
+       std::list<DCPTime> _end_snaps;
+       Position<int> _tracks_position;
 
        boost::signals2::scoped_connection _film_changed_connection;
        boost::signals2::scoped_connection _film_content_changed_connection;