diff options
author | nick_m <mainsbridge@gmail.com> | 2016-10-10 03:39:57 +1100 |
---|---|---|
committer | nick_m <mainsbridge@gmail.com> | 2016-10-10 03:39:57 +1100 |
commit | 4faf44588f806eac46b5c7ae5cc8058fc47da3f1 (patch) | |
tree | 5a54dd61694eb04e7f15650cc592eb54f84458f7 /session_utils/fix_bbtppq.cc | |
parent | 631c8afc668f8b57af21ca85332ac8f012a3f59e (diff) |
Interpret start & length_beats properties as double rather than Evoral::Beats.
- Evoral::Beats operator!= would prevent an increment
of start_beats by intervals of less than a tick,
so its possible that other subtle problems
existed due to this kind of thing.
Diffstat (limited to 'session_utils/fix_bbtppq.cc')
-rw-r--r-- | session_utils/fix_bbtppq.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/session_utils/fix_bbtppq.cc b/session_utils/fix_bbtppq.cc index 0b060b5d63..8dce59c35d 100644 --- a/session_utils/fix_bbtppq.cc +++ b/session_utils/fix_bbtppq.cc @@ -135,7 +135,7 @@ ensure_per_region_source (Session* session, boost::shared_ptr<MidiRegion> region Source::Lock newsrc_lock (newsrc->mutex()); - write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, region->pulse() - (region->start_beats().to_double() / 4.0)); + write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, region->pulse() - (region->start_beats() / 4.0)); cout << UTILNAME << ":" << endl << " Created new midi source file" << endl @@ -189,7 +189,7 @@ ensure_per_source_source (Session* session, boost::shared_ptr<MidiRegion> region Source::Lock newsrc_lock (newsrc->mutex()); - write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, region->pulse() - (region->start_beats().to_double() / 4.0)); + write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, region->pulse() - (region->start_beats() / 4.0)); cout << UTILNAME << ":" << endl << " Created new midi source file" << endl @@ -206,7 +206,7 @@ reset_start (Session* session, boost::shared_ptr<MidiRegion> region) { /* set start_beats to quarter note value from incorrect bbt*/ TempoMap& tmap (session->tempo_map()); - double new_start_qn = (tmap.pulse_at_beat (region->beat()) - tmap.pulse_at_beat (region->beat() - region->start_beats().to_double())) * 4.0; + double new_start_qn = (tmap.pulse_at_beat (region->beat()) - tmap.pulse_at_beat (region->beat() - region->start_beats())) * 4.0; /* force a change to start and start_beats */ PositionLockStyle old_pls = region->position_lock_style(); @@ -222,7 +222,7 @@ reset_length (Session* session, boost::shared_ptr<MidiRegion> region) { /* set length_beats to quarter note value */ TempoMap& tmap (session->tempo_map()); - double new_length_qn = (tmap.pulse_at_beat (region->beat() + region->length_beats().to_double()) + double new_length_qn = (tmap.pulse_at_beat (region->beat() + region->length_beats()) - tmap.pulse_at_beat (region->beat())) * 4.0; /* force a change to length and length_beats */ |