From d9dea0a3aaabeec001ef3f430f11ecce7aa94f9f Mon Sep 17 00:00:00 2001 From: nick_m Date: Wed, 9 Nov 2016 04:51:19 +1100 Subject: [PATCH] rename Region pos_beats -> quarter_note --- gtk2_ardour/editor_drag.cc | 2 +- gtk2_ardour/midi_region_view.cc | 16 ++++++++-------- libs/ardour/ardour/region.h | 8 ++++---- libs/ardour/luabindings.cc | 2 +- libs/ardour/midi_region.cc | 26 +++++++++++++------------- libs/ardour/region.cc | 14 +++++++------- session_utils/fix_bbtppq.cc | 12 ++++++------ 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 20d28f9c05..01b92564ad 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -5593,7 +5593,7 @@ NoteDrag::total_dx (const guint state) const frameoffset_t const dx = _editor->pixel_to_sample (_drags->current_pointer_x() - grab_x()); /* primary note time */ - double const quarter_note_start = _region->region()->pos_beats() - _region->midi_region()->start_beats(); + double const quarter_note_start = _region->region()->quarter_note() - _region->midi_region()->start_beats(); frameoffset_t const n = map.frame_at_quarter_note (quarter_note_start + _primary->note()->time().to_double()); /* new time of the primary note in session frames */ diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index e0963b2d91..9e0bbb3a97 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -1711,7 +1711,7 @@ MidiRegionView::update_sustained (Note* ev, bool update_ghost_regions) const boost::shared_ptr mr = midi_region(); boost::shared_ptr note = ev->note(); - const double session_source_start = _region->pos_beats() - mr->start_beats(); + const double session_source_start = _region->quarter_note() - mr->start_beats(); const framepos_t note_start_frames = map.frame_at_quarter_note (note->time().to_double() + session_source_start) - _region->position(); const double x0 = trackview.editor().sample_to_pixel (note_start_frames); @@ -1779,7 +1779,7 @@ MidiRegionView::update_hit (Hit* ev, bool update_ghost_regions) { boost::shared_ptr note = ev->note(); - const double note_time_qn = note->time().to_double() + (_region->pos_beats() - midi_region()->start_beats()); + const double note_time_qn = note->time().to_double() + (_region->quarter_note() - midi_region()->start_beats()); const framepos_t note_start_frames = trackview.session()->tempo_map().frame_at_quarter_note (note_time_qn) - _region->position(); const double x = trackview.editor().sample_to_pixel(note_start_frames); @@ -2595,7 +2595,7 @@ MidiRegionView::note_dropped(NoteBase *, frameoffset_t dt, int8_t dnote) for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ++i) { - double const start_qn = _region->pos_beats() - midi_region()->start_beats(); + double const start_qn = _region->quarter_note() - midi_region()->start_beats(); framepos_t new_frames = map.frame_at_quarter_note (start_qn + (*i)->note()->time().to_double()) + dt; Evoral::Beats new_time = Evoral::Beats (map.quarter_note_at_frame (new_frames) - start_qn); if (new_time < 0) { @@ -2922,7 +2922,7 @@ MidiRegionView::commit_resizing (NoteBase* primary, bool at_front, double delta_ /* and then to beats */ const double e_qaf = tmap.exact_qn_at_frame (current_fr + midi_region()->position(), divisions); - const double quarter_note_start = _region->pos_beats() - midi_region()->start_beats(); + const double quarter_note_start = _region->quarter_note() - midi_region()->start_beats(); const Evoral::Beats x_beats = Evoral::Beats (e_qaf - quarter_note_start); if (at_front && x_beats < canvas_note->note()->end_time()) { @@ -3577,14 +3577,14 @@ MidiRegionView::paste_internal (framepos_t pos, unsigned paste_count, float time const Evoral::Beats duration = last_time - first_time; const Evoral::Beats snap_duration = duration.snap_to(snap_beats); const Evoral::Beats paste_offset = snap_duration * paste_count; - const Evoral::Beats pos_beats = absolute_frames_to_source_beats(pos) + paste_offset; + const Evoral::Beats quarter_note = absolute_frames_to_source_beats(pos) + paste_offset; Evoral::Beats end_point = Evoral::Beats(); DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("Paste data spans from %1 to %2 (%3) ; paste pos beats = %4 (based on %5 - %6)\n", first_time, last_time, duration, pos, _region->position(), - pos_beats)); + quarter_note)); clear_editor_note_selection (); @@ -3593,7 +3593,7 @@ MidiRegionView::paste_internal (framepos_t pos, unsigned paste_count, float time for (Notes::const_iterator i = mcb.notes().begin(); i != mcb.notes().end(); ++i) { boost::shared_ptr copied_note (new NoteType (*((*i).get()))); - copied_note->set_time (pos_beats + copied_note->time() - first_time); + copied_note->set_time (quarter_note + copied_note->time() - first_time); copied_note->set_id (Evoral::next_event_id()); /* make all newly added notes selected */ @@ -4149,7 +4149,7 @@ MidiRegionView::snap_frame_to_grid_underneath (framepos_t p, int32_t divisions, eqaf -= grid_beats.to_double(); } } - const double session_start_off = _region->pos_beats() - midi_region()->start_beats(); + const double session_start_off = _region->quarter_note() - midi_region()->start_beats(); return Evoral::Beats (eqaf - session_start_off); } diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 866f489037..a01ef703f3 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -178,9 +178,9 @@ class LIBARDOUR_API Region /* meter-based beat at the region position */ double beat () const { return _beat; } void set_beat (double beat) { _beat = beat; } - /* quarter-note beats at the region position (for use with Evoral::Beats) */ - double pos_beats () const { return _pos_beats; } - void set_pos_beats (double pb) { _pos_beats = pb; } + /* quarter-note at the region position */ + double quarter_note () const { return _quarter_note; } + void set_quarter_note (double qn) { _quarter_note = qn; } void suspend_property_changes (); @@ -382,7 +382,7 @@ class LIBARDOUR_API Region /** Sync position relative to the start of our file */ PBD::Property _sync_position; - double _pos_beats; + double _quarter_note; SourceList _sources; /** Used when timefx are applied, so we can always use the original source */ diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc index 152f040072..cfe84f2f9b 100644 --- a/libs/ardour/luabindings.cc +++ b/libs/ardour/luabindings.cc @@ -1029,7 +1029,7 @@ LuaBindings::common (lua_State* L) .addFunction ("lower_to_bottom", &Region::lower_to_bottom) .addFunction ("set_sync_position", &Region::set_sync_position) .addFunction ("clear_sync_position", &Region::clear_sync_position) - .addFunction ("pos_beats", &Region::pos_beats) + .addFunction ("quarter_note", &Region::quarter_note) .addFunction ("set_hidden", &Region::set_hidden) .addFunction ("set_muted", &Region::set_muted) .addFunction ("set_opaque", &Region::set_opaque) diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index 7f98f191f7..50d7d7f90b 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -107,7 +107,7 @@ MidiRegion::MidiRegion (boost::shared_ptr other, frameoffset_t , _start_beats (Properties::start_beats, 0.0) , _length_beats (Properties::length_beats, other->_length_beats) { - _start_beats = (_session.tempo_map().exact_qn_at_frame (other->_position + offset, sub_num) - other->pos_beats()) + other->_start_beats; + _start_beats = (_session.tempo_map().exact_qn_at_frame (other->_position + offset, sub_num) - other->_quarter_note) + other->_start_beats; update_length_beats (sub_num); register_properties (); @@ -196,7 +196,7 @@ MidiRegion::clone (boost::shared_ptr newsrc) const plist.add (Properties::layer, 0); boost::shared_ptr ret (boost::dynamic_pointer_cast (RegionFactory::create (newsrc, plist, true))); - ret->set_pos_beats (pos_beats()); + ret->set_quarter_note (quarter_note()); return ret; } @@ -227,7 +227,7 @@ void MidiRegion::set_start_beats_from_start_frames () { if (position_lock_style() == AudioTime) { - _start_beats = pos_beats() - _session.tempo_map().quarter_note_at_frame (_position - _start); + _start_beats = quarter_note() - _session.tempo_map().quarter_note_at_frame (_position - _start); } } @@ -270,10 +270,10 @@ MidiRegion::update_after_tempo_map_change (bool /* send */) For now, the musical position at the region start is retained, but subsequent events will maintain their beat distance according to the map. */ - _start = _session.tempo_map().frames_between_quarter_notes (pos_beats() - start_beats(), pos_beats()); + _start = _session.tempo_map().frames_between_quarter_notes (quarter_note() - start_beats(), quarter_note()); /* _length doesn't change for audio-locked regions. update length_beats to match. */ - _length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - pos_beats(); + _length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - quarter_note(); s_and_l.add (Properties::start); s_and_l.add (Properties::length_beats); @@ -285,7 +285,7 @@ MidiRegion::update_after_tempo_map_change (bool /* send */) Region::update_after_tempo_map_change (false); /* _start has now been updated. */ - _length = max ((framecnt_t) 1, _session.tempo_map().frames_between_quarter_notes (pos_beats(), pos_beats() + _length_beats)); + _length = max ((framecnt_t) 1, _session.tempo_map().frames_between_quarter_notes (quarter_note(), quarter_note() + _length_beats)); if (old_start != _start) { s_and_l.add (Properties::start); @@ -303,7 +303,7 @@ MidiRegion::update_after_tempo_map_change (bool /* send */) void MidiRegion::update_length_beats (const int32_t sub_num) { - _length_beats = _session.tempo_map().exact_qn_at_frame (_position + _length, sub_num) - pos_beats(); + _length_beats = _session.tempo_map().exact_qn_at_frame (_position + _length, sub_num) - quarter_note(); } void @@ -317,7 +317,7 @@ MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute, con } /* set _start to new position in tempo map */ - _start = _session.tempo_map().frames_between_quarter_notes (pos_beats() - start_beats(), pos_beats()); + _start = _session.tempo_map().frames_between_quarter_notes (quarter_note() - start_beats(), quarter_note()); /* in construction from src */ if (_length_beats == 0.0) { @@ -325,12 +325,12 @@ MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute, con } if (position_lock_style() == AudioTime) { - _length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - pos_beats(); + _length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - quarter_note(); } else { /* leave _length_beats alone, and change _length to reflect the state of things at the new position (tempo map may dictate a different number of frames). */ - Region::set_length_internal (_session.tempo_map().frames_between_quarter_notes (pos_beats(), pos_beats() + length_beats()), sub_num); + Region::set_length_internal (_session.tempo_map().frames_between_quarter_notes (quarter_note(), quarter_note() + length_beats()), sub_num); } } @@ -414,7 +414,7 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, << " _position = " << _position << " _start = " << _start << " intoffset = " << internal_offset - << " pos_beats = " << pos_beats() + << " quarter_note = " << quarter_note() << " start_beat = " << _start_beats << endl; #endif @@ -432,7 +432,7 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, tracker, filter, _filtered_parameters, - pos_beats(), + quarter_note(), _start_beats ) != to_read) { return 0; /* "read nothing" */ @@ -623,7 +623,7 @@ MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int3 if (_position != position) { const double pos_qn = _session.tempo_map().exact_qn_at_frame (position, sub_num); - const double old_pos_qn = pos_beats(); + const double old_pos_qn = quarter_note(); /* sets _pulse to new position.*/ set_position_internal (position, true, sub_num); diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 375d941bb5..e75d0f2604 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -177,7 +177,7 @@ Region::register_properties () , _position (Properties::position, 0) \ , _beat (Properties::beat, 0.0) \ , _sync_position (Properties::sync_position, (s)) \ - , _pos_beats (0.0) \ + , _quarter_note (0.0) \ , _transient_user_start (0) \ , _transient_analysis_start (0) \ , _transient_analysis_end (0) \ @@ -208,7 +208,7 @@ Region::register_properties () , _position(Properties::position, other->_position) \ , _beat (Properties::beat, other->_beat) \ , _sync_position(Properties::sync_position, other->_sync_position) \ - , _pos_beats (other->_pos_beats) \ + , _quarter_note (other->_quarter_note) \ , _user_transients (other->_user_transients) \ , _transient_user_start (other->_transient_user_start) \ , _transients (other->_transients) \ @@ -294,7 +294,7 @@ Region::Region (boost::shared_ptr other) _start = other->_start; _beat = other->_beat; - _pos_beats = other->_pos_beats; + _quarter_note = other->_quarter_note; /* sync pos is relative to start of file. our start-in-file is now zero, so set our sync position to whatever the the difference between @@ -353,7 +353,7 @@ Region::Region (boost::shared_ptr other, frameoffset_t offset, con _start = other->_start + offset; _beat = _session.tempo_map().exact_beat_at_frame (_position, sub_num); - _pos_beats = _session.tempo_map().exact_qn_at_frame (_position, sub_num); + _quarter_note = _session.tempo_map().exact_qn_at_frame (_position, sub_num); /* if the other region had a distinct sync point set, then continue to use it as best we can. @@ -682,7 +682,7 @@ Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute, const i recompute_position_from_lock_style (sub_num); } else { /* MusicTime dictates that we glue to ardour beats. the pulse may have changed.*/ - _pos_beats = _session.tempo_map().quarter_note_at_beat (_beat); + _quarter_note = _session.tempo_map().quarter_note_at_beat (_beat); } /* check that the new _position wouldn't make the current @@ -701,7 +701,7 @@ void Region::recompute_position_from_lock_style (const int32_t sub_num) { _beat = _session.tempo_map().exact_beat_at_frame (_position, sub_num); - _pos_beats = _session.tempo_map().exact_qn_at_frame (_position, sub_num); + _quarter_note = _session.tempo_map().exact_qn_at_frame (_position, sub_num); } void @@ -1872,7 +1872,7 @@ Region::post_set (const PropertyChange& pc) << " position : " << _position << " beat : " << _beat << std::endl; //_beat = _session.tempo_map().beat_at_frame (_position); } - _pos_beats = _session.tempo_map().quarter_note_at_beat (_beat); + _quarter_note = _session.tempo_map().quarter_note_at_beat (_beat); } } diff --git a/session_utils/fix_bbtppq.cc b/session_utils/fix_bbtppq.cc index 76d3284f9f..a5842ac700 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 region Source::Lock newsrc_lock (newsrc->mutex()); - write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, (region->pos_beats() - region->start_beats()) / 4.0); + write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, (region->quarter_note() - 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 region Source::Lock newsrc_lock (newsrc->mutex()); - write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, (region->pos_beats() - region->start_beats()) / 4.0); + write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, (region->quarter_note() - 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 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->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_start (tmap.frame_at_quarter_note (region->quarter_note()) - tmap.frame_at_quarter_note (region->quarter_note() - new_start_qn) + 1); + region->set_start (tmap.frame_at_quarter_note (region->quarter_note()) - tmap.frame_at_quarter_note (region->quarter_note() - new_start_qn)); region->set_position_lock_style (old_pls); } @@ -228,8 +228,8 @@ reset_length (Session* session, boost::shared_ptr 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->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_length (tmap.frame_at_quarter_note (region->quarter_note() + new_length_qn) + 1 - region->position(), 0); + region->set_length (tmap.frame_at_quarter_note (region->quarter_note() + new_length_qn)- region->position(), 0); region->set_position_lock_style (old_pls); } -- 2.30.2