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

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

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

revision 2062 by persson, Tue Feb 23 18:32:31 2010 UTC revision 2063 by persson, Sun Feb 28 07:28:56 2010 UTC
# Line 146  namespace LinuxSampler { namespace sfz { Line 146  namespace LinuxSampler { namespace sfz {
146          // only mark the first voice of a layered voice (group) to be in a          // only mark the first voice of a layered voice (group) to be in a
147          // key group, so the layered voices won't kill each other          // key group, so the layered voices won't kill each other
148          int iKeyGroup = (iLayer == 0 && !ReleaseTriggerVoice) ? pRgn->group : 0;          int iKeyGroup = (iLayer == 0 && !ReleaseTriggerVoice) ? pRgn->group : 0;
149          if (HandleKeyGroupConflicts) pChannel->HandleKeyGroupConflicts(iKeyGroup, itNoteOnEvent);          if (HandleKeyGroupConflicts) pChannel->HandleKeyGroupConflicts(iKeyGroup, itNoteOnEvent, pRgn->off_mode == ::sfz::OFF_NORMAL);
150    
151          // allocate a new voice for the key          // allocate a new voice for the key
152          itNewVoice = pKey->pActiveVoices->allocAppend();          itNewVoice = pKey->pActiveVoices->allocAppend();
# Line 173  namespace LinuxSampler { namespace sfz { Line 173  namespace LinuxSampler { namespace sfz {
173      }      }
174    
175      String Engine::Version() {      String Engine::Version() {
176          String s = "$Revision: 1.4 $";          String s = "$Revision: 1.5 $";
177          return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword          return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword
178      }      }
179    
Legend:
Removed from v.2062  
changed lines
  Added in v.2063
  ViewVC Help
Powered by ViewVC