Merge branch 'master' into prefs

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

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index db33dbbdc70e161003eaf9df40ebbaf46c64eefa..ef1d10797c6e75d114c9d55d7b5d97ff40777279 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -64,6 +64,14 @@ public:
 
        void setup_pixels_per_time_unit ();
 
+       void set_snap (bool s) {
+               _snap = s;
+       }
+
+       bool snap () const {
+               return _snap;
+       }
+
 private:
        void paint ();
        void left_down (wxMouseEvent &);
@@ -73,7 +81,7 @@ private:
        void playlist_changed ();
        void resized ();
        void assign_tracks ();
-       void set_start_from_event (wxMouseEvent &);
+       void set_position_from_event (wxMouseEvent &);
        void clear_selection ();
 
        typedef std::vector<boost::shared_ptr<View> > ViewList;
@@ -92,9 +100,10 @@ private:
        bool _left_down;
        wxPoint _down_point;
        boost::shared_ptr<ContentView> _down_view;
-       Time _down_view_start;
+       Time _down_view_position;
        bool _first_move;
        ContentMenu _menu;
+       bool _snap;
 
        boost::signals2::scoped_connection _playlist_connection;
 };