Split out Timeline from ContentTimeline.

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

diff --git a/src/wx/content_timeline.cc b/src/wx/content_timeline.cc
index 368cbcca485dedfe8b8de6a383c9ba1773903464..d5ed0f7bb3ecd37effd7bc19b2f90e8e749f6bfd 100644 (file)
--- a/src/wx/content_timeline.cc
+++ b/src/wx/content_timeline.cc
@@ -63,13 +63,11 @@ using namespace boost::placeholders;
 #endif
 
 
-/* 3 hours in 640 pixels */
-double const ContentTimeline::_minimum_pixels_per_second = 640.0 / (60 * 60 * 3);
 int const ContentTimeline::_minimum_pixels_per_track = 16;
 
 
 ContentTimeline::ContentTimeline(wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film, FilmViewer& viewer)
-       : wxPanel (parent, wxID_ANY)
+       : Timeline(parent)
        , _labels_canvas (new wxScrolledCanvas (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE))
        , _main_canvas (new wxScrolledCanvas (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE))
        , _content_panel (cp)
@@ -184,13 +182,6 @@ ContentTimeline::update_playhead()
 }
 
 
-void
-ContentTimeline::set_pixels_per_second(double pps)
-{
-       _pixels_per_second = max (_minimum_pixels_per_second, pps);
-}
-
-
 void
 ContentTimeline::paint_labels()
 {