/[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 3218 by schoenebeck, Mon Oct 31 00:05:00 2016 UTC revision 3219 by schoenebeck, Thu May 25 21:49:40 2017 UTC
# Line 82  namespace LinuxSampler { namespace sf2 { Line 82  namespace LinuxSampler { namespace sf2 {
82          RTList<Event>::Iterator&     itNoteOnEvent,          RTList<Event>::Iterator&     itNoteOnEvent,
83          bool                         HandleKeyGroupConflicts          bool                         HandleKeyGroupConflicts
84      ) {      ) {
85            NoteIterator itNote = GetNotePool()->fromID(itNoteOnEvent->Param.Note.ID);
86            if (!itNote) {
87                dmsg(1,("sf2::Engine: No Note object for triggering new voices!\n"));
88                return;
89            }
90          EngineChannel* pChannel = static_cast<EngineChannel*>(pEngineChannel);          EngineChannel* pChannel = static_cast<EngineChannel*>(pEngineChannel);
91    
92          //uint8_t  chan     = pChannel->MidiChannel();          //uint8_t  chan     = pChannel->MidiChannel();
93          int      key      = itNoteOnEvent->Param.Note.Key;          int      key      = itNote->cause.Param.Note.Key; //itNoteOnEvent->Param.Note.Key; <- using note object instead, since note nr might been modified by script
94          uint8_t  vel      = itNoteOnEvent->Param.Note.Velocity;          uint8_t  vel      = itNote->cause.Param.Note.Velocity; //itNoteOnEvent->Param.Note.Velocity; <- using note object instead, since velocity might been modified by script
95          //int      bend     = pChannel->Pitch;          //int      bend     = pChannel->Pitch;
96          //uint8_t  chanaft  = pChannel->ControllerTable[128];          //uint8_t  chanaft  = pChannel->ControllerTable[128];
97          //uint8_t* cc       = pChannel->ControllerTable;          //uint8_t* cc       = pChannel->ControllerTable;
98    
         NoteIterator itNote = GetNotePool()->fromID(itNoteOnEvent->Param.Note.ID);  
         if (!itNote) {  
             dmsg(1,("sf2::Engine: No Note object for triggering new voices!\n"));  
             return;  
         }  
   
99          int layer = 0;          int layer = 0;
100          ::sf2::Query query(*pChannel->pInstrument);          ::sf2::Query query(*pChannel->pInstrument);
101          query.key = key;          query.key = key;
Legend:
Removed from v.3218  
changed lines
  Added in v.3219
  ViewVC Help
Powered by ViewVC