Merge master.

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

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index a786e6a096254c480a2ec1187b00b99eb2b4de6a..35153dd175d4c13aa4f510656c3810a2a1bd38fc 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -21,7 +21,9 @@
 #include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <wx/wx.h>
-#include "util.h"
+#include "lib/util.h"
+#include "lib/rect.h"
+#include "content_menu.h"
 
 class Film;
 class View;
@@ -36,7 +38,7 @@ public:
 
        boost::shared_ptr<const Film> film () const;
 
-       void force_redraw (Rect const &);
+       void force_redraw (dcpomatic::Rect<int> const &);
 
        int x_offset () const {
                return 8;
@@ -50,37 +52,58 @@ public:
                return 48;
        }
 
-       double pixels_per_time_unit () const {
-               return _pixels_per_time_unit;
+       double pixels_per_second () const {
+               return _pixels_per_second;
        }
 
-       Position tracks_position () const {
-               return Position (8, 8);
+       Position<int> tracks_position () const {
+               return Position<int> (8, 8);
        }
 
        int tracks () const;
 
+       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 mouse_moved (wxMouseEvent &);
        void left_up (wxMouseEvent &);
+       void right_down (wxMouseEvent &);
+       void mouse_moved (wxMouseEvent &);
        void playlist_changed ();
-       void setup_pixels_per_time_unit ();
-       void resized (wxSizeEvent &);
+       void resized ();
        void assign_tracks ();
+       void set_position_from_event (wxMouseEvent &);
+       void clear_selection ();
+
+       typedef std::vector<boost::shared_ptr<View> > ViewList;
+       typedef std::vector<boost::shared_ptr<ContentView> > ContentViewList;
+
+       boost::shared_ptr<View> event_to_view (wxMouseEvent &);
+       ContentViewList selected_views () const;
+       ContentList selected_content () const;
 
        FilmEditor* _film_editor;
        boost::weak_ptr<Film> _film;
-       std::list<boost::shared_ptr<View> > _views;
+       ViewList _views;
        boost::shared_ptr<TimeAxisView> _time_axis_view;
        int _tracks;
-       double _pixels_per_time_unit;
+       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;
+       ContentMenu _menu;
+       bool _snap;
 
        boost::signals2::scoped_connection _playlist_connection;
 };