/[svn]/linuxsampler/trunk/src/engines/sf2/Engine.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/engines/sf2/Engine.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3033 by schoenebeck, Tue Oct 18 20:13:08 2016 UTC revision 3034 by schoenebeck, Mon Oct 31 00:05:00 2016 UTC
# Line 84  namespace LinuxSampler { namespace sf2 { Line 84  namespace LinuxSampler { namespace sf2 {
84      ) {      ) {
85          EngineChannel* pChannel = static_cast<EngineChannel*>(pEngineChannel);          EngineChannel* pChannel = static_cast<EngineChannel*>(pEngineChannel);
86    
87          uint8_t  chan     = pChannel->MidiChannel();          //uint8_t  chan     = pChannel->MidiChannel();
88          int      key      = itNoteOnEvent->Param.Note.Key;          int      key      = itNoteOnEvent->Param.Note.Key;
89          uint8_t  vel      = itNoteOnEvent->Param.Note.Velocity;          uint8_t  vel      = itNoteOnEvent->Param.Note.Velocity;
90          int      bend     = pChannel->Pitch;          //int      bend     = pChannel->Pitch;
91          uint8_t  chanaft  = pChannel->ControllerTable[128];          //uint8_t  chanaft  = pChannel->ControllerTable[128];
92          uint8_t* cc       = pChannel->ControllerTable;          //uint8_t* cc       = pChannel->ControllerTable;
93    
94          NoteIterator itNote = GetNotePool()->fromID(itNoteOnEvent->Param.Note.ID);          NoteIterator itNote = GetNotePool()->fromID(itNoteOnEvent->Param.Note.ID);
95          if (!itNote) {          if (!itNote) {
# Line 138  namespace LinuxSampler { namespace sf2 { Line 138  namespace LinuxSampler { namespace sf2 {
138          bool                          HandleKeyGroupConflicts          bool                          HandleKeyGroupConflicts
139      ) {      ) {
140          EngineChannel* pChannel = static_cast<EngineChannel*>(pEngineChannel);          EngineChannel* pChannel = static_cast<EngineChannel*>(pEngineChannel);
141          int key = itNoteOnEvent->Param.Note.Key;          //int key = itNoteOnEvent->Param.Note.Key;
142          //EngineChannel::MidiKey* pKey = &pChannel->pMIDIKeyInfo[key];          //EngineChannel::MidiKey* pKey = &pChannel->pMIDIKeyInfo[key];
143    
144          Voice::type_t VoiceType = Voice::type_normal;          Voice::type_t VoiceType = Voice::type_normal;
Legend:
Removed from v.3033  
changed lines
  Added in v.3034
  ViewVC Help
Powered by ViewVC