smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-12 01:26:31 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused ifdef gunk.

Browse source
This commit is contained in:
David Robillard 2015-02-19 15:20:19 -05:00
parent 76f6ff178e
commit 6a033a093b
1 changed files with 25 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libs/evoral/src/Sequence.cpp
View file

@ -624,9 +624,6 @@ Sequence<Time>::end_write (StuckNoteOption option, Time when)
DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 : end_write (%2 notes) delete stuck option %3 @ %4\n", this, _notes.size(), option, when)); DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 : end_write (%2 notes) delete stuck option %3 @ %4\n", this, _notes.size(), option, when));
#ifdef PERCUSSIVE_IGNORE_NOTE_OFFS
if (!_percussive) {
#endif
for (typename Notes::iterator n = _notes.begin(); n != _notes.end() ;) { for (typename Notes::iterator n = _notes.begin(); n != _notes.end() ;) {
typename Notes::iterator next = n; typename Notes::iterator next = n;
++next; ++next;
@ -654,9 +651,6 @@ Sequence<Time>::end_write (StuckNoteOption option, Time when)
n = next; n = next;
} }
#ifdef PERCUSSIVE_IGNORE_NOTE_OFFS
}
#endif
for (int i = 0; i < 16; ++i) { for (int i = 0; i < 16; ++i) {
_write_notes[i].clear(); _write_notes[i].clear();
@ -971,20 +965,10 @@ Sequence<Time>::append_note_on_unlocked (NotePtr note, event_id_t evid)
add_note_unlocked (note); add_note_unlocked (note);
#ifdef PERCUSSIVE_IGNORE_NOTE_OFFS DEBUG_TRACE (DEBUG::Sequence, string_compose ("Appending active note on %1 channel %2\n",
if (!_percussive) {
#endif
DEBUG_TRACE (DEBUG::Sequence, string_compose ("Sustained: Appending active note on %1 channel %2\n",
(unsigned)(uint8_t)note->note(), note->channel())); (unsigned)(uint8_t)note->note(), note->channel()));
_write_notes[note->channel()].insert (note); _write_notes[note->channel()].insert (note);
#ifdef PERCUSSIVE_IGNORE_NOTE_OFFS
} else {
DEBUG_TRACE(DEBUG::Sequence, "Percussive: NOT appending active note on\n");
}
#endif
} }
template<typename Time> template<typename Time>
@ -1007,13 +991,6 @@ Sequence<Time>::append_note_off_unlocked (NotePtr note)
_edited = true; _edited = true;
#ifdef PERCUSSIVE_IGNORE_NOTE_OFFS
if (_percussive) {
DEBUG_TRACE(DEBUG::Sequence, "Sequence Ignoring note off (percussive mode)\n");
return;
}
#endif
bool resolved = false; bool resolved = false;
/* _write_notes is sorted earliest-latest, so this will find the first matching note (FIFO) that /* _write_notes is sorted earliest-latest, so this will find the first matching note (FIFO) that