Merge master.

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

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 35153dd175d4c13aa4f510656c3810a2a1bd38fc..8f23f68941e6428a834910ac7dd988d813f6adb5 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -52,7 +52,7 @@ public:
                return 48;
        }
 
-       double pixels_per_second () const {
+       boost::optional<double> pixels_per_second () const {
                return _pixels_per_second;
        }
 
@@ -79,6 +79,7 @@ private:
        void right_down (wxMouseEvent &);
        void mouse_moved (wxMouseEvent &);
        void playlist_changed ();
+       void playlist_content_changed (int);
        void resized ();
        void assign_tracks ();
        void set_position_from_event (wxMouseEvent &);
@@ -96,7 +97,7 @@ private:
        ViewList _views;
        boost::shared_ptr<TimeAxisView> _time_axis_view;
        int _tracks;
-       double _pixels_per_second;
+       boost::optional<double> _pixels_per_second;
        bool _left_down;
        wxPoint _down_point;
        boost::shared_ptr<ContentView> _down_view;
@@ -105,5 +106,6 @@ private:
        ContentMenu _menu;
        bool _snap;
 
-       boost::signals2::scoped_connection _playlist_connection;
+       boost::signals2::scoped_connection _playlist_changed_connection;
+       boost::signals2::scoped_connection _playlist_content_changed_connection;
 };