diff options
| author | Hans Baier <hansfbaier@googlemail.com> | 2008-05-23 02:43:09 +0000 |
|---|---|---|
| committer | Hans Baier <hansfbaier@googlemail.com> | 2008-05-23 02:43:09 +0000 |
| commit | 5e856e94ac677a212920d1513966f97cc244eea1 (patch) | |
| tree | c1b41a26a039ca7549a826a00e32885acf1f8537 | |
| parent | 8c743c2c0c6ce55eecffb16aeeb6b844b586c437 (diff) | |
* fixed: wrong conversion from double for pitch bender in MidiModel::control_to_midi_event
git-svn-id: svn://localhost/ardour2/branches/3.0@3404 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/midi_model.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index 5d327cd2d7..58363c4b1c 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -180,9 +180,9 @@ const MidiModel::const_iterator& MidiModel::const_iterator::operator++() assert(_event->buffer() && _event->buffer()[0] != '\0'); - cerr << "const_iterator::operator++: _event type:" << hex << "0x" << int(_event->type()) + /*cerr << "const_iterator::operator++: _event type:" << hex << "0x" << int(_event->type()) << " buffer: 0x" << int(_event->buffer()[0]) << " 0x" << int(_event->buffer()[1]) - << " 0x" << int(_event->buffer()[2]) << endl; + << " 0x" << int(_event->buffer()[2]) << endl;*/ if (! (_event->is_note() || _event->is_cc() || _event->is_pgm_change() || _event->is_pitch_bender() || _event->is_channel_aftertouch()) ) { cerr << "FAILED event buffer: " << hex << int(_event->buffer()[0]) << int(_event->buffer()[1]) << int(_event->buffer()[2]) << endl; @@ -399,8 +399,8 @@ MidiModel::control_to_midi_event(boost::shared_ptr<MIDI::Event>& ev, const MidiC ev->time() = iter.x; ev->realloc(3); ev->buffer()[0] = MIDI_CMD_BENDER + iter.automation_list->parameter().channel(); - ev->buffer()[1] = ((Byte)iter.y) & 0x7F; // LSB - ev->buffer()[2] = (((Byte)iter.y) >> 7) & 0x7F; // MSB + ev->buffer()[1] = uint16_t(iter.y) & 0x7F; // LSB + ev->buffer()[2] = (uint16_t(iter.y) >> 7) & 0x7F; // MSB break; case MidiChannelAftertouchAutomation: |