#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"
namespace ARDOUR {
namespace Properties {
- PBD::PropertyDescriptor<Evoral::Beats> start_beats;
- PBD::PropertyDescriptor<Evoral::Beats> length_beats;
+ PBD::PropertyDescriptor<double> start_beats;
+ PBD::PropertyDescriptor<double> length_beats;
}
}
/* Basic MidiRegion constructor (many channels) */
MidiRegion::MidiRegion (const SourceList& srcs)
: Region (srcs)
- , _start_beats (Properties::start_beats, Evoral::Beats())
- , _length_beats (Properties::length_beats, midi_source(0)->length_beats())
+ , _start_beats (Properties::start_beats, 0.0)
+ , _length_beats (Properties::length_beats, midi_source(0)->length_beats().to_double())
{
register_properties ();
midi_source(0)->ModelChanged.connect_same_thread (_source_connection, boost::bind (&MidiRegion::model_changed, this));
/** 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, Evoral::Beats())
+ , _start_beats (Properties::start_beats, 0.0)
, _length_beats (Properties::length_beats, other->_length_beats)
{
- _start_beats = Evoral::Beats (_session.tempo_map().exact_qn_at_frame (other->_position + offset, sub_num) - (other->pulse() * 4.0)) + other->_start_beats;
+ _start_beats = (_session.tempo_map().exact_qn_at_frame (other->_position + offset, sub_num) - other->pos_beats()) + other->_start_beats;
update_length_beats (sub_num);
register_properties ();
plist.add (Properties::start, _start);
plist.add (Properties::start_beats, _start_beats);
plist.add (Properties::length, _length);
+ plist.add (Properties::beat, _beat);
plist.add (Properties::length_beats, _length_beats);
plist.add (Properties::layer, 0);
boost::shared_ptr<MidiRegion> ret (boost::dynamic_pointer_cast<MidiRegion> (RegionFactory::create (newsrc, plist, true)));
- ret->set_beat (beat());
- ret->set_pulse (pulse());
+ ret->set_pos_beats (pos_beats());
return ret;
}
so disallow (this has been set from XML state anyway).
*/
if (!_session.loading()) {
- /* update non-musically */
- update_length_beats (0);
+ /* ensure this only updates non-musical regions */
+ if (position_lock_style() == AudioTime) {
+ update_length_beats (0);
+ }
}
} else 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 = Evoral::Beats ((pulse() * 4.0) - _session.tempo_map().quarter_note_at_frame (_position - _start));
+ if (position_lock_style() == AudioTime) {
+ _start_beats = pos_beats() - _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 = _position - _session.tempo_map().frame_at_pulse (pulse() - (_start_beats.val().to_double() / 4.0));
+ _start = _session.tempo_map().frames_between_quarter_notes (pos_beats() - start_beats(), pos_beats());
/* _length doesn't change for audio-locked regions. update length_beats to match. */
- _length_beats = Evoral::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) - pos_beats();
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.val().to_double() / 4.0)) - _position;
+ _length = max ((framecnt_t) 1, _session.tempo_map().frames_between_quarter_notes (pos_beats(), pos_beats() + _length_beats));
if (old_start != _start) {
s_and_l.add (Properties::start);
void
MidiRegion::update_length_beats (const int32_t sub_num)
{
- _length_beats = Evoral::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) - pos_beats();
}
void
{
Region::set_position_internal (pos, allow_bbt_recompute, sub_num);
+ /* don't clobber _start _length and _length_beats if session loading.*/
+ if (_session.loading()) {
+ return;
+ }
+
/* set _start to new position in tempo map */
- _start = _position - _session.tempo_map().frame_at_pulse (pulse() - (_start_beats.val().to_double() / 4.0));
+ _start = _session.tempo_map().frames_between_quarter_notes (pos_beats() - start_beats(), pos_beats());
/* in construction from src */
- if (_length_beats == Evoral::Beats()) {
+ if (_length_beats == 0.0) {
update_length_beats (sub_num);
}
- /* don't clobber _length and _length_beats if session loading.*/
- if (!_session.loading()) {
- if (position_lock_style() == AudioTime) {
- _length_beats = Evoral::Beats (_session.tempo_map().quarter_note_at_frame (_position + _length) - _session.tempo_map().quarter_note_at_frame (_position));
- } 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_pulse (pulse() + (_length_beats.val().to_double() / 4.0)) - _position, sub_num);
- }
+ if (position_lock_style() == AudioTime) {
+ _length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - pos_beats();
+ } 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);
}
}
framepos_t position,
framecnt_t dur,
Evoral::Range<framepos_t>* loop_range,
+ MidiCursor& cursor,
uint32_t chan_n,
NoteMode mode,
MidiStateTracker* tracker,
MidiChannelFilter* filter) const
{
- return _read_at (_sources, out, position, dur, loop_range, chan_n, mode, tracker, filter);
+ return _read_at (_sources, out, position, dur, loop_range, cursor, chan_n, mode, tracker, filter);
}
framecnt_t
framepos_t position,
framecnt_t dur,
Evoral::Range<framepos_t>* loop_range,
+ MidiCursor& cursor,
uint32_t chan_n,
NoteMode mode) const
{
- return _read_at (_master_sources, out, position, dur, loop_range, chan_n, mode); /* no tracker */
+ return _read_at (_master_sources, out, position, dur, loop_range, cursor, chan_n, mode); /* no tracker */
}
framecnt_t
framepos_t position,
framecnt_t dur,
Evoral::Range<framepos_t>* loop_range,
+ MidiCursor& cursor,
uint32_t chan_n,
NoteMode mode,
MidiStateTracker* tracker,
<< " _position = " << _position
<< " _start = " << _start
<< " intoffset = " << internal_offset
- << " pulse = " << pulse()
- << " start_pulse = " << start_pulse()
+ << " pos_beats = " << pos_beats()
<< " start_beat = " << _start_beats
<< endl;
#endif
_start + internal_offset, // where to start reading in the source
to_read, // read duration in frames
loop_range,
+ cursor,
tracker,
filter,
_filtered_parameters,
- pulse(),
- _start_beats.val().to_double()
+ pos_beats(),
+ _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;
}
model()->insert_silence_at_start (c.from (-_start));
_start = 0;
- _start_beats = Evoral::Beats();
+ _start_beats = 0.0;
}
void
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
PropertyChange what_changed;
- /* beat has been set exactly by set_position_internal, but the source starts on a frame.
- working in beats seems the correct thing to do, but reports of a missing first note
- on playback suggest otherwise. for now, we work in exact beats.
- */
- const double pos_pulse = _session.tempo_map().exact_qn_at_frame (position, sub_num) / 4.0;
- const double pulse_delta = pos_pulse - pulse();
/* Set position before length, otherwise for MIDI regions this bad thing happens:
* 1. we call set_length_internal; length in beats is computed using the region's current
*/
if (_position != position) {
- /* sets _beat to new position.*/
+
+ const double pos_qn = _session.tempo_map().exact_qn_at_frame (position, sub_num);
+ const double old_pos_qn = pos_beats();
+
+ /* sets _pulse to new position.*/
set_position_internal (position, true, sub_num);
what_changed.add (Properties::position);
- const double new_start_pulse = (_start_beats.val().to_double() / 4.0) + pulse_delta;
- const framepos_t new_start = _position - _session.tempo_map().frame_at_pulse (pulse() - new_start_pulse);
+ double new_start_qn = start_beats() + (pos_qn - old_pos_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;
}
- _start_beats = Evoral::Beats (new_start_pulse * 4.0);
+ _start_beats = new_start_qn;
what_changed.add (Properties::start_beats);
set_start_internal (new_start, sub_num);
projects / ardour.git / blobdiff