Draw reels in the timeline.

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

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 82d10afde6cc8a8337c910b8b9506c1461c96585..e8becf906e4ee61c6a26298cc49fd34965a44c9a 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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"
 
 class Film;
-class View;
-class ContentView;
 class ContentPanel;
-class TimeAxisView;
+class TimelineView;
+class TimelineTimeAxisView;
+class TimelineReelsView;
 
 class Timeline : public wxPanel
 {
@@ -78,34 +80,34 @@ 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 ();
 
-       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;
+       boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
+       TimelineContentViewList selected_views () const;
        ContentList selected_content () const;
+       void maybe_snap (DCPTime a, DCPTime b, boost::optional<DCPTime>& nearest_distance) const;
 
        ContentPanel* _content_panel;
        boost::weak_ptr<Film> _film;
-       ViewList _views;
-       boost::shared_ptr<TimeAxisView> _time_axis_view;
+       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;
        wxPoint _down_point;
-       boost::shared_ptr<ContentView> _down_view;
+       boost::shared_ptr<TimelineContentView> _down_view;
        DCPTime _down_view_position;
        bool _first_move;
        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;
 };