Fix incorrect preview of italic subtitles (#728).

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

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 66f982c4ae279b3b6767f4ca33d81e2e0324bae9..e8becf906e4ee61c6a26298cc49fd34965a44c9a 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -17,19 +17,21 @@
 
 */
 
+#include "content_menu.h"
+#include "timeline_content_view.h"
+#include "lib/util.h"
+#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>
-#include <wx/wx.h>
-#include "lib/util.h"
-#include "lib/rect.h"
-#include "content_menu.h"
-#include "timeline_content_view.h"
 
 class Film;
 class ContentPanel;
 class TimelineView;
 class TimelineTimeAxisView;
+class TimelineReelsView;
 
 class Timeline : public wxPanel
 {
@@ -78,12 +80,13 @@ private:
        void left_up (wxMouseEvent &);
        void right_down (wxMouseEvent &);
        void mouse_moved (wxMouseEvent &);
-       void playlist_changed ();
-       void playlist_content_changed (int);
+       void film_changed (Film::Property);
+       void film_content_changed (int);
        void resized ();
        void assign_tracks ();
        void set_position_from_event (wxMouseEvent &);
        void clear_selection ();
+       void recreate_views ();
 
        boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
        TimelineContentViewList selected_views () const;
@@ -94,6 +97,7 @@ private:
        boost::weak_ptr<Film> _film;
        TimelineViewList _views;
        boost::shared_ptr<TimelineTimeAxisView> _time_axis_view;
+       boost::shared_ptr<TimelineReelsView> _reels_view;
        int _tracks;
        boost::optional<double> _pixels_per_second;
        bool _left_down;
@@ -104,6 +108,6 @@ private:
        ContentMenu _menu;
        bool _snap;
 
-       boost::signals2::scoped_connection _playlist_changed_connection;
-       boost::signals2::scoped_connection _playlist_content_changed_connection;
+       boost::signals2::scoped_connection _film_changed_connection;
+       boost::signals2::scoped_connection _film_content_changed_connection;
 };