Merge master.

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

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 48eaa9d762250bbde17d12797f6b4147f679c9f2..4ba1cc425f022b6fe11d634052f7915a5c012ee8 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -23,6 +23,7 @@
 #include <wx/wx.h>
 #include "lib/util.h"
 #include "lib/rect.h"
+#include "content_menu.h"
 
 class Film;
 class View;
@@ -51,8 +52,8 @@ public:
                return 48;
        }
 
-       double pixels_per_time_unit () const {
-               return _pixels_per_time_unit;
+       boost::optional<double> pixels_per_second () const {
+               return _pixels_per_second;
        }
 
        Position<int> tracks_position () const {
@@ -61,23 +62,28 @@ public:
 
        int tracks () const;
 
-       void setup_pixels_per_time_unit ();
+       void setup_pixels_per_second ();
+
+       void set_snap (bool s) {
+               _snap = s;
+       }
+
+       bool snap () const {
+               return _snap;
+       }
 
 private:
-       void paint (wxPaintEvent &);
+       void paint ();
        void left_down (wxMouseEvent &);
        void left_up (wxMouseEvent &);
        void right_down (wxMouseEvent &);
        void mouse_moved (wxMouseEvent &);
        void playlist_changed ();
-       void resized (wxSizeEvent &);
+       void resized ();
        void assign_tracks ();
-       void set_start_from_event (wxMouseEvent &);
+       void set_position_from_event (wxMouseEvent &);
        void clear_selection ();
 
-       void repeat (wxCommandEvent &);
-       void remove (wxCommandEvent &);
-
        typedef std::vector<boost::shared_ptr<View> > ViewList;
        typedef std::vector<boost::shared_ptr<ContentView> > ContentViewList;
 
@@ -90,13 +96,14 @@ private:
        ViewList _views;
        boost::shared_ptr<TimeAxisView> _time_axis_view;
        int _tracks;
-       double _pixels_per_time_unit;
+       boost::optional<double> _pixels_per_second;
        bool _left_down;
        wxPoint _down_point;
        boost::shared_ptr<ContentView> _down_view;
-       Time _down_view_start;
+       DCPTime _down_view_position;
        bool _first_move;
-       wxMenu* _menu;
+       ContentMenu _menu;
+       bool _snap;
 
        boost::signals2::scoped_connection _playlist_connection;
 };