std::shared_ptr

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

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index ef887dab8242878563dde77e08dd4a53d32d4caf..b532e74e3730989bb78124cc7a8cacf9e997dd86 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -24,8 +24,6 @@
 #include "lib/rect.h"
 #include "lib/film.h"
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
 
 class Film;
@@ -39,9 +37,9 @@ class FilmViewer;
 class Timeline : public wxPanel
 {
 public:
-       Timeline (wxWindow *, ContentPanel *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
+       Timeline (wxWindow *, ContentPanel *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
 
-       boost::shared_ptr<const Film> film () const;
+       std::shared_ptr<const Film> film () const;
 
        void force_redraw (dcpomatic::Rect<int> const &);
 
@@ -104,9 +102,9 @@ private:
        void set_pixels_per_second (double pps);
        void set_pixels_per_track (int h);
        void zoom_all ();
-       void position_change ();
+       void update_playhead ();
 
-       boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
+       std::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
        TimelineContentViewList selected_views () const;
        ContentList selected_content () const;
        void maybe_snap (dcpomatic::DCPTime a, dcpomatic::DCPTime b, boost::optional<dcpomatic::DCPTime>& nearest_distance) const;
@@ -114,18 +112,18 @@ private:
        wxScrolledCanvas* _labels_canvas;
        wxScrolledCanvas* _main_canvas;
        ContentPanel* _content_panel;
-       boost::weak_ptr<Film> _film;
-       boost::weak_ptr<FilmViewer> _viewer;
+       std::weak_ptr<Film> _film;
+       std::weak_ptr<FilmViewer> _viewer;
        TimelineViewList _views;
-       boost::shared_ptr<TimelineTimeAxisView> _time_axis_view;
-       boost::shared_ptr<TimelineReelsView> _reels_view;
-       boost::shared_ptr<TimelineLabelsView> _labels_view;
+       std::shared_ptr<TimelineTimeAxisView> _time_axis_view;
+       std::shared_ptr<TimelineReelsView> _reels_view;
+       std::shared_ptr<TimelineLabelsView> _labels_view;
        int _tracks;
        boost::optional<double> _pixels_per_second;
        bool _left_down;
        wxPoint _down_point;
        boost::optional<wxPoint> _zoom_point;
-       boost::shared_ptr<TimelineContentView> _down_view;
+       std::shared_ptr<TimelineContentView> _down_view;
        dcpomatic::DCPTime _down_view_position;
        bool _first_move;
        ContentMenu _menu;
@@ -137,11 +135,11 @@ private:
        int _y_scroll_rate;
        int _pixels_per_track;
        bool _first_resize;
+       wxTimer _timer;
 
        static double const _minimum_pixels_per_second;
        static int const _minimum_pixels_per_track;
 
        boost::signals2::scoped_connection _film_changed_connection;
        boost::signals2::scoped_connection _film_content_change_connection;
-       boost::signals2::scoped_connection _viewer_position_change_connection;
 };