Move y_pos to TimelineView.

[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 7087e9641b62cd7073792cfa97441ff89b0fabd8..aa9832e5db14453accce3c2ae88fa17587d261e8 100644 (file)
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -23,13 +23,13 @@
 #define DCPOMATIC_TIMELINE_CONTENT_VIEW_H
 
 
+#include "timeline_view.h"
 #include "lib/change_signaller.h"
 #include "lib/types.h"
-#include "lib/warnings.h"
-#include "timeline_view.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class Content;
@@ -64,7 +64,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;