diff options
author | David Robillard <d@drobilla.net> | 2014-11-30 23:14:03 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-11-30 23:56:20 -0500 |
commit | 0ffeaa6d6a28b2e676939eaabb6ee239482b8a5a (patch) | |
tree | 38d7943229cdfd1f25a3705e2d9f888109fd8817 /libs/evoral/src | |
parent | 7eb4e5d22bf43fa1e6bc44dfa33d8732f744c2dd (diff) |
Remove braindead Parameter inheritance abuse.
Diffstat (limited to 'libs/evoral/src')
-rw-r--r-- | libs/evoral/src/Sequence.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index 5a7fd171b4..fca4879322 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -35,7 +35,6 @@ #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" @@ -936,20 +935,20 @@ Sequence<Time>::append(const Event<Time>& event, event_id_t evid) } } 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()); |