--- linuxsampler/trunk/src/engines/EngineBase.h	2009/11/03 19:27:42	2027
+++ linuxsampler/trunk/src/engines/EngineBase.h	2010/08/12 15:36:15	2115
@@ -3,8 +3,8 @@
  *   LinuxSampler - modular, streaming capable sampler                     *
  *                                                                         *
  *   Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck    *
- *   Copyright (C) 2005-2009 Christian Schoenebeck                         *
- *   Copyright (C) 2009 Grigor Iliev                                       *
+ *   Copyright (C) 2005-2008 Christian Schoenebeck                         *
+ *   Copyright (C) 2009-2010 Christian Schoenebeck and Grigor Iliev        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -299,7 +299,7 @@
                     // lower minimum release time
                     const float minReleaseTime = (float) MaxSamplesPerCycle / (float) SampleRate;
                     for (VoiceIterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
-                        iterVoice->EG1.CalculateFadeOutCoeff(minReleaseTime, SampleRate);
+                        iterVoice->pEG1->CalculateFadeOutCoeff(minReleaseTime, SampleRate);
                     }
                     pVoicePool->clear();
                 }
@@ -1064,7 +1064,7 @@
                             VoiceIterator itVoiceToBeKilled = pOtherKey->pActiveVoices->first();
                             VoiceIterator end               = pOtherKey->pActiveVoices->end();
                             for (; itVoiceToBeKilled != end; ++itVoiceToBeKilled) {
-                                if (itVoiceToBeKilled->Type != Voice::type_release_trigger)
+                                if (!(itVoiceToBeKilled->Type & Voice::type_release_trigger))
                                     itVoiceToBeKilled->Kill(itNoteOnEventOnKeyList);
                             }
                         }
@@ -1096,7 +1096,10 @@
                     pKey->pEvents->free(itNoteOnEventOnKeyList);
 
                 if (!pChannel->SoloMode || pChannel->PortamentoPos < 0.0f) pChannel->PortamentoPos = (float) key;
-                pKey->RoundRobinIndex++;
+                if (pKey->pRoundRobinIndex) {
+                    (*pKey->pRoundRobinIndex)++; // counter specific for the key or region
+                    pChannel->RoundRobinIndex++; // common counter for the channel
+                }
                 pChannel->listeners.PostProcessNoteOn(key, vel);
             }
 
@@ -1198,7 +1201,7 @@
                             VoiceIterator itVoiceToBeKilled = pKey->pActiveVoices->first();
                             VoiceIterator end               = pKey->pActiveVoices->end();
                             for (; itVoiceToBeKilled != end; ++itVoiceToBeKilled) {
-                                if (itVoiceToBeKilled->Type != Voice::type_release_trigger)
+                                if (!(itVoiceToBeKilled->Type & Voice::type_release_trigger))
                                     itVoiceToBeKilled->Kill(itNoteOffEventOnKeyList);
                             }
                         }
@@ -1331,11 +1334,7 @@
                             pKey->itSelf = pChannel->pActiveKeys->allocAppend();
                             *pKey->itSelf = itNoteOnEvent->Param.Note.Key;
                         }
-                        if (itNewVoice->KeyGroup) {
-                            uint** ppKeyGroup = &pChannel->ActiveKeyGroups[itNewVoice->KeyGroup];
-                            *ppKeyGroup = &*pKey->itSelf; // put key as the (new) active key to its key group
-                        }
-                        if (itNewVoice->Type == Voice::type_release_trigger_required) pKey->ReleaseTrigger = true; // mark key for the need of release triggered voice(s)
+                        if (itNewVoice->Type & Voice::type_release_trigger_required) pKey->ReleaseTrigger = true; // mark key for the need of release triggered voice(s)
                         return 0; // success
                     }
                 }