More player debugging for butler video-full states.

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

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 7af770b5faecde87e39040f4f67e37a99d63562c..89fd941790b5265ea5d0ad5a2bc605c586488c3f 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -46,8 +46,8 @@ public:
 
        int width () const;
 
-       int track_height () const {
-               return _track_height;
+       int pixels_per_track () const {
+               return _pixels_per_track;
        }
 
        boost::optional<double> pixels_per_second () const {
@@ -68,12 +68,13 @@ public:
 
        enum Tool {
                SELECT,
-               ZOOM
+               ZOOM,
+               ZOOM_ALL,
+               SNAP,
+               SEQUENCE
        };
 
-       void set_tool (Tool t) {
-               _tool = t;
-       }
+       void tool_clicked (Tool t);
 
        int tracks_y_offset () const;
 
@@ -90,8 +91,8 @@ private:
        void mouse_moved (wxMouseEvent &);
        void mouse_moved_select (wxMouseEvent &);
        void mouse_moved_zoom (wxMouseEvent &);
-       void film_changed (Film::Property);
-       void film_content_changed (int, bool frequent);
+       void film_change (ChangeType type, Film::Property);
+       void film_content_change (ChangeType type, int, bool frequent);
        void resized ();
        void assign_tracks ();
        void set_position_from_event (wxMouseEvent &);
@@ -99,6 +100,9 @@ private:
        void recreate_views ();
        void setup_scrollbars ();
        void scrolled (wxScrollWinEvent& ev);
+       void set_pixels_per_second (double pps);
+       void set_pixels_per_track (int h);
+       void zoom_all ();
 
        boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
        TimelineContentViewList selected_views () const;
@@ -128,11 +132,12 @@ private:
        Tool _tool;
        int _x_scroll_rate;
        int _y_scroll_rate;
-       int _track_height;
+       int _pixels_per_track;
+       bool _first_resize;
 
        static double const _minimum_pixels_per_second;
-       static int const _minimum_track_height;
+       static int const _minimum_pixels_per_track;
 
        boost::signals2::scoped_connection _film_changed_connection;
-       boost::signals2::scoped_connection _film_content_changed_connection;
+       boost::signals2::scoped_connection _film_content_change_connection;
 };