summaryrefslogtreecommitdiff
path: root/src/wx/content_timeline.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-12-13 23:03:01 +0100
committerCarl Hetherington <cth@carlh.net>2024-03-12 00:43:51 +0100
commitf81655002b1ef1427e2845dc5d354da6020bfafb (patch)
tree4dc3fff301f9475449ebc2b467e315ee60ad738d /src/wx/content_timeline.cc
parent1910147fd58ac58a21b8f3b874495179aa5424ab (diff)
Split out Timeline from ContentTimeline.
Diffstat (limited to 'src/wx/content_timeline.cc')
-rw-r--r--src/wx/content_timeline.cc11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/wx/content_timeline.cc b/src/wx/content_timeline.cc
index 368cbcca4..d5ed0f7bb 100644
--- 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)
@@ -185,13 +183,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()
{
wxPaintDC dc (_labels_canvas);