--- linuxsampler/trunk/src/engines/gig/EngineChannel.cpp 2005/06/22 22:09:28 675 +++ linuxsampler/trunk/src/engines/gig/EngineChannel.cpp 2005/08/16 17:14:25 738 @@ -30,7 +30,6 @@ pEngine = NULL; pInstrument = NULL; pEvents = NULL; // we allocate when we retrieve the right Engine object - pCCEvents = NULL; // we allocate when we retrieve the right Engine object pEventQueue = new RingBuffer(CONFIG_MAX_EVENTS_PER_FRAGMENT, 0); pActiveKeys = new Pool(128); for (uint i = 0; i < 128; i++) { @@ -42,9 +41,6 @@ pMIDIKeyInfo[i].VoiceTheftsQueued = 0; pMIDIKeyInfo[i].RoundRobinIndex = 0; } - for (uint i = 0; i < Event::destination_count; i++) { - pSynthesisEvents[i] = NULL; // we allocate when we retrieve the right Engine object - } InstrumentIdx = -1; InstrumentStat = -1; AudioDeviceChannelLeft = -1; @@ -261,11 +257,7 @@ } pEngine = Engine::AcquireEngine(this, pAudioOut); ResetInternal(); - pEvents = new RTList(pEngine->pEventPool); - pCCEvents = new RTList(pEngine->pEventPool); - for (uint i = 0; i < Event::destination_count; i++) { - pSynthesisEvents[i] = new RTList(pEngine->pEventPool); - } + pEvents = new RTList(pEngine->pEventPool); for (uint i = 0; i < 128; i++) { pMIDIKeyInfo[i].pActiveVoices = new RTList(pEngine->pVoicePool); pMIDIKeyInfo[i].pEvents = new RTList(pEngine->pEventPool); @@ -283,10 +275,6 @@ delete pEvents; pEvents = NULL; } - if (pCCEvents) { - delete pCCEvents; - pCCEvents = NULL; - } for (uint i = 0; i < 128; i++) { if (pMIDIKeyInfo[i].pActiveVoices) { delete pMIDIKeyInfo[i].pActiveVoices; @@ -297,12 +285,6 @@ pMIDIKeyInfo[i].pEvents = NULL; } } - for (uint i = 0; i < Event::destination_count; i++) { - if (pSynthesisEvents[i]) { - delete pSynthesisEvents[i]; - pSynthesisEvents[i] = NULL; - } - } Engine* oldEngine = pEngine; AudioOutputDevice* oldAudioDevice = pEngine->pAudioOutputDevice; pEngine = NULL; @@ -440,10 +422,6 @@ void EngineChannel::ClearEventLists() { pEvents->clear(); - pCCEvents->clear(); - for (uint i = 0; i < Event::destination_count; i++) { - pSynthesisEvents[i]->clear(); - } // empty MIDI key specific event lists { RTList::Iterator iuiKey = pActiveKeys->first();