Move y_pos to TimelineView.

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

diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 79c87f7e000532ce55849bb248cba69a0294efaa..5d039d0d3f0a2e82d252da234f63519b8eb4864e 100644 (file)
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -23,10 +23,10 @@
 #include "timeline_content_view.h"
 #include "wx_util.h"
 #include "lib/content.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::list;
@@ -171,13 +171,6 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>>
 }
 
 
-int
-TimelineContentView::y_pos (int t) const
-{
-       return t * _timeline.pixels_per_track() + _timeline.tracks_y_offset();
-}
-
-
 void
 TimelineContentView::content_change (ChangeType type, int p)
 {