Rename Timeline -> ContentTimeline.

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

diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h
index 48ca6ed79e49a94731f6887bdb52f9a121511622..ac84214f04d24795b36f6cadc9f9911aaaee3891 100644 (file)
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -25,7 +25,6 @@
 
 #include "timeline_view.h"
 #include "lib/change_signaller.h"
-#include "lib/types.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
@@ -41,7 +40,7 @@ class Content;
 class TimelineContentView : public TimelineView
 {
 public:
-       TimelineContentView (Timeline& tl, std::shared_ptr<Content> c);
+       TimelineContentView(ContentTimeline& tl, std::shared_ptr<Content> c);
 
        dcpomatic::Rect<int> bbox () const override;
 
@@ -64,7 +63,6 @@ protected:
 private:
 
        void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>> overlaps) override;
-       int y_pos (int t) const;
        void content_change (ChangeType type, int p);
 
        boost::optional<int> _track;