Rename Timeline -> ContentTimeline.

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

diff --git a/src/wx/timeline_time_axis_view.cc b/src/wx/timeline_time_axis_view.cc
index 3b1b3cd9945fa94e25a3c6ffb3862f89698d1f9f..b17b274b2af5540acf6da2dee824d3bdc97e75d0 100644 (file)
--- a/src/wx/timeline_time_axis_view.cc
+++ b/src/wx/timeline_time_axis_view.cc
@@ -19,7 +19,7 @@
 */
 
 
-#include "timeline.h"
+#include "content_timeline.h"
 #include "timeline_time_axis_view.h"
 #include "wx_util.h"
 #include <dcp/warnings.h>
@@ -34,7 +34,7 @@ using std::list;
 using namespace dcpomatic;
 
 
-TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
+TimelineTimeAxisView::TimelineTimeAxisView(ContentTimeline& tl, int y)
        : TimelineView (tl)
        , _y (y)
 {
@@ -45,7 +45,7 @@ TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
 dcpomatic::Rect<int>
 TimelineTimeAxisView::bbox () const
 {
-       return dcpomatic::Rect<int> (0, _y - 4, _timeline.width(), 24);
+       return dcpomatic::Rect<int>(0, y_pos(_y), _timeline.width(), 48);
 }