From c9035efb2545a70fafd9ff05f6e1f95eb9384348 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 26 Sep 2020 09:14:01 -0600 Subject: [PATCH] timeline types for libs/waveview --- libs/waveview/wave_view.cc | 6 +++--- libs/waveview/wave_view_private.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/waveview/wave_view.cc b/libs/waveview/wave_view.cc index 1f20c3689e..b99fcdab07 100644 --- a/libs/waveview/wave_view.cc +++ b/libs/waveview/wave_view.cc @@ -1346,7 +1346,7 @@ WaveView::clear_cache () samplecnt_t WaveView::region_length() const { - return _region->length() - (_props->region_start - _region->start()); + return _region->length_samples() - (_props->region_start - _region->start_sample()); } samplepos_t @@ -1383,8 +1383,8 @@ WaveView::region_resized () } begin_change (); - _props->region_start = _region->start(); - _props->region_end = _region->start() + _region->length(); + _props->region_start = _region->start_sample(); + _props->region_end = _region->start_sample() + _region->length_samples(); _bounding_box_dirty = true; end_change (); } diff --git a/libs/waveview/wave_view_private.cc b/libs/waveview/wave_view_private.cc index e02f10e944..0c49b2ca93 100644 --- a/libs/waveview/wave_view_private.cc +++ b/libs/waveview/wave_view_private.cc @@ -31,8 +31,8 @@ namespace ArdourWaveView { WaveViewProperties::WaveViewProperties (boost::shared_ptr region) - : region_start (region->start ()) - , region_end (region->start () + region->length ()) + : region_start (region->start_sample ()) + , region_end (region->start_sample () + region->length_samples ()) , channel (0) , height (64) , samples_per_pixel (0)