#include "evoral/ControlList.hpp"
#include "evoral/ControlSet.hpp"
#include "evoral/EventSink.hpp"
-#include "evoral/MIDIParameters.hpp"
#include "evoral/Sequence.hpp"
#include "evoral/TypeMap.hpp"
#include "evoral/midi_util.h"
template<typename Time>
Sequence<Time>::const_iterator::const_iterator()
: _seq(NULL)
+ , _event(boost::shared_ptr< Event<Time> >(new Event<Time>()))
+ , _active_patch_change_message (0)
+ , _type(NIL)
, _is_end(true)
, _control_iter(_control_iters.end())
+ , _force_discrete(false)
{
- _event = boost::shared_ptr< Event<Time> >(new Event<Time>());
}
/** @param force_discrete true to force ControlLists to use discrete evaluation, otherwise false to get them to use their configured mode */
DEBUG_TRACE (DEBUG::Sequence, string_compose ("Iterator: control: %1\n", seq._type_map.to_symbol(i->first)));
double x, y;
bool ret;
- if (_force_discrete) {
- ret = i->second->list()->rt_safe_earliest_event_discrete_unlocked (t, x, y, true);
+ if (_force_discrete || i->second->list()->interpolation() == ControlList::Discrete) {
+ ret = i->second->list()->rt_safe_earliest_event_discrete_unlocked (t.to_double(), x, y, true);
} else {
- ret = i->second->list()->rt_safe_earliest_event_unlocked(t, x, y, true);
+ ret = i->second->list()->rt_safe_earliest_event_unlocked(t.to_double(), x, y, true);
}
if (!ret) {
DEBUG_TRACE (DEBUG::Sequence, string_compose ("Iterator: CC %1 (size %2) has no events past %3\n",
}
if (_control_iter != _control_iters.end()
- && earliest_control.list && earliest_control.x >= t
- && (earliest_control.x < earliest_t || _type == NIL)) {
+ && earliest_control.list && earliest_control.x >= t.to_double()
+ && (earliest_control.x < earliest_t.to_double() || _type == NIL)) {
_type = CONTROL;
- earliest_t = earliest_control.x;
+ earliest_t = Time(earliest_control.x);
}
switch (_type) {
// Increment current controller iterator
if (_force_discrete || _control_iter->list->interpolation() == ControlList::Discrete) {
ret = _control_iter->list->rt_safe_earliest_event_discrete_unlocked (
- _control_iter->x, x, y, false
- );
+ _control_iter->x, x, y, false);
} else {
ret = _control_iter->list->rt_safe_earliest_event_linear_unlocked (
- _control_iter->x + time_between_interpolated_controller_outputs, x, y, false
- );
+ _control_iter->x + time_between_interpolated_controller_outputs, x, y, false);
}
assert(!ret || x > _control_iter->x);
if (ret) {
// Use the next earliest controller iff it's earlier than the note event
if (_control_iter != _control_iters.end() && _control_iter->x != DBL_MAX) {
- if (_type == NIL || _control_iter->x < earliest_t) {
+ if (_type == NIL || _control_iter->x < earliest_t.to_double()) {
_type = CONTROL;
- earliest_t = _control_iter->x;
+ earliest_t = Time(_control_iter->x);
}
}
, _overlap_pitch_resolution (FirstOnFirstOff)
, _writing(false)
, _type_map(type_map)
- , _end_iter(*this, DBL_MAX, false, std::set<Evoral::Parameter> ())
+ , _end_iter(*this, std::numeric_limits<Time>::max(), false, std::set<Evoral::Parameter> ())
, _percussive(false)
, _lowest_note(127)
, _highest_note(0)
, _overlap_pitch_resolution (other._overlap_pitch_resolution)
, _writing(false)
, _type_map(other._type_map)
- , _end_iter(*this, DBL_MAX, false, std::set<Evoral::Parameter> ())
+ , _end_iter(*this, std::numeric_limits<Time>::max(), false, std::set<Evoral::Parameter> ())
, _percussive(other._percussive)
, _lowest_note(other._lowest_note)
, _highest_note(other._highest_note)
// initialize the event pointer with a new event, if necessary
if (!ev) {
- ev = boost::shared_ptr< Event<Time> >(new Event<Time>(event_type, 0, 3, NULL, true));
+ ev = boost::shared_ptr< Event<Time> >(new Event<Time>(event_type, Time(), 3, NULL, true));
}
uint8_t midi_type = _type_map.parameter_midi_type(iter.list->parameter());
assert(iter.list->parameter().id() <= INT8_MAX);
assert(iter.y <= INT8_MAX);
- ev->set_time(iter.x);
+ ev->set_time(Time(iter.x));
ev->realloc(3);
ev->buffer()[0] = MIDI_CMD_CONTROL + iter.list->parameter().channel();
ev->buffer()[1] = (uint8_t)iter.list->parameter().id();
assert(iter.list->parameter().channel() < 16);
assert(iter.y <= INT8_MAX);
- ev->set_time(iter.x);
+ ev->set_time(Time(iter.x));
ev->realloc(2);
ev->buffer()[0] = MIDI_CMD_PGM_CHANGE + iter.list->parameter().channel();
ev->buffer()[1] = (uint8_t)iter.y;
assert(iter.list->parameter().channel() < 16);
assert(iter.y < (1<<14));
- ev->set_time(iter.x);
+ ev->set_time(Time(iter.x));
ev->realloc(3);
ev->buffer()[0] = MIDI_CMD_BENDER + iter.list->parameter().channel();
ev->buffer()[1] = uint16_t(iter.y) & 0x7F; // LSB
assert(iter.list->parameter().channel() < 16);
assert(iter.y <= INT8_MAX);
- ev->set_time(iter.x);
+ ev->set_time(Time(iter.x));
ev->realloc(2);
ev->buffer()[0] = MIDI_CMD_CHANNEL_PRESSURE + iter.list->parameter().channel();
ev->buffer()[1] = (uint8_t)iter.y;
typename Notes::iterator next = n;
++next;
- if ((*n)->length() == 0) {
+ if (!(*n)->length()) {
switch (option) {
case Relax:
break;
typename Sequence<Time>::Notes::iterator i;
- for (i = note_lower_bound(note->time()); i != _notes.end() && musical_time_equal ((*i)->time(), note->time()); ++i) {
+ for (i = note_lower_bound(note->time()); i != _notes.end() && (*i)->time() == note->time(); ++i) {
if (*i == note) {
* so the search_note has all other properties unset.
*/
- NotePtr search_note (new Note<Time>(0, 0, 0, note->note(), 0));
+ NotePtr search_note (new Note<Time>(0, Time(), Time(), note->note(), 0));
for (j = p.lower_bound (search_note); j != p.end() && (*j)->note() == note->note(); ++j) {
{
typename Sequence<Time>::PatchChanges::iterator i = patch_change_lower_bound (p->time ());
- while (i != _patch_changes.end() && (musical_time_equal ((*i)->time(), p->time()))) {
+ while (i != _patch_changes.end() && ((*i)->time() == p->time())) {
typename Sequence<Time>::PatchChanges::iterator tmp = i;
++tmp;
}
if (ev.is_note_on()) {
- NotePtr note(new Note<Time>(ev.channel(), ev.time(), 0, ev.note(), ev.velocity()));
+ NotePtr note(new Note<Time>(ev.channel(), ev.time(), Time(), ev.note(), ev.velocity()));
append_note_on_unlocked (note, evid);
} else if (ev.is_note_off()) {
- NotePtr note(new Note<Time>(ev.channel(), ev.time(), 0, ev.note(), ev.velocity()));
+ NotePtr note(new Note<Time>(ev.channel(), ev.time(), Time(), ev.note(), ev.velocity()));
/* XXX note: event ID is discarded because we merge the on+off events into
a single note object
*/
}
} else if (ev.is_cc()) {
append_control_unlocked(
- Evoral::MIDI::ContinuousController(ev.event_type(), ev.channel(), ev.cc_number()),
+ Parameter(ev.event_type(), ev.channel(), ev.cc_number()),
ev.time(), ev.cc_value(), evid);
} else if (ev.is_pgm_change()) {
/* write a patch change with this program change and any previously set-up bank number */
append_patch_change_unlocked (PatchChange<Time> (ev.time(), ev.channel(), ev.pgm_number(), _bank[ev.channel()]), evid);
} else if (ev.is_pitch_bender()) {
append_control_unlocked(
- Evoral::MIDI::PitchBender(ev.event_type(), ev.channel()),
+ Parameter(ev.event_type(), ev.channel()),
ev.time(), double ((0x7F & ev.pitch_bender_msb()) << 7
| (0x7F & ev.pitch_bender_lsb())),
evid);
} else if (ev.is_channel_pressure()) {
append_control_unlocked(
- Evoral::MIDI::ChannelPressure(ev.event_type(), ev.channel()),
+ Parameter(ev.event_type(), ev.channel()),
ev.time(), ev.channel_pressure(), evid);
} else if (!_type_map.type_is_midi(ev.event_type())) {
printf("WARNING: Sequence: Unknown event type %X: ", ev.event_type());
DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 %2 @ %3 = %4 # controls: %5\n",
this, _type_map.to_symbol(param), time, value, _controls.size()));
boost::shared_ptr<Control> c = control(param, true);
- c->list()->add (time, value);
+ c->list()->add (time.to_double(), value);
/* XXX control events should use IDs */
}
Sequence<Time>::contains_unlocked (const NotePtr& note) const
{
const Pitches& p (pitches (note->channel()));
- NotePtr search_note(new Note<Time>(0, 0, 0, note->note()));
+ NotePtr search_note(new Note<Time>(0, Time(), Time(), note->note()));
for (typename Pitches::const_iterator i = p.lower_bound (search_note);
i != p.end() && (*i)->note() == note->note(); ++i) {
Time ea = note->end_time();
const Pitches& p (pitches (note->channel()));
- NotePtr search_note(new Note<Time>(0, 0, 0, note->note()));
+ NotePtr search_note(new Note<Time>(0, Time(), Time(), note->note()));
for (typename Pitches::const_iterator i = p.lower_bound (search_note);
i != p.end() && (*i)->note() == note->note(); ++i) {
typename Sequence<Time>::Notes::const_iterator
Sequence<Time>::note_lower_bound (Time t) const
{
- NotePtr search_note(new Note<Time>(0, t, 0, 0, 0));
+ NotePtr search_note(new Note<Time>(0, t, Time(), 0, 0));
typename Sequence<Time>::Notes::const_iterator i = _notes.lower_bound(search_note);
assert(i == _notes.end() || (*i)->time() >= t);
return i;
{
PatchChangePtr search (new PatchChange<Time> (t, 0, 0, 0));
typename Sequence<Time>::PatchChanges::const_iterator i = _patch_changes.lower_bound (search);
- assert (i == _patch_changes.end() || musical_time_greater_or_equal_to ((*i)->time(), t));
+ assert (i == _patch_changes.end() || (*i)->time() >= t);
return i;
}
typename Sequence<Time>::Notes::iterator
Sequence<Time>::note_lower_bound (Time t)
{
- NotePtr search_note(new Note<Time>(0, t, 0, 0, 0));
+ NotePtr search_note(new Note<Time>(0, t, Time(), 0, 0));
typename Sequence<Time>::Notes::iterator i = _notes.lower_bound(search_note);
assert(i == _notes.end() || (*i)->time() >= t);
return i;
{
PatchChangePtr search (new PatchChange<Time> (t, 0, 0, 0));
typename Sequence<Time>::PatchChanges::iterator i = _patch_changes.lower_bound (search);
- assert (i == _patch_changes.end() || musical_time_greater_or_equal_to ((*i)->time(), t));
+ assert (i == _patch_changes.end() || (*i)->time() >= t);
return i;
}
}
const Pitches& p (pitches (c));
- NotePtr search_note(new Note<Time>(0, 0, 0, val, 0));
+ NotePtr search_note(new Note<Time>(0, Time(), Time(), val, 0));
typename Pitches::const_iterator i;
switch (op) {
case PitchEqual:
default:
//fatal << string_compose (_("programming error: %1 %2", X_("get_notes_by_pitch() called with illegal operator"), op)) << endmsg;
- abort ();
- /* NOTREACHED*/
+ abort(); /* NOTREACHED*/
}
}
}
break;
default:
// fatal << string_compose (_("programming error: %1 %2", X_("get_notes_by_velocity() called with illegal operator"), op)) << endmsg;
- abort ();
- /* NOTREACHED*/
+ abort(); /* NOTREACHED*/
}
}
projects / ardour.git / blobdiff