/[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 2071 by persson, Sun Feb 28 07:28:56 2010 UTC revision 2072 by persson, Sat Mar 20 11:37:52 2010 UTC
# Line 4  Line 4 
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck    *   *   Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck    *
6   *   Copyright (C) 2005-2009 Christian Schoenebeck                         *   *   Copyright (C) 2005-2009 Christian Schoenebeck                         *
7   *   Copyright (C) 2009 Grigor Iliev                                       *   *   Copyright (C) 2009-2010 Grigor Iliev                                  *
8   *                                                                         *   *                                                                         *
9   *   This program is free software; you can redistribute it and/or modify  *   *   This program is free software; you can redistribute it and/or modify  *
10   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 86  namespace LinuxSampler { namespace sfz { Line 86  namespace LinuxSampler { namespace sfz {
86                 TRIGGER_LEGATO : TRIGGER_FIRST);                 TRIGGER_LEGATO : TRIGGER_FIRST);
87    
88          pChannel->regionsTemp = pChannel->pInstrument->GetRegionsOnKey (          pChannel->regionsTemp = pChannel->pInstrument->GetRegionsOnKey (
89              chan, key, vel, bend, 0, chanaft, 0, 0, 0, trig, cc,              chan, key, vel, bend, 0, chanaft, 0, 0, Random(), trig, cc,
90              0.0f, 1, pChannel->PressedKeys, pChannel->LastKeySwitch, pChannel->LastKey              0.0f, pChannel->PressedKeys, pChannel->LastKeySwitch, pChannel->LastKey
91          );          );
92    
93          for (int i = 0; i < pChannel->regionsTemp.size(); i++) {          for (int i = 0; i < pChannel->regionsTemp.size(); i++) {
# Line 115  namespace LinuxSampler { namespace sfz { Line 115  namespace LinuxSampler { namespace sfz {
115          ::sfz::trigger_t trig = TRIGGER_RELEASE;          ::sfz::trigger_t trig = TRIGGER_RELEASE;
116    
117          pChannel->regionsTemp = pChannel->pInstrument->GetRegionsOnKey (          pChannel->regionsTemp = pChannel->pInstrument->GetRegionsOnKey (
118              chan, key, vel, bend, 0, chanaft, 0, 0, 0, trig, cc, 0.0f, 1, NULL, 0, 0              chan, key, vel, bend, 0, chanaft, 0, 0, Random(), trig, cc, 0.0f, NULL, 0, 0
119          );          );
120    
121          // now launch the required amount of voices          // now launch the required amount of voices
# 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.5 $";          String s = "$Revision: 1.6 $";
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.2071  
changed lines
  Added in v.2072
  ViewVC Help
Powered by ViewVC