diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-10-31 00:01:02 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-11-11 03:37:08 +1100 |
| commit | dca96d8b5d6737ec811cf5a46548d39a7912bec8 (patch) | |
| tree | 3569c1c42a405bc1b43fc22f30d90bba1dc1fe51 /session_utils | |
| parent | ac23496b40537d97469acdec89f787f056dc3bba (diff) | |
rename Region pulse to pos_beats. use new beat distance api where required.
- add more debugging output detecting regions whose
beat and frame position do not align on a playlist.
this is required as a check as we have never used
frame rounding on constant tempi before 8884a5723dc
Diffstat (limited to 'session_utils')
| -rw-r--r-- | session_utils/fix_bbtppq.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/session_utils/fix_bbtppq.cc b/session_utils/fix_bbtppq.cc index 8dce59c35d..f86fe790e7 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() / 4.0)); + write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, (region->pos_beats() - 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() / 4.0)); + write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, (region->pos_beats() - region->start_beats()) / 4.0); cout << UTILNAME << ":" << endl << " Created new midi source file" << endl @@ -211,8 +211,8 @@ reset_start (Session* session, boost::shared_ptr<MidiRegion> region) /* force a change to start and start_beats */ PositionLockStyle old_pls = region->position_lock_style(); region->set_position_lock_style (AudioTime); - region->set_start (tmap.frame_at_quarter_note (region->pulse() * 4.0) - tmap.frame_at_quarter_note ((region->pulse() * 4.0) - new_start_qn) + 1); - region->set_start (tmap.frame_at_quarter_note (region->pulse() * 4.0) - tmap.frame_at_quarter_note ((region->pulse() * 4.0) - new_start_qn)); + region->set_start (tmap.frame_at_quarter_note (region->pos_beats()) - tmap.frame_at_quarter_note (region->pos_beats() - new_start_qn) + 1); + region->set_start (tmap.frame_at_quarter_note (region->pos_beats()) - tmap.frame_at_quarter_note (region->pos_beats() - new_start_qn)); region->set_position_lock_style (old_pls); } @@ -228,8 +228,8 @@ reset_length (Session* session, boost::shared_ptr<MidiRegion> region) /* force a change to length and length_beats */ PositionLockStyle old_pls = region->position_lock_style(); region->set_position_lock_style (AudioTime); - region->set_length (tmap.frame_at_quarter_note ((region->pulse() * 4.0) + new_length_qn) + 1 - region->position(), 0); - region->set_length (tmap.frame_at_quarter_note ((region->pulse() * 4.0) + new_length_qn)- region->position(), 0); + region->set_length (tmap.frame_at_quarter_note (region->pos_beats() + new_length_qn) + 1 - region->position(), 0); + region->set_length (tmap.frame_at_quarter_note (region->pos_beats() + new_length_qn)- region->position(), 0); region->set_position_lock_style (old_pls); } |