/* This file is part of Evoral.
- * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
+ * Copyright (C) 2008 David Robillard <http://drobilla.net>
* Copyright (C) 2000-2008 Paul Davis
*
* Evoral is free software; you can redistribute it and/or modify it under the
template<typename Time>
Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t, bool force_discrete, std::set<Evoral::Parameter> const & filtered)
: _seq(&seq)
+ , _active_patch_change_message (0)
, _type(NIL)
, _is_end((t == DBL_MAX) || seq.empty())
, _note_iter(seq.notes().end())
, _sysex_iter(seq.sysexes().end())
+ , _patch_change_iter(seq.patch_changes().end())
, _control_iter(_control_iters.end())
, _force_discrete (force_discrete)
{
DEBUG_TRACE (DEBUG::Sequence, string_compose ("Created Iterator @ %1 (is end: %2)\n)", t, _is_end));
- if (!_is_end) {
- _lock = seq.read_lock();
- } else {
+ if (_is_end) {
return;
}
- typename Sequence<Time>::ReadLock lock(seq.read_lock());
+ _lock = seq.read_lock();
// Find first note which begins at or after t
_note_iter = seq.note_lower_bound(t);
}
assert(_sysex_iter == seq.sysexes().end() || (*_sysex_iter)->time() >= t);
+ // Find first patch event at or after t
+ for (typename Sequence<Time>::PatchChanges::const_iterator i = seq.patch_changes().begin(); i != seq.patch_changes().end(); ++i) {
+ if ((*i)->time() >= t) {
+ _patch_change_iter = i;
+ break;
+ }
+ }
+ assert (_patch_change_iter == seq.patch_changes().end() || (*_patch_change_iter)->time() >= t);
+
// Find first control event after t
ControlIterator earliest_control(boost::shared_ptr<ControlList>(), DBL_MAX, 0.0);
_control_iters.reserve(seq._controls.size());
earliest_t = (*_sysex_iter)->time();
}
+ if (_patch_change_iter != seq.patch_changes().end() && ((*_patch_change_iter)->time() < earliest_t || _type == NIL)) {
+ _type = PATCH_CHANGE;
+ earliest_t = (*_patch_change_iter)->time ();
+ }
+
if (_control_iter != _control_iters.end()
&& earliest_control.list && earliest_control.x >= t
&& (earliest_control.x < earliest_t || _type == NIL)) {
DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at control event @ %1\n", earliest_t));
seq.control_to_midi_event(_event, earliest_control);
break;
+ case PATCH_CHANGE:
+ DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at patch change event @ %1\n", earliest_t));
+ _event = boost::shared_ptr<Event<Time> > (new Event<Time> ((*_patch_change_iter)->message (_active_patch_change_message), true));
+ break;
default:
break;
}
_type = NIL;
_is_end = true;
} else {
- DEBUG_TRACE (DEBUG::Sequence, string_compose ("New iterator = 0x%x : 0x%x @ %f\n",
+ DEBUG_TRACE (DEBUG::Sequence, string_compose ("New iterator = 0x%1 : 0x%2 @ %3\n",
(int)_event->event_type(),
(int)((MIDIEvent<Time>*)_event.get())->type(),
_event->time()));
+
assert(midi_event_is_valid(_event->buffer(), _event->size()));
}
+
}
template<typename Time>
if (_seq) {
_note_iter = _seq->notes().end();
_sysex_iter = _seq->sysexes().end();
+ _patch_change_iter = _seq->patch_changes().end();
+ _active_patch_change_message = 0;
}
_control_iter = _control_iters.end();
_lock.reset();
case SYSEX:
++_sysex_iter;
break;
+ case PATCH_CHANGE:
+ ++_active_patch_change_message;
+ if (_active_patch_change_message == (*_patch_change_iter)->messages()) {
+ ++_patch_change_iter;
+ _active_patch_change_message = 0;
+ }
+ break;
default:
assert(false);
}
}
}
+ // Use the next earliest patch change iff it's earlier than the SysEx
+ if (_patch_change_iter != _seq->patch_changes().end()) {
+ if (_type == NIL || (*_patch_change_iter)->time() < earliest_t) {
+ _type = PATCH_CHANGE;
+ earliest_t = (*_patch_change_iter)->time();
+ }
+ }
+
// Set event to reflect new position
switch (_type) {
case NOTE_ON:
DEBUG_TRACE(DEBUG::Sequence, "iterator = sysex\n");
*_event = *(*_sysex_iter);
break;
+ case PATCH_CHANGE:
+ DEBUG_TRACE(DEBUG::Sequence, "iterator = patch change\n");
+ *_event = (*_patch_change_iter)->message (_active_patch_change_message);
+ break;
default:
DEBUG_TRACE(DEBUG::Sequence, "iterator = end\n");
_is_end = true;
_is_end = other._is_end;
_note_iter = other._note_iter;
_sysex_iter = other._sysex_iter;
+ _patch_change_iter = other._patch_change_iter;
_control_iters = other._control_iters;
_force_discrete = other._force_discrete;
+ _active_patch_change_message = other._active_patch_change_message;
- if (other._lock)
+ if (other._lock) {
_lock = _seq->read_lock();
- else
+ } else {
_lock.reset();
+ }
if (other._control_iter == other._control_iters.end()) {
_control_iter = _control_iters.end();
DEBUG_TRACE (DEBUG::Sequence, string_compose ("Sequence constructed: %1\n", this));
assert(_end_iter._is_end);
assert( ! _end_iter._lock);
+
+ for (int i = 0; i < 16; ++i) {
+ _bank[i] = 0;
+ }
}
template<typename Time>
_sysexes.push_back (n);
}
+ for (typename PatchChanges::const_iterator i = other._patch_changes.begin(); i != other._patch_changes.end(); ++i) {
+ PatchChangePtr n (new PatchChange<Time> (**i));
+ _patch_changes.insert (n);
+ }
+
+ for (int i = 0; i < 16; ++i) {
+ _bank[i] = other._bank[i];
+ }
+
DEBUG_TRACE (DEBUG::Sequence, string_compose ("Sequence copied: %1\n", this));
assert(_end_iter._is_end);
assert(! _end_iter._lock);
for (typename Notes::iterator n = _notes.begin(); n != _notes.end() ;) {
typename Notes::iterator next = n;
++next;
+
if ((*n)->length() == 0) {
cerr << "WARNING: Stuck note lost: " << (*n)->note() << endl;
_notes.erase(n);
DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 remove note %2 @ %3\n", this, (int)note->note(), note->time()));
- for (typename Sequence<Time>::Notes::iterator i = note_lower_bound(note->time());
- i != _notes.end() && (*i)->time() == note->time(); ++i) {
+ typename Sequence<Time>::Notes::iterator i = note_lower_bound(note->time());
+ while (i != _notes.end() && (*i)->time() == note->time()) {
+
+ typename Sequence<Time>::Notes::iterator tmp = i;
+ ++tmp;
if (*i == note) {
+
+ NotePtr n = *i;
DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\terasing note %2 @ %3\n", this, (int)(*i)->note(), (*i)->time()));
_notes.erase (i);
- if ((*i)->note() == _lowest_note || (*i)->note() == _highest_note) {
+ if (n->note() == _lowest_note || n->note() == _highest_note) {
_lowest_note = 127;
_highest_note = 0;
erased = true;
}
+
+ i = tmp;
}
Pitches& p (pitches (note->channel()));
NotePtr search_note(new Note<Time>(0, 0, 0, note->note(), 0));
- for (typename Pitches::iterator i = p.lower_bound (search_note);
- i != p.end() && (*i)->note() == note->note(); ++i) {
- if (*i == note) {
- DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\terasing pitch %2 @ %3\n", this, (int)(*i)->note(), (*i)->time()));
- p.erase (i);
+ typename Pitches::iterator j = p.lower_bound (search_note);
+ while (j != p.end() && (*j)->note() == note->note()) {
+ typename Pitches::iterator tmp = j;
+ ++tmp;
+
+ if (*j == note) {
+ DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\terasing pitch %2 @ %3\n", this, (int)(*j)->note(), (*j)->time()));
+ p.erase (j);
}
+
+ j = tmp;
}
if (!erased) {
}
}
+template<typename Time>
+void
+Sequence<Time>::add_patch_change_unlocked (PatchChangePtr p)
+{
+ _patch_changes.insert (p);
+ if (p->id () < 0) {
+ p->set_id (Evoral::next_event_id ());
+ }
+}
+
+template<typename Time>
+void
+Sequence<Time>::remove_patch_change_unlocked (const constPatchChangePtr p)
+{
+ typename Sequence<Time>::PatchChanges::iterator i = patch_change_lower_bound (p->time ());
+ while (i != _patch_changes.end() && (*i)->time() == p->time()) {
+
+ typename Sequence<Time>::PatchChanges::iterator tmp = i;
+ ++tmp;
+
+ if (*i == p) {
+ _patch_changes.erase (i);
+ }
+
+ i = tmp;
+ }
+}
+
/** Append \a ev to model. NOT realtime safe.
*
* The timestamp of event is expected to be relative to
append_note_off_unlocked (note);
} else if (ev.is_sysex()) {
append_sysex_unlocked(ev, evid);
+ } else if (ev.is_cc() && (ev.cc_number() == MIDI_CTL_MSB_BANK || ev.cc_number() == MIDI_CTL_LSB_BANK)) {
+ /* note bank numbers in our _bank[] array, so that we can write an event when the program change arrives */
+ if (ev.cc_number() == MIDI_CTL_MSB_BANK) {
+ _bank[ev.channel()] &= ~(0x7f << 7);
+ _bank[ev.channel()] |= ev.cc_value() << 7;
+ } else {
+ _bank[ev.channel()] &= ~0x7f;
+ _bank[ev.channel()] |= ev.cc_value();
+ }
} else if (ev.is_cc()) {
append_control_unlocked(
Evoral::MIDI::ContinuousController(ev.event_type(), ev.channel(), ev.cc_number()),
ev.time(), ev.cc_value(), evid);
} else if (ev.is_pgm_change()) {
- append_control_unlocked(
- Evoral::MIDI::ProgramChange(ev.event_type(), ev.channel()),
- ev.time(), ev.pgm_number(), evid);
+ /* 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()),
/* XXX use _overlap_pitch_resolution to determine FIFO/LIFO ... */
- for (typename WriteNotes::iterator n = _write_notes[note->channel()].begin(); n != _write_notes[note->channel()].end(); ++n) {
+ for (typename WriteNotes::iterator n = _write_notes[note->channel()].begin(); n != _write_notes[note->channel()].end(); ) {
+
+ typename WriteNotes::iterator tmp = n;
+ ++tmp;
+
NotePtr nn = *n;
if (note->note() == nn->note() && nn->channel() == note->channel()) {
assert(note->time() >= nn->time());
resolved = true;
break;
}
+
+ n = tmp;
}
if (!resolved) {
_sysexes.push_back(event);
}
+template<typename Time>
+void
+Sequence<Time>::append_patch_change_unlocked (const PatchChange<Time>& ev, event_id_t id)
+{
+ PatchChangePtr p (new PatchChange<Time> (ev));
+
+ if (p->id() < 0) {
+ p->set_id (id);
+ }
+
+ _patch_changes.insert (p);
+}
+
template<typename Time>
bool
Sequence<Time>::contains (const NotePtr& note) const
return i;
}
+/** Return the earliest patch change with time >= t */
+template<typename Time>
+typename Sequence<Time>::PatchChanges::const_iterator
+Sequence<Time>::patch_change_lower_bound (Time t) const
+{
+ 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() || (*i)->time() >= t);
+ return i;
+}
+
template<typename Time>
void
Sequence<Time>::get_notes (Notes& n, NoteOperator op, uint8_t val, int chan_mask) const
projects / ardour.git / blobdiff