allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

rename Region pos_beats -> quarter_note

Browse Source
This commit is contained in:
nick_m
2016-11-09 04:51:19 +11:00
parent 3816ee4e92
commit d9dea0a3aa
7 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/ardour/region.h
View File

@@ -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<framepos_t> _sync_position;
double _pos_beats;
double _quarter_note;
SourceList _sources;
/** Used when timefx are applied, so we can always use the original source */

2
libs/ardour/luabindings.cc
View File

@@ -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)

26
libs/ardour/midi_region.cc
View File

@@ -107,7 +107,7 @@ MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> 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<MidiSource> newsrc) const
plist.add (Properties::layer, 0);
boost::shared_ptr<MidiRegion> ret (boost::dynamic_pointer_cast<MidiRegion> (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);

14
libs/ardour/region.cc
View File

@@ -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<const Region> 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<const Region> 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);
}
}