ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

triggerbox: we no longer need to store Triggerbox::estimated_tempo in the snapshot file

Browse Source 
* estimated tempo is cached in the SegmentDescriptor
* storing it in the Source's SD allows us to skip minibpm if we find a tempo there
This commit is contained in:
Ben Loftis 2022-02-26 08:45:14 -06:00
parent 00db64a4ed
commit be5a56fae3
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/triggerbox.cc
View File

@ -539,7 +539,7 @@ Trigger::get_state (void)
} }
node->set_property (X_("index"), _index); node->set_property (X_("index"), _index);
node->set_property (X_("estimated-tempo"), _estimated_tempo);
node->set_property (X_("segment-tempo"), _segment_tempo); node->set_property (X_("segment-tempo"), _segment_tempo);
if (_region) { if (_region) {
@ -563,13 +563,11 @@ Trigger::set_state (const XMLNode& node, int version)
boost::shared_ptr<Region> r = RegionFactory::region_by_id (rid); boost::shared_ptr<Region> r = RegionFactory::region_by_id (rid);
if (r) { if (r) {
set_region (r, false); //TODO: this results in a call to estimate_tempo() which should be avoided if bpm is already known set_region (r, false); //this results in a call to estimate_tempo()
} }
node.get_property (X_("estimated-tempo"), _estimated_tempo); //TODO: for now: if we know the bpm, overwrite the value that estimate_tempo() found
double tempo; double tempo;
node.get_property (X_("segment-tempo"), tempo); node.get_property (X_("segment-tempo"), tempo); //this is the user-selected tempo which overrides estimated_tempo
set_segment_tempo(tempo); set_segment_tempo(tempo);
node.get_property (X_("index"), _index); node.get_property (X_("index"), _index);