--- linuxsampler/trunk/src/engines/gig/Engine.cpp 2004/09/19 14:12:55 246 +++ linuxsampler/trunk/src/engines/gig/Engine.cpp 2004/10/16 17:38:03 287 @@ -23,6 +23,7 @@ #include #include "DiskThread.h" #include "Voice.h" +#include "EGADSR.h" #include "Engine.h" @@ -39,24 +40,24 @@ pEventGenerator = NULL; pSysexBuffer = new RingBuffer(SYSEX_BUFFER_SIZE, 0); pEventQueue = new RingBuffer(MAX_EVENTS_PER_FRAGMENT, 0); - pEventPool = new RTELMemoryPool(MAX_EVENTS_PER_FRAGMENT); - pVoicePool = new RTELMemoryPool(MAX_AUDIO_VOICES); - pActiveKeys = new RTELMemoryPool(128); - pEvents = new RTEList(pEventPool); - pCCEvents = new RTEList(pEventPool); + pEventPool = new Pool(MAX_EVENTS_PER_FRAGMENT); + pVoicePool = new Pool(MAX_AUDIO_VOICES); + pActiveKeys = new Pool(128); + pVoiceStealingQueue = new RTList(pEventPool); + pEvents = new RTList(pEventPool); + pCCEvents = new RTList(pEventPool); for (uint i = 0; i < Event::destination_count; i++) { - pSynthesisEvents[i] = new RTEList(pEventPool); + pSynthesisEvents[i] = new RTList(pEventPool); } for (uint i = 0; i < 128; i++) { - pMIDIKeyInfo[i].pActiveVoices = new RTEList(pVoicePool); + pMIDIKeyInfo[i].pActiveVoices = new RTList(pVoicePool); pMIDIKeyInfo[i].KeyPressed = false; pMIDIKeyInfo[i].Active = false; pMIDIKeyInfo[i].ReleaseTrigger = false; - pMIDIKeyInfo[i].pSelf = NULL; - pMIDIKeyInfo[i].pEvents = new RTEList(pEventPool); + pMIDIKeyInfo[i].pEvents = new RTList(pEventPool); } - for (Voice* pVoice = pVoicePool->alloc(); pVoice; pVoice = pVoicePool->alloc()) { - pVoice->SetEngine(this); + for (RTList::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) { + iterVoice->SetEngine(this); } pVoicePool->clear(); @@ -99,6 +100,7 @@ if (pMainFilterParameters) delete[] pMainFilterParameters; if (pBasicFilterParameters) delete[] pBasicFilterParameters; if (pSynthesisParameters[0]) delete[] pSynthesisParameters[0]; + if (pVoiceStealingQueue) delete pVoiceStealingQueue; } void Engine::Enable() { @@ -157,6 +159,11 @@ ActiveVoiceCountMax = 0; GlobalVolume = 1.0; + // reset voice stealing parameters + itLastStolenVoice = RTList::Iterator(); + iuiLastStolenKey = RTList::Iterator(); + pVoiceStealingQueue->clear(); + // reset to normal chromatic scale (means equal temper) memset(&ScaleTuning[0], 0x00, 12); @@ -170,7 +177,7 @@ pMIDIKeyInfo[i].KeyPressed = false; pMIDIKeyInfo[i].Active = false; pMIDIKeyInfo[i].ReleaseTrigger = false; - pMIDIKeyInfo[i].pSelf = NULL; + pMIDIKeyInfo[i].itSelf = Pool::Iterator(); } // reset all key groups @@ -178,8 +185,8 @@ for (; iter != ActiveKeyGroups.end(); iter++) iter->second = NULL; // reset all voices - for (Voice* pVoice = pVoicePool->alloc(); pVoice; pVoice = pVoicePool->alloc()) { - pVoice->Reset(); + for (RTList::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) { + iterVoice->Reset(); } pVoicePool->clear(); @@ -307,6 +314,11 @@ this->MaxSamplesPerCycle = pAudioOutputDevice->MaxSamplesPerCycle(); this->SampleRate = pAudioOutputDevice->SampleRate(); + // FIXME: audio drivers with varying fragment sizes might be a problem here + MaxFadeOutPos = MaxSamplesPerCycle - int(double(SampleRate) * EG_MIN_RELEASE_TIME) - 1; + if (MaxFadeOutPos < 0) + throw LinuxSamplerException("EG_MIN_RELEASE_TIME in EGADSR.h to big for current audio fragment size / sampling rate!"); + // (re)create disk thread if (this->pDiskThread) { this->pDiskThread->StopThread(); @@ -318,8 +330,8 @@ exit(EXIT_FAILURE); } - for (Voice* pVoice = pVoicePool->alloc(); pVoice; pVoice = pVoicePool->alloc()) { - pVoice->pDiskThread = this->pDiskThread; + for (RTList::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) { + iterVoice->pDiskThread = this->pDiskThread; dmsg(3,("d")); } pVoicePool->clear(); @@ -344,8 +356,8 @@ pDiskThread->StartThread(); dmsg(1,("OK\n")); - for (Voice* pVoice = pVoicePool->first(); pVoice; pVoice = pVoicePool->next()) { - if (!pVoice->pDiskThread) { + for (RTList::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) { + if (!iterVoice->pDiskThread) { dmsg(0,("Engine -> voice::trigger: !pDiskThread\n")); exit(EXIT_FAILURE); } @@ -392,12 +404,19 @@ for (uint i = 0; i < Event::destination_count; i++) { pSynthesisEvents[i]->clear(); } + { + RTList::Iterator iuiKey = pActiveKeys->first(); + RTList::Iterator end = pActiveKeys->end(); + for(; iuiKey != end; ++iuiKey) { + pMIDIKeyInfo[*iuiKey].pEvents->clear(); // free all events on the key + } + } // read and copy events from input queue Event event = pEventGenerator->CreateEvent(); while (true) { - if (!pEventQueue->pop(&event)) break; - pEvents->alloc_assign(event); + if (!pEventQueue->pop(&event) || pEvents->poolIsEmpty()) break; + *pEvents->allocAppend() = event; } @@ -406,59 +425,104 @@ // process events - Event* pNextEvent = pEvents->first(); - while (pNextEvent) { - Event* pEvent = pNextEvent; - pEvents->set_current(pEvent); - pNextEvent = pEvents->next(); - switch (pEvent->Type) { - case Event::type_note_on: - dmsg(5,("Engine: Note on received\n")); - ProcessNoteOn(pEvent); - break; - case Event::type_note_off: - dmsg(5,("Engine: Note off received\n")); - ProcessNoteOff(pEvent); - break; - case Event::type_control_change: - dmsg(5,("Engine: MIDI CC received\n")); - ProcessControlChange(pEvent); - break; - case Event::type_pitchbend: - dmsg(5,("Engine: Pitchbend received\n")); - ProcessPitchbend(pEvent); - break; - case Event::type_sysex: - dmsg(5,("Engine: Sysex received\n")); - ProcessSysex(pEvent); - break; + { + RTList::Iterator itEvent = pEvents->first(); + RTList::Iterator end = pEvents->end(); + for (; itEvent != end; ++itEvent) { + switch (itEvent->Type) { + case Event::type_note_on: + dmsg(5,("Engine: Note on received\n")); + ProcessNoteOn(itEvent); + break; + case Event::type_note_off: + dmsg(5,("Engine: Note off received\n")); + ProcessNoteOff(itEvent); + break; + case Event::type_control_change: + dmsg(5,("Engine: MIDI CC received\n")); + ProcessControlChange(itEvent); + break; + case Event::type_pitchbend: + dmsg(5,("Engine: Pitchbend received\n")); + ProcessPitchbend(itEvent); + break; + case Event::type_sysex: + dmsg(5,("Engine: Sysex received\n")); + ProcessSysex(itEvent); + break; + } } } - // render audio from all active voices int active_voices = 0; - uint* piKey = pActiveKeys->first(); - while (piKey) { // iterate through all active keys - midi_key_info_t* pKey = &pMIDIKeyInfo[*piKey]; - pActiveKeys->set_current(piKey); - piKey = pActiveKeys->next(); - - Voice* pVoiceNext = pKey->pActiveVoices->first(); - while (pVoiceNext) { // iterate through all voices on this key - // already get next voice on key - Voice* pVoice = pVoiceNext; - pKey->pActiveVoices->set_current(pVoice); - pVoiceNext = pKey->pActiveVoices->next(); - - // now render current voice - pVoice->Render(Samples); - if (pVoice->IsActive()) active_voices++; // still active - else { // voice reached end, is now inactive - KillVoiceImmediately(pVoice); // remove voice from the list of active voices + + // render audio from all active voices + { + RTList::Iterator iuiKey = pActiveKeys->first(); + RTList::Iterator end = pActiveKeys->end(); + while (iuiKey != end) { // iterate through all active keys + midi_key_info_t* pKey = &pMIDIKeyInfo[*iuiKey]; + ++iuiKey; + + RTList::Iterator itVoice = pKey->pActiveVoices->first(); + RTList::Iterator itVoicesEnd = pKey->pActiveVoices->end(); + for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key + // now render current voice + itVoice->Render(Samples); + if (itVoice->IsActive()) active_voices++; // still active + else { // voice reached end, is now inactive + FreeVoice(itVoice); // remove voice from the list of active voices + } } } - pKey->pEvents->clear(); // free all events on the key + } + + + // now render all postponed voices from voice stealing + { + RTList::Iterator itVoiceStealEvent = pVoiceStealingQueue->first(); + RTList::Iterator end = pVoiceStealingQueue->end(); + for (; itVoiceStealEvent != end; ++itVoiceStealEvent) { + Pool::Iterator itNewVoice = LaunchVoice(itVoiceStealEvent, itVoiceStealEvent->Param.Note.Layer, itVoiceStealEvent->Param.Note.ReleaseTrigger, false); + if (itNewVoice) { + for (; itNewVoice; itNewVoice = itNewVoice->itChildVoice) { + itNewVoice->Render(Samples); + if (itNewVoice->IsActive()) active_voices++; // still active + else { // voice reached end, is now inactive + FreeVoice(itNewVoice); // remove voice from the list of active voices + } + } + } + else dmsg(1,("gig::Engine: ERROR, voice stealing didn't work out!\n")); + } + } + // reset voice stealing for the new fragment + pVoiceStealingQueue->clear(); + itLastStolenVoice = RTList::Iterator(); + iuiLastStolenKey = RTList::Iterator(); + + + // free all keys which have no active voices left + { + RTList::Iterator iuiKey = pActiveKeys->first(); + RTList::Iterator end = pActiveKeys->end(); + while (iuiKey != end) { // iterate through all active keys + midi_key_info_t* pKey = &pMIDIKeyInfo[*iuiKey]; + ++iuiKey; + if (pKey->pActiveVoices->isEmpty()) FreeKey(pKey); + #if DEVMODE + else { // FIXME: should be removed before the final release (purpose: just a sanity check for debugging) + RTList::Iterator itVoice = pKey->pActiveVoices->first(); + RTList::Iterator itVoicesEnd = pKey->pActiveVoices->end(); + for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key + if (itVoice->itKillEvent) { + dmsg(1,("gig::Engine: ERROR, killed voice survived !!!\n")); + } + } + } + #endif // DEVMODE + } } @@ -567,28 +631,28 @@ /** * Assigns and triggers a new voice for the respective MIDI key. * - * @param pNoteOnEvent - key, velocity and time stamp of the event + * @param itNoteOnEvent - key, velocity and time stamp of the event */ - void Engine::ProcessNoteOn(Event* pNoteOnEvent) { - midi_key_info_t* pKey = &pMIDIKeyInfo[pNoteOnEvent->Param.Note.Key]; + void Engine::ProcessNoteOn(Pool::Iterator& itNoteOnEvent) { + midi_key_info_t* pKey = &pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key]; pKey->KeyPressed = true; // the MIDI key was now pressed down // cancel release process of voices on this key if needed if (pKey->Active && !SustainPedal) { - Event* pCancelReleaseEvent = pKey->pEvents->alloc(); - if (pCancelReleaseEvent) { - *pCancelReleaseEvent = *pNoteOnEvent; - pCancelReleaseEvent->Type = Event::type_cancel_release; // transform event type + RTList::Iterator itCancelReleaseEvent = pKey->pEvents->allocAppend(); + if (itCancelReleaseEvent) { + *itCancelReleaseEvent = *itNoteOnEvent; // copy event + itCancelReleaseEvent->Type = Event::type_cancel_release; // transform event type } else dmsg(1,("Event pool emtpy!\n")); } - // allocate and trigger a new voice for the key - LaunchVoice(pNoteOnEvent); + // move note on event to the key's own event list + RTList::Iterator itNoteOnEventOnKeyList = itNoteOnEvent.moveToEndOf(pKey->pEvents); - // finally move note on event to the key's own event list - pEvents->move(pNoteOnEvent, pKey->pEvents); + // allocate and trigger a new voice for the key + LaunchVoice(itNoteOnEventOnKeyList, 0, false, true); } /** @@ -597,37 +661,37 @@ * sustain pedal will be released or voice turned inactive by itself (e.g. * due to completion of sample playback). * - * @param pNoteOffEvent - key, velocity and time stamp of the event + * @param itNoteOffEvent - key, velocity and time stamp of the event */ - void Engine::ProcessNoteOff(Event* pNoteOffEvent) { - midi_key_info_t* pKey = &pMIDIKeyInfo[pNoteOffEvent->Param.Note.Key]; + void Engine::ProcessNoteOff(Pool::Iterator& itNoteOffEvent) { + midi_key_info_t* pKey = &pMIDIKeyInfo[itNoteOffEvent->Param.Note.Key]; pKey->KeyPressed = false; // the MIDI key was now released // release voices on this key if needed if (pKey->Active && !SustainPedal) { - pNoteOffEvent->Type = Event::type_release; // transform event type + itNoteOffEvent->Type = Event::type_release; // transform event type } + // move event to the key's own event list + RTList::Iterator itNoteOffEventOnKeyList = itNoteOffEvent.moveToEndOf(pKey->pEvents); + // spawn release triggered voice(s) if needed if (pKey->ReleaseTrigger) { - LaunchVoice(pNoteOffEvent, 0, true); + LaunchVoice(itNoteOffEventOnKeyList, 0, true, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples pKey->ReleaseTrigger = false; } - - // move event to the key's own event list - pEvents->move(pNoteOffEvent, pKey->pEvents); } /** * Moves pitchbend event from the general (input) event list to the pitch * event list. * - * @param pPitchbendEvent - absolute pitch value and time stamp of the event + * @param itPitchbendEvent - absolute pitch value and time stamp of the event */ - void Engine::ProcessPitchbend(Event* pPitchbendEvent) { - this->Pitch = pPitchbendEvent->Param.Pitch.Pitch; // store current pitch value - pEvents->move(pPitchbendEvent, pSynthesisEvents[Event::destination_vco]); + void Engine::ProcessPitchbend(Pool::Iterator& itPitchbendEvent) { + this->Pitch = itPitchbendEvent->Param.Pitch.Pitch; // store current pitch value + itPitchbendEvent.moveToEndOf(pSynthesisEvents[Event::destination_vco]); } /** @@ -635,131 +699,250 @@ * called by the ProcessNoteOn() method and by the voices itself * (e.g. to spawn further voices on the same key for layered sounds). * - * @param pNoteOnEvent - key, velocity and time stamp of the event + * @param itNoteOnEvent - key, velocity and time stamp of the event * @param iLayer - layer index for the new voice (optional - only * in case of layered sounds of course) * @param ReleaseTriggerVoice - if new voice is a release triggered voice * (optional, default = false) + * @param VoiceStealing - if voice stealing should be performed + * when there is no free voice + * (optional, default = true) + * @returns pointer to new voice or NULL if there was no free voice or + * if an error occured while trying to trigger the new voice */ - void Engine::LaunchVoice(Event* pNoteOnEvent, int iLayer, bool ReleaseTriggerVoice) { - midi_key_info_t* pKey = &pMIDIKeyInfo[pNoteOnEvent->Param.Note.Key]; + Pool::Iterator Engine::LaunchVoice(Pool::Iterator& itNoteOnEvent, int iLayer, bool ReleaseTriggerVoice, bool VoiceStealing) { + midi_key_info_t* pKey = &pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key]; // allocate a new voice for the key - Voice* pNewVoice = pKey->pActiveVoices->alloc(); - if (pNewVoice) { + Pool::Iterator itNewVoice = pKey->pActiveVoices->allocAppend(); + if (itNewVoice) { // launch the new voice - if (pNewVoice->Trigger(pNoteOnEvent, this->Pitch, this->pInstrument, iLayer, ReleaseTriggerVoice) < 0) { + if (itNewVoice->Trigger(itNoteOnEvent, this->Pitch, this->pInstrument, iLayer, ReleaseTriggerVoice, VoiceStealing) < 0) { dmsg(1,("Triggering new voice failed!\n")); - pKey->pActiveVoices->free(pNewVoice); + pKey->pActiveVoices->free(itNewVoice); } else { // on success uint** ppKeyGroup = NULL; - if (pNewVoice->KeyGroup) { // if this voice / key belongs to a key group - ppKeyGroup = &ActiveKeyGroups[pNewVoice->KeyGroup]; + if (itNewVoice->KeyGroup) { // if this voice / key belongs to a key group + ppKeyGroup = &ActiveKeyGroups[itNewVoice->KeyGroup]; if (*ppKeyGroup) { // if there's already an active key in that key group midi_key_info_t* pOtherKey = &pMIDIKeyInfo[**ppKeyGroup]; // kill all voices on the (other) key - Voice* pVoiceToBeKilled = pOtherKey->pActiveVoices->first(); - while (pVoiceToBeKilled) { - Voice* pVoiceToBeKilledNext = pOtherKey->pActiveVoices->next(); - if (pVoiceToBeKilled->Type != Voice::type_release_trigger) pVoiceToBeKilled->Kill(pNoteOnEvent); - pOtherKey->pActiveVoices->set_current(pVoiceToBeKilled); - pVoiceToBeKilled = pVoiceToBeKilledNext; + RTList::Iterator itVoiceToBeKilled = pOtherKey->pActiveVoices->first(); + RTList::Iterator end = pOtherKey->pActiveVoices->end(); + for (; itVoiceToBeKilled != end; ++itVoiceToBeKilled) { + if (itVoiceToBeKilled->Type != Voice::type_release_trigger) itVoiceToBeKilled->Kill(itNoteOnEvent); } } } if (!pKey->Active) { // mark as active key pKey->Active = true; - pKey->pSelf = pActiveKeys->alloc(); - *pKey->pSelf = pNoteOnEvent->Param.Note.Key; + pKey->itSelf = pActiveKeys->allocAppend(); + *pKey->itSelf = itNoteOnEvent->Param.Note.Key; + } + if (itNewVoice->KeyGroup) { + *ppKeyGroup = &*pKey->itSelf; // put key as the (new) active key to its key group } - if (pNewVoice->KeyGroup) { - *ppKeyGroup = pKey->pSelf; // 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) + return itNewVoice; // success + } + } + else if (VoiceStealing) { + // first, get total amount of required voices (dependant on amount of layers) + ::gig::Region* pRegion = pInstrument->GetRegion(itNoteOnEvent->Param.Note.Key); + if (!pRegion) return Pool::Iterator(); // nothing defined for this MIDI key, so no voice needed + int voicesRequired = pRegion->Layers; + + // now steal the (remaining) amount of voices + for (int i = iLayer; i < voicesRequired; i++) + StealVoice(itNoteOnEvent); + + // put note-on event into voice-stealing queue, so it will be reprocessed after killed voice died + RTList::Iterator itStealEvent = pVoiceStealingQueue->allocAppend(); + if (itStealEvent) { + *itStealEvent = *itNoteOnEvent; // copy event + itStealEvent->Param.Note.Layer = iLayer; + itStealEvent->Param.Note.ReleaseTrigger = ReleaseTriggerVoice; + } + else dmsg(1,("Voice stealing queue full!\n")); + } + + return Pool::Iterator(); // no free voice or error + } + + /** + * Will be called by LaunchVoice() method in case there are no free + * voices left. This method will select and kill one old voice for + * voice stealing and postpone the note-on event until the selected + * voice actually died. + * + * @param itNoteOnEvent - key, velocity and time stamp of the event + */ + void Engine::StealVoice(Pool::Iterator& itNoteOnEvent) { + if (!pEventPool->poolIsEmpty()) { + + RTList::Iterator iuiOldestKey; + RTList::Iterator itOldestVoice; + + // Select one voice for voice stealing + switch (VOICE_STEAL_ALGORITHM) { + + // try to pick the oldest voice on the key where the new + // voice should be spawned, if there is no voice on that + // key, or no voice left to kill there, then procceed with + // 'oldestkey' algorithm + case voice_steal_algo_keymask: { + midi_key_info_t* pOldestKey = &pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key]; + if (itLastStolenVoice) { + itOldestVoice = itLastStolenVoice; + ++itOldestVoice; + } + else { // no voice stolen in this audio fragment cycle yet + itOldestVoice = pOldestKey->pActiveVoices->first(); + } + if (itOldestVoice) { + iuiOldestKey = pOldestKey->itSelf; + break; // selection succeeded + } + } // no break - intentional ! + + // try to pick the oldest voice on the oldest active key + // (caution: must stay after 'keymask' algorithm !) + case voice_steal_algo_oldestkey: { + if (itLastStolenVoice) { + midi_key_info_t* pOldestKey = &pMIDIKeyInfo[*iuiLastStolenKey]; + itOldestVoice = itLastStolenVoice; + ++itOldestVoice; + if (!itOldestVoice) { + iuiOldestKey = iuiLastStolenKey; + ++iuiOldestKey; + if (iuiOldestKey) { + midi_key_info_t* pOldestKey = &pMIDIKeyInfo[*iuiOldestKey]; + itOldestVoice = pOldestKey->pActiveVoices->first(); + } + else { + dmsg(1,("gig::Engine: Warning, too less voices, even for voice stealing! - Better recompile with higher MAX_AUDIO_VOICES.\n")); + return; + } + } + else iuiOldestKey = iuiLastStolenKey; + } + else { // no voice stolen in this audio fragment cycle yet + iuiOldestKey = pActiveKeys->first(); + midi_key_info_t* pOldestKey = &pMIDIKeyInfo[*iuiOldestKey]; + itOldestVoice = pOldestKey->pActiveVoices->first(); + } + break; + } + + // don't steal anything + case voice_steal_algo_none: + default: { + dmsg(1,("No free voice (voice stealing disabled)!\n")); + return; } - if (pNewVoice->Type == Voice::type_release_trigger_required) pKey->ReleaseTrigger = true; // mark key for the need of release triggered voice(s) } + + //FIXME: can be removed, just a sanity check for debugging + if (!itOldestVoice->IsActive()) dmsg(1,("gig::Engine: ERROR, tried to steal a voice which was not active !!!\n")); + + // now kill the selected voice + itOldestVoice->Kill(itNoteOnEvent); + // remember which voice on which key we stole, so we can simply proceed for the next voice stealing + this->itLastStolenVoice = itOldestVoice; + this->iuiLastStolenKey = iuiOldestKey; } - else std::cerr << "No free voice!" << std::endl << std::flush; + else dmsg(1,("Event pool emtpy!\n")); } /** - * Immediately kills the voice given with pVoice (no matter if sustain is - * pressed or not) and removes it from the MIDI key's list of active voice. - * This method will e.g. be called if a voice went inactive by itself. + * Removes the given voice from the MIDI key's list of active voices. + * This method will be called when a voice went inactive, e.g. because + * it finished to playback its sample, finished its release stage or + * just was killed. * - * @param pVoice - points to the voice to be killed + * @param itVoice - points to the voice to be freed */ - void Engine::KillVoiceImmediately(Voice* pVoice) { - if (pVoice) { - if (pVoice->IsActive()) pVoice->KillImmediately(); + void Engine::FreeVoice(Pool::Iterator& itVoice) { + if (itVoice) { + midi_key_info_t* pKey = &pMIDIKeyInfo[itVoice->MIDIKey]; - midi_key_info_t* pKey = &pMIDIKeyInfo[pVoice->MIDIKey]; + uint keygroup = itVoice->KeyGroup; // free the voice object - pVoicePool->free(pVoice); + pVoicePool->free(itVoice); - // check if there are no voices left on the MIDI key and update the key info if so - if (pKey->pActiveVoices->is_empty()) { - if (pVoice->KeyGroup) { // if voice / key belongs to a key group - uint** ppKeyGroup = &ActiveKeyGroups[pVoice->KeyGroup]; - if (*ppKeyGroup == pKey->pSelf) *ppKeyGroup = NULL; // remove key from key group - } - pKey->Active = false; - pActiveKeys->free(pKey->pSelf); // remove key from list of active keys - pKey->pSelf = NULL; - pKey->ReleaseTrigger = false; - dmsg(3,("Key has no more voices now\n")); + // if no other voices left and member of a key group, remove from key group + if (pKey->pActiveVoices->isEmpty() && keygroup) { + uint** ppKeyGroup = &ActiveKeyGroups[keygroup]; + if (*ppKeyGroup == &*pKey->itSelf) *ppKeyGroup = NULL; // remove key from key group } } - else std::cerr << "Couldn't release voice! (pVoice == NULL)\n" << std::flush; + else std::cerr << "Couldn't release voice! (!itVoice)\n" << std::flush; + } + + /** + * Called when there's no more voice left on a key, this call will + * update the key info respectively. + * + * @param pKey - key which is now inactive + */ + void Engine::FreeKey(midi_key_info_t* pKey) { + if (pKey->pActiveVoices->isEmpty()) { + pKey->Active = false; + pActiveKeys->free(pKey->itSelf); // remove key from list of active keys + pKey->itSelf = RTList::Iterator(); + pKey->ReleaseTrigger = false; + pKey->pEvents->clear(); + dmsg(3,("Key has no more voices now\n")); + } + else dmsg(1,("gig::Engine: Oops, tried to free a key which contains voices.\n")); } /** * Reacts on supported control change commands (e.g. pitch bend wheel, * modulation wheel, aftertouch). * - * @param pControlChangeEvent - controller, value and time stamp of the event + * @param itControlChangeEvent - controller, value and time stamp of the event */ - void Engine::ProcessControlChange(Event* pControlChangeEvent) { - dmsg(4,("Engine::ContinuousController cc=%d v=%d\n", pControlChangeEvent->Param.CC.Controller, pControlChangeEvent->Param.CC.Value)); + void Engine::ProcessControlChange(Pool::Iterator& itControlChangeEvent) { + dmsg(4,("Engine::ContinuousController cc=%d v=%d\n", itControlChangeEvent->Param.CC.Controller, itControlChangeEvent->Param.CC.Value)); - switch (pControlChangeEvent->Param.CC.Controller) { + switch (itControlChangeEvent->Param.CC.Controller) { case 64: { - if (pControlChangeEvent->Param.CC.Value >= 64 && !SustainPedal) { + if (itControlChangeEvent->Param.CC.Value >= 64 && !SustainPedal) { dmsg(4,("PEDAL DOWN\n")); SustainPedal = true; // cancel release process of voices if necessary - uint* piKey = pActiveKeys->first(); - if (piKey) { - pControlChangeEvent->Type = Event::type_cancel_release; // transform event type - while (piKey) { - midi_key_info_t* pKey = &pMIDIKeyInfo[*piKey]; - pActiveKeys->set_current(piKey); - piKey = pActiveKeys->next(); + RTList::Iterator iuiKey = pActiveKeys->first(); + if (iuiKey) { + itControlChangeEvent->Type = Event::type_cancel_release; // transform event type + while (iuiKey) { + midi_key_info_t* pKey = &pMIDIKeyInfo[*iuiKey]; + ++iuiKey; if (!pKey->KeyPressed) { - Event* pNewEvent = pKey->pEvents->alloc(); - if (pNewEvent) *pNewEvent = *pControlChangeEvent; // copy event to the key's own event list + RTList::Iterator itNewEvent = pKey->pEvents->allocAppend(); + if (itNewEvent) *itNewEvent = *itControlChangeEvent; // copy event to the key's own event list else dmsg(1,("Event pool emtpy!\n")); } } } } - if (pControlChangeEvent->Param.CC.Value < 64 && SustainPedal) { + if (itControlChangeEvent->Param.CC.Value < 64 && SustainPedal) { dmsg(4,("PEDAL UP\n")); SustainPedal = false; // release voices if their respective key is not pressed - uint* piKey = pActiveKeys->first(); - if (piKey) { - pControlChangeEvent->Type = Event::type_release; // transform event type - while (piKey) { - midi_key_info_t* pKey = &pMIDIKeyInfo[*piKey]; - pActiveKeys->set_current(piKey); - piKey = pActiveKeys->next(); + RTList::Iterator iuiKey = pActiveKeys->first(); + if (iuiKey) { + itControlChangeEvent->Type = Event::type_release; // transform event type + while (iuiKey) { + midi_key_info_t* pKey = &pMIDIKeyInfo[*iuiKey]; + ++iuiKey; if (!pKey->KeyPressed) { - Event* pNewEvent = pKey->pEvents->alloc(); - if (pNewEvent) *pNewEvent = *pControlChangeEvent; // copy event to the key's own event list + RTList::Iterator itNewEvent = pKey->pEvents->allocAppend(); + if (itNewEvent) *itNewEvent = *itControlChangeEvent; // copy event to the key's own event list else dmsg(1,("Event pool emtpy!\n")); } } @@ -770,18 +953,18 @@ } // update controller value in the engine's controller table - ControllerTable[pControlChangeEvent->Param.CC.Controller] = pControlChangeEvent->Param.CC.Value; + ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value; // move event from the unsorted event list to the control change event list - pEvents->move(pControlChangeEvent, pCCEvents); + itControlChangeEvent.moveToEndOf(pCCEvents); } /** * Reacts on MIDI system exclusive messages. * - * @param pSysexEvent - sysex data size and time stamp of the sysex event + * @param itSysexEvent - sysex data size and time stamp of the sysex event */ - void Engine::ProcessSysex(Event* pSysexEvent) { + void Engine::ProcessSysex(Pool::Iterator& itSysexEvent) { RingBuffer::NonVolatileReader reader = pSysexBuffer->get_non_volatile_reader(); uint8_t exclusive_status, id; @@ -829,7 +1012,7 @@ } free_sysex_data: // finally free sysex data - pSysexBuffer->increment_read_ptr(pSysexEvent->Param.Sysex.Size); + pSysexBuffer->increment_read_ptr(itSysexEvent->Param.Sysex.Size); } /** @@ -963,7 +1146,7 @@ } String Engine::Version() { - String s = "$Revision: 1.13 $"; + String s = "$Revision: 1.17 $"; return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword }