X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_view.cc;h=10d6dc5beb9d1e4f4d9cf9e1d584ca5c629ce7e5;hb=736d6bf3242a0ba3841cb765e97cf9fee3540460;hp=e8b3856adb45f8e3d22858cda9616e43fa178065;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/wx/timeline_view.cc b/src/wx/timeline_view.cc index e8b3856ad..10d6dc5be 100644 --- a/src/wx/timeline_view.cc +++ b/src/wx/timeline_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,10 +18,14 @@ */ + #include "timeline_view.h" #include "timeline.h" + using std::list; +using namespace dcpomatic; + /** @class TimelineView * @brief Parent class for components of the timeline (e.g. a piece of content or an axis). @@ -32,22 +36,25 @@ TimelineView::TimelineView (Timeline& t) } + void -TimelineView::paint (wxGraphicsContext* g, list > overlaps) +TimelineView::paint (wxGraphicsContext* g, list> overlaps) { _last_paint_bbox = bbox (); do_paint (g, overlaps); } + void TimelineView::force_redraw () { - _timeline.force_redraw (_last_paint_bbox.extended (4)); - _timeline.force_redraw (bbox().extended (4)); + _timeline.force_redraw (_last_paint_bbox.extended(4)); + _timeline.force_redraw (bbox().extended(4)); } + int TimelineView::time_x (DCPTime t) const { - return _timeline.tracks_position().x + t.seconds() * _timeline.pixels_per_second().get_value_or (0); + return t.seconds() * _timeline.pixels_per_second().get_value_or(0); }