#include "pbd/basename.h"
#include "ardour/automation_control.h"
+#include "ardour/midi_cursor.h"
#include "ardour/midi_model.h"
#include "ardour/midi_region.h"
#include "ardour/midi_ring_buffer.h"
/** Create a new MidiRegion that is part of an existing one */
MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other, frameoffset_t offset, const int32_t sub_num)
: Region (other, offset, sub_num)
- , _start_beats (Properties::start_beats, 0.0)
+ , _start_beats (Properties::start_beats, other->_start_beats)
, _length_beats (Properties::length_beats, other->_length_beats)
{
- _start_beats = (_session.tempo_map().exact_qn_at_frame (other->_position + offset, sub_num) - (other->pulse() * 4.0)) + other->_start_beats;
+ if (offset != 0) {
+ _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);
+ /* we've potentially shifted _start_beats, now reset _start frames to match */
+ _start = _session.tempo_map().frames_between_quarter_notes (_quarter_note - _start_beats, _quarter_note);
+ }
- update_length_beats (sub_num);
register_properties ();
assert(_name.val().find("/") == string::npos);
Evoral::Beats const bend = bfc.from (_start + _length);
{
+ boost::shared_ptr<MidiSource> ms = midi_source(0);
+ Source::Lock lm (ms->mutex());
+
+ if (!ms->model()) {
+ ms->load_model (lm);
+ }
+
/* Lock our source since we'll be reading from it. write_to() will
- take a lock on newsrc. */
- Source::Lock lm (midi_source(0)->mutex());
- if (midi_source(0)->write_to (lm, newsrc, bbegin, bend)) {
+ take a lock on newsrc.
+ */
+
+ if (ms->write_to (lm, newsrc, bbegin, bend)) {
return boost::shared_ptr<MidiRegion> ();
}
}
plist.add (Properties::layer, 0);
boost::shared_ptr<MidiRegion> ret (boost::dynamic_pointer_cast<MidiRegion> (RegionFactory::create (newsrc, plist, true)));
- ret->set_pulse (pulse());
+ ret->set_quarter_note (quarter_note());
return ret;
}
so disallow (this has been set from XML state anyway).
*/
if (!_session.loading()) {
- /* update non-musically */
update_length_beats (0);
}
- } else if (pc.contains (Properties::start) && !pc.contains (Properties::start_beats)) {
+ }
+
+ if (pc.contains (Properties::start) && !pc.contains (Properties::start_beats)) {
set_start_beats_from_start_frames ();
}
}
void
MidiRegion::set_start_beats_from_start_frames ()
{
- _start_beats = (pulse() * 4.0) - _session.tempo_map().quarter_note_at_frame (_position - _start);
+ if (position_lock_style() == AudioTime) {
+ _start_beats = quarter_note() - _session.tempo_map().quarter_note_at_frame (_position - _start);
+ }
}
void
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().frame_at_quarter_note (pulse() * 4.0)
- - _session.tempo_map().frame_at_quarter_note ((pulse() * 4.0) - start_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) - _session.tempo_map().quarter_note_at_frame (_position);
+ _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);
Region::update_after_tempo_map_change (false);
/* _start has now been updated. */
- _length = _session.tempo_map().frame_at_pulse (pulse() + (_length_beats / 4.0)) - _position;
+ _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);
void
MidiRegion::update_length_beats (const int32_t sub_num)
{
- _length_beats = _session.tempo_map().exact_qn_at_frame (_position + _length, sub_num) - (pulse() * 4.0);
+ _length_beats = _session.tempo_map().exact_qn_at_frame (_position + _length, sub_num) - quarter_note();
}
void
}
/* set _start to new position in tempo map */
- _start = _session.tempo_map().frame_at_quarter_note (pulse() * 4.0)
- - _session.tempo_map().frame_at_quarter_note ((pulse() * 4.0) - start_beats());
+ _start = _session.tempo_map().frames_between_quarter_notes (quarter_note() - start_beats(), quarter_note());
/* in construction from src */
if (_length_beats == 0.0) {
}
if (position_lock_style() == AudioTime) {
- _length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - _session.tempo_map().quarter_note_at_frame (_position);
+ _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().frame_at_quarter_note ((pulse() * 4.0) + length_beats()) - _position, sub_num);
+ Region::set_length_internal (_session.tempo_map().frames_between_quarter_notes (quarter_note(), quarter_note() + length_beats()), sub_num);
}
}
<< " _position = " << _position
<< " _start = " << _start
<< " intoffset = " << internal_offset
- << " pulse = " << pulse()
- << " start_pulse = " << start_pulse()
+ << " quarter_note = " << quarter_note()
<< " start_beat = " << _start_beats
<< endl;
#endif
tracker,
filter,
_filtered_parameters,
- pulse(),
+ quarter_note(),
_start_beats
) != to_read) {
return 0; /* "read nothing" */
{
int ret = Region::set_state (node, version);
- if (ret == 0) {
- /* set length beats to the frame (non-musical) */
- if (position_lock_style() == AudioTime) {
- update_length_beats (0);
- }
- }
-
return ret;
}
MidiRegion::set_start_internal (framecnt_t s, const int32_t sub_num)
{
Region::set_start_internal (s, sub_num);
- if (position_lock_style() == AudioTime) {
- set_start_beats_from_start_frames ();
- }
+ set_start_beats_from_start_frames ();
}
void
if (_position != position) {
const double pos_qn = _session.tempo_map().exact_qn_at_frame (position, sub_num);
- const double old_pos_qn = pulse() * 4.0;
+ const double old_pos_qn = quarter_note();
/* sets _pulse to new position.*/
set_position_internal (position, true, sub_num);
what_changed.add (Properties::position);
double new_start_qn = start_beats() + (pos_qn - old_pos_qn);
- const framepos_t new_start = _session.tempo_map().frame_at_quarter_note (pos_qn)
- - _session.tempo_map().frame_at_quarter_note (pos_qn - new_start_qn);
+ framepos_t new_start = _session.tempo_map().frames_between_quarter_notes (pos_qn - new_start_qn, pos_qn);
if (!verify_start_and_length (new_start, length)) {
return;
projects / ardour.git / blobdiff