--- linuxsampler/trunk/src/engines/gig/Engine.cpp 2005/06/16 21:35:30 659 +++ linuxsampler/trunk/src/engines/gig/Engine.cpp 2005/09/21 14:30:43 775 @@ -29,12 +29,6 @@ #include "Engine.h" -#if defined(__APPLE__) -# include -#else -# include -#endif - namespace LinuxSampler { namespace gig { InstrumentResourceManager Engine::instruments; @@ -114,10 +108,6 @@ } pVoicePool->clear(); - pSynthesisParameters[0] = NULL; // we allocate when an audio device is connected - pBasicFilterParameters = NULL; - pMainFilterParameters = NULL; - ResetInternal(); ResetScaleTuning(); } @@ -139,9 +129,6 @@ delete pVoicePool; } if (pEventGenerator) delete pEventGenerator; - if (pMainFilterParameters) delete[] pMainFilterParameters; - if (pBasicFilterParameters) delete[] pBasicFilterParameters; - if (pSynthesisParameters[0]) free(pSynthesisParameters[0]); if (pVoiceStealingQueue) delete pVoiceStealingQueue; if (pSysexBuffer) delete pSysexBuffer; EngineFactory::Destroy(this); @@ -203,6 +190,7 @@ // delete all input events pEventQueue->init(); + pSysexBuffer->init(); } /** @@ -240,8 +228,19 @@ // FIXME: audio drivers with varying fragment sizes might be a problem here MaxFadeOutPos = MaxSamplesPerCycle - int(double(SampleRate) * CONFIG_EG_MIN_RELEASE_TIME) - 1; - if (MaxFadeOutPos < 0) - throw LinuxSamplerException("CONFIG_EG_MIN_RELEASE_TIME too big for current audio fragment size / sampling rate!"); + if (MaxFadeOutPos < 0) { + std::cerr << "gig::Engine: WARNING, CONFIG_EG_MIN_RELEASE_TIME " + << "too big for current audio fragment size & sampling rate! " + << "May lead to click sounds if voice stealing chimes in!\n" << std::flush; + // force volume ramp downs at the beginning of each fragment + MaxFadeOutPos = 0; + // lower minimum release time + const float minReleaseTime = (float) MaxSamplesPerCycle / (float) SampleRate; + for (RTList::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) { + iterVoice->EG1.CalculateFadeOutCoeff(minReleaseTime, SampleRate); + } + pVoicePool->clear(); + } // (re)create disk thread if (this->pDiskThread) { @@ -266,23 +265,6 @@ if (pEventGenerator) delete pEventGenerator; pEventGenerator = new EventGenerator(pAudioOut->SampleRate()); - // (re)allocate synthesis parameter matrix - if (pSynthesisParameters[0]) free(pSynthesisParameters[0]); - - #if defined(__APPLE__) - pSynthesisParameters[0] = (float *) malloc(Event::destination_count * sizeof(float) * pAudioOut->MaxSamplesPerCycle()); - #else - pSynthesisParameters[0] = (float *) memalign(16,(Event::destination_count * sizeof(float) * pAudioOut->MaxSamplesPerCycle())); - #endif - for (int dst = 1; dst < Event::destination_count; dst++) - pSynthesisParameters[dst] = pSynthesisParameters[dst - 1] + pAudioOut->MaxSamplesPerCycle(); - - // (re)allocate biquad filter parameter sequence - if (pBasicFilterParameters) delete[] pBasicFilterParameters; - if (pMainFilterParameters) delete[] pMainFilterParameters; - pBasicFilterParameters = new biquad_param_t[pAudioOut->MaxSamplesPerCycle()]; - pMainFilterParameters = new biquad_param_t[pAudioOut->MaxSamplesPerCycle()]; - dmsg(1,("Starting disk thread...")); pDiskThread->StartThread(); dmsg(1,("OK\n")); @@ -360,6 +342,11 @@ // update time of start and end of this audio fragment (as events' time stamps relate to this) pEventGenerator->UpdateFragmentTime(Samples); + // We only allow a maximum of CONFIG_MAX_VOICES voices to be spawned + // in each audio fragment. All subsequent request for spawning new + // voices in the same audio fragment will be ignored. + VoiceSpawnsLeft = CONFIG_MAX_VOICES; + // get all events from the engine's global input event queue which belong to the current fragment // (these are usually just SysEx messages) ImportEvents(Samples); @@ -378,15 +365,9 @@ } } - // We only allow a maximum of CONFIG_MAX_VOICES voices to be stolen - // in each audio fragment. All subsequent request for spawning new - // voices in the same audio fragment will be ignored. - VoiceTheftsLeft = CONFIG_MAX_VOICES; - // reset internal voice counter (just for statistic of active voices) ActiveVoiceCountTemp = 0; - // handle events on all engine channels for (int i = 0; i < engineChannels.size(); i++) { if (!engineChannels[i]->pInstrument) continue; // ignore if no instrument loaded @@ -482,6 +463,10 @@ * this audio fragment cycle */ void Engine::RenderActiveVoices(EngineChannel* pEngineChannel, uint Samples) { + #if !CONFIG_PROCESS_MUTED_CHANNELS + if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted + #endif + RTList::Iterator iuiKey = pEngineChannel->pActiveKeys->first(); RTList::Iterator end = pEngineChannel->pActiveKeys->end(); while (iuiKey != end) { // iterate through all active keys @@ -520,7 +505,7 @@ for (; itVoiceStealEvent != end; ++itVoiceStealEvent) { EngineChannel* pEngineChannel = (EngineChannel*) itVoiceStealEvent->pEngineChannel; Pool::Iterator itNewVoice = - LaunchVoice(pEngineChannel, itVoiceStealEvent, itVoiceStealEvent->Param.Note.Layer, itVoiceStealEvent->Param.Note.ReleaseTrigger, false); + LaunchVoice(pEngineChannel, itVoiceStealEvent, itVoiceStealEvent->Param.Note.Layer, itVoiceStealEvent->Param.Note.ReleaseTrigger, false, false); if (itNewVoice) { itNewVoice->Render(Samples); if (itNewVoice->IsActive()) ActiveVoiceCountTemp++; // still active @@ -610,6 +595,9 @@ * @param itNoteOnEvent - key, velocity and time stamp of the event */ void Engine::ProcessNoteOn(EngineChannel* pEngineChannel, Pool::Iterator& itNoteOnEvent) { + #if !CONFIG_PROCESS_MUTED_CHANNELS + if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted + #endif const int key = itNoteOnEvent->Param.Note.Key; @@ -648,7 +636,7 @@ int voicesRequired = pRegion->Layers; // now launch the required amount of voices for (int i = 0; i < voicesRequired; i++) - LaunchVoice(pEngineChannel, itNoteOnEventOnKeyList, i, false, true); + LaunchVoice(pEngineChannel, itNoteOnEventOnKeyList, i, false, true, true); } } @@ -669,8 +657,11 @@ * @param itNoteOffEvent - key, velocity and time stamp of the event */ void Engine::ProcessNoteOff(EngineChannel* pEngineChannel, Pool::Iterator& itNoteOffEvent) { - midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[itNoteOffEvent->Param.Note.Key]; + #if !CONFIG_PROCESS_MUTED_CHANNELS + if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted + #endif + midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[itNoteOffEvent->Param.Note.Key]; pKey->KeyPressed = false; // the MIDI key was now released // release voices on this key if needed @@ -692,7 +683,7 @@ // now launch the required amount of voices for (int i = 0; i < voicesRequired; i++) - LaunchVoice(pEngineChannel, itNoteOffEventOnKeyList, i, true, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples + LaunchVoice(pEngineChannel, itNoteOffEventOnKeyList, i, true, false, false); //FIXME: for the moment we don't perform voice stealing for release triggered samples } pKey->ReleaseTrigger = false; } @@ -704,15 +695,15 @@ } /** - * Moves pitchbend event from the general (input) event list to the pitch - * event list. + * Moves pitchbend event from the general (input) event list to the engine + * channel's event list. It will actually processed later by the + * respective voice. * * @param pEngineChannel - engine channel on which this event occured on * @param itPitchbendEvent - absolute pitch value and time stamp of the event */ void Engine::ProcessPitchbend(EngineChannel* pEngineChannel, Pool::Iterator& itPitchbendEvent) { pEngineChannel->Pitch = itPitchbendEvent->Param.Pitch.Pitch; // store current pitch value - itPitchbendEvent.moveToEndOf(pEngineChannel->pSynthesisEvents[Event::destination_vco]); } /** @@ -729,41 +720,175 @@ * @param VoiceStealing - if voice stealing should be performed * when there is no free voice * (optional, default = true) + * @param HandleKeyGroupConflicts - if voices should be killed due to a + * key group conflict * @returns pointer to new voice or NULL if there was no free voice or * if the voice wasn't triggered (for example when no region is * defined for the given key). */ - Pool::Iterator Engine::LaunchVoice(EngineChannel* pEngineChannel, Pool::Iterator& itNoteOnEvent, int iLayer, bool ReleaseTriggerVoice, bool VoiceStealing) { - midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key]; + Pool::Iterator Engine::LaunchVoice(EngineChannel* pEngineChannel, Pool::Iterator& itNoteOnEvent, int iLayer, bool ReleaseTriggerVoice, bool VoiceStealing, bool HandleKeyGroupConflicts) { + int MIDIKey = itNoteOnEvent->Param.Note.Key; + midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[MIDIKey]; + ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(MIDIKey); + + // if nothing defined for this key + if (!pRegion) return Pool::Iterator(); // nothing to do + + // only mark the first voice of a layered voice (group) to be in a + // key group, so the layered voices won't kill each other + int iKeyGroup = (iLayer == 0 && !ReleaseTriggerVoice) ? pRegion->KeyGroup : 0; + + // handle key group (a.k.a. exclusive group) conflicts + if (HandleKeyGroupConflicts) { + if (iKeyGroup) { // if this voice / key belongs to a key group + uint** ppKeyGroup = &pEngineChannel->ActiveKeyGroups[iKeyGroup]; + if (*ppKeyGroup) { // if there's already an active key in that key group + midi_key_info_t* pOtherKey = &pEngineChannel->pMIDIKeyInfo[**ppKeyGroup]; + // kill all voices on the (other) key + 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); + --VoiceSpawnsLeft; //FIXME: just a hack, we should better check in StealVoice() if the voice was killed due to key conflict + } + } + } + } + } + + Voice::type_t VoiceType = Voice::type_normal; + + // get current dimension values to select the right dimension region + //TODO: for stolen voices this dimension region selection block is processed twice, this should be changed + //FIXME: controller values for selecting the dimension region here are currently not sample accurate + uint DimValues[8] = { 0 }; + for (int i = pRegion->Dimensions - 1; i >= 0; i--) { + switch (pRegion->pDimensionDefinitions[i].dimension) { + case ::gig::dimension_samplechannel: + DimValues[i] = 0; //TODO: we currently ignore this dimension + break; + case ::gig::dimension_layer: + DimValues[i] = iLayer; + break; + case ::gig::dimension_velocity: + DimValues[i] = itNoteOnEvent->Param.Note.Velocity; + break; + case ::gig::dimension_channelaftertouch: + DimValues[i] = 0; //TODO: we currently ignore this dimension + break; + case ::gig::dimension_releasetrigger: + VoiceType = (ReleaseTriggerVoice) ? Voice::type_release_trigger : (!iLayer) ? Voice::type_release_trigger_required : Voice::type_normal; + DimValues[i] = (uint) ReleaseTriggerVoice; + break; + case ::gig::dimension_keyboard: + DimValues[i] = (uint) pEngineChannel->CurrentKeyDimension; + break; + case ::gig::dimension_roundrobin: + DimValues[i] = (uint) pEngineChannel->pMIDIKeyInfo[MIDIKey].RoundRobinIndex; // incremented for each note on + break; + case ::gig::dimension_random: + RandomSeed = RandomSeed * 1103515245 + 12345; // classic pseudo random number generator + DimValues[i] = (uint) RandomSeed >> (32 - pRegion->pDimensionDefinitions[i].bits); // highest bits are most random + break; + case ::gig::dimension_modwheel: + DimValues[i] = pEngineChannel->ControllerTable[1]; + break; + case ::gig::dimension_breath: + DimValues[i] = pEngineChannel->ControllerTable[2]; + break; + case ::gig::dimension_foot: + DimValues[i] = pEngineChannel->ControllerTable[4]; + break; + case ::gig::dimension_portamentotime: + DimValues[i] = pEngineChannel->ControllerTable[5]; + break; + case ::gig::dimension_effect1: + DimValues[i] = pEngineChannel->ControllerTable[12]; + break; + case ::gig::dimension_effect2: + DimValues[i] = pEngineChannel->ControllerTable[13]; + break; + case ::gig::dimension_genpurpose1: + DimValues[i] = pEngineChannel->ControllerTable[16]; + break; + case ::gig::dimension_genpurpose2: + DimValues[i] = pEngineChannel->ControllerTable[17]; + break; + case ::gig::dimension_genpurpose3: + DimValues[i] = pEngineChannel->ControllerTable[18]; + break; + case ::gig::dimension_genpurpose4: + DimValues[i] = pEngineChannel->ControllerTable[19]; + break; + case ::gig::dimension_sustainpedal: + DimValues[i] = pEngineChannel->ControllerTable[64]; + break; + case ::gig::dimension_portamento: + DimValues[i] = pEngineChannel->ControllerTable[65]; + break; + case ::gig::dimension_sostenutopedal: + DimValues[i] = pEngineChannel->ControllerTable[66]; + break; + case ::gig::dimension_softpedal: + DimValues[i] = pEngineChannel->ControllerTable[67]; + break; + case ::gig::dimension_genpurpose5: + DimValues[i] = pEngineChannel->ControllerTable[80]; + break; + case ::gig::dimension_genpurpose6: + DimValues[i] = pEngineChannel->ControllerTable[81]; + break; + case ::gig::dimension_genpurpose7: + DimValues[i] = pEngineChannel->ControllerTable[82]; + break; + case ::gig::dimension_genpurpose8: + DimValues[i] = pEngineChannel->ControllerTable[83]; + break; + case ::gig::dimension_effect1depth: + DimValues[i] = pEngineChannel->ControllerTable[91]; + break; + case ::gig::dimension_effect2depth: + DimValues[i] = pEngineChannel->ControllerTable[92]; + break; + case ::gig::dimension_effect3depth: + DimValues[i] = pEngineChannel->ControllerTable[93]; + break; + case ::gig::dimension_effect4depth: + DimValues[i] = pEngineChannel->ControllerTable[94]; + break; + case ::gig::dimension_effect5depth: + DimValues[i] = pEngineChannel->ControllerTable[95]; + break; + case ::gig::dimension_none: + std::cerr << "gig::Engine::LaunchVoice() Error: dimension=none\n" << std::flush; + break; + default: + std::cerr << "gig::Engine::LaunchVoice() Error: Unknown dimension\n" << std::flush; + } + } + ::gig::DimensionRegion* pDimRgn = pRegion->GetDimensionRegionByValue(DimValues); + + // no need to continue if sample is silent + if (!pDimRgn->pSample || !pDimRgn->pSample->SamplesTotal) return Pool::Iterator(); // allocate a new voice for the key Pool::Iterator itNewVoice = pKey->pActiveVoices->allocAppend(); if (itNewVoice) { // launch the new voice - if (itNewVoice->Trigger(pEngineChannel, itNoteOnEvent, pEngineChannel->Pitch, pEngineChannel->pInstrument, iLayer, ReleaseTriggerVoice, VoiceStealing) < 0) { + if (itNewVoice->Trigger(pEngineChannel, itNoteOnEvent, pEngineChannel->Pitch, pDimRgn, VoiceType, iKeyGroup) < 0) { dmsg(4,("Voice not triggered\n")); pKey->pActiveVoices->free(itNewVoice); } else { // on success - uint** ppKeyGroup = NULL; - if (itNewVoice->KeyGroup) { // if this voice / key belongs to a key group - ppKeyGroup = &pEngineChannel->ActiveKeyGroups[itNewVoice->KeyGroup]; - if (*ppKeyGroup) { // if there's already an active key in that key group - midi_key_info_t* pOtherKey = &pEngineChannel->pMIDIKeyInfo[**ppKeyGroup]; - // kill all voices on the (other) key - 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); - } - } - } + --VoiceSpawnsLeft; if (!pKey->Active) { // mark as active key pKey->Active = true; pKey->itSelf = pEngineChannel->pActiveKeys->allocAppend(); *pKey->itSelf = itNoteOnEvent->Param.Note.Key; } if (itNewVoice->KeyGroup) { + uint** ppKeyGroup = &pEngineChannel->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) @@ -800,7 +925,7 @@ * @returns 0 on success, a value < 0 if no active voice could be picked for voice stealing */ int Engine::StealVoice(EngineChannel* pEngineChannel, Pool::Iterator& itNoteOnEvent) { - if (!VoiceTheftsLeft) { + if (VoiceSpawnsLeft <= 0) { dmsg(1,("Max. voice thefts per audio fragment reached (you may raise CONFIG_MAX_VOICES).\n")); return -1; } @@ -819,9 +944,9 @@ midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[itNoteOnEvent->Param.Note.Key]; itSelectedVoice = pSelectedKey->pActiveVoices->first(); // proceed iterating if voice was created in this fragment cycle - while (itSelectedVoice && !itSelectedVoice->hasRendered()) ++itSelectedVoice; + while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice; // if we haven't found a voice then proceed with algorithm 'oldestkey' - if (itSelectedVoice && itSelectedVoice->hasRendered()) break; + if (itSelectedVoice && itSelectedVoice->IsStealable()) break; } // no break - intentional ! // try to pick the oldest voice on the oldest active key @@ -833,9 +958,9 @@ itSelectedVoice = this->itLastStolenVoice; do { ++itSelectedVoice; - } while (itSelectedVoice && !itSelectedVoice->hasRendered()); // proceed iterating if voice was created in this fragment cycle + } while (itSelectedVoice && !itSelectedVoice->IsStealable()); // proceed iterating if voice was created in this fragment cycle // found a "stealable" voice ? - if (itSelectedVoice && itSelectedVoice->hasRendered()) { + if (itSelectedVoice && itSelectedVoice->IsStealable()) { // remember which voice we stole, so we can simply proceed on next voice stealing this->itLastStolenVoice = itSelectedVoice; break; // selection succeeded @@ -847,9 +972,9 @@ midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey]; itSelectedVoice = pSelectedKey->pActiveVoices->first(); // proceed iterating if voice was created in this fragment cycle - while (itSelectedVoice && !itSelectedVoice->hasRendered()) ++itSelectedVoice; + while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice; // found a "stealable" voice ? - if (itSelectedVoice && itSelectedVoice->hasRendered()) { + if (itSelectedVoice && itSelectedVoice->IsStealable()) { // remember which voice on which key we stole, so we can simply proceed on next voice stealing this->iuiLastStolenKey = iuiSelectedKey; this->itLastStolenVoice = itSelectedVoice; @@ -871,7 +996,7 @@ // if we couldn't steal a voice from the same engine channel then // steal oldest voice on the oldest key from any other engine channel // (the smaller engine channel number, the higher priority) - if (!itSelectedVoice || !itSelectedVoice->hasRendered()) { + if (!itSelectedVoice || !itSelectedVoice->IsStealable()) { EngineChannel* pSelectedChannel; int iChannelIndex; // select engine channel @@ -882,44 +1007,60 @@ iChannelIndex = (pEngineChannel->iEngineIndexSelf + 1) % engineChannels.size(); pSelectedChannel = engineChannels[iChannelIndex]; } - // iterate through engine channels - while (true) { - // if we already stole in this fragment, try to proceed on same key - if (this->itLastStolenVoiceGlobally) { - itSelectedVoice = this->itLastStolenVoiceGlobally; - do { - ++itSelectedVoice; - } while (itSelectedVoice && !itSelectedVoice->hasRendered()); // proceed iterating if voice was created in this fragment cycle - // break if selection succeeded - if (itSelectedVoice && itSelectedVoice->hasRendered()) { - // remember which voice we stole, so we can simply proceed on next voice stealing - this->itLastStolenVoiceGlobally = itSelectedVoice; - break; // selection succeeded - } - } + + // if we already stole in this fragment, try to proceed on same key + if (this->itLastStolenVoiceGlobally) { + itSelectedVoice = this->itLastStolenVoiceGlobally; + do { + ++itSelectedVoice; + } while (itSelectedVoice && !itSelectedVoice->IsStealable()); // proceed iterating if voice was created in this fragment cycle + } + + #if CONFIG_DEVMODE + EngineChannel* pBegin = pSelectedChannel; // to detect endless loop + #endif // CONFIG_DEVMODE + + // did we find a 'stealable' voice? + if (itSelectedVoice && itSelectedVoice->IsStealable()) { + // remember which voice we stole, so we can simply proceed on next voice stealing + this->itLastStolenVoiceGlobally = itSelectedVoice; + } else while (true) { // iterate through engine channels // get (next) oldest key - RTList::Iterator iuiSelectedKey = (this->iuiLastStolenKey) ? ++this->iuiLastStolenKey : pSelectedChannel->pActiveKeys->first(); + RTList::Iterator iuiSelectedKey = (this->iuiLastStolenKeyGlobally) ? ++this->iuiLastStolenKeyGlobally : pSelectedChannel->pActiveKeys->first(); + this->iuiLastStolenKeyGlobally = RTList::Iterator(); // to prevent endless loop (see line above) while (iuiSelectedKey) { - midi_key_info_t* pSelectedKey = &pEngineChannel->pMIDIKeyInfo[*iuiSelectedKey]; + midi_key_info_t* pSelectedKey = &pSelectedChannel->pMIDIKeyInfo[*iuiSelectedKey]; itSelectedVoice = pSelectedKey->pActiveVoices->first(); // proceed iterating if voice was created in this fragment cycle - while (itSelectedVoice && !itSelectedVoice->hasRendered()) ++itSelectedVoice; + while (itSelectedVoice && !itSelectedVoice->IsStealable()) ++itSelectedVoice; // found a "stealable" voice ? - if (itSelectedVoice && itSelectedVoice->hasRendered()) { + if (itSelectedVoice && itSelectedVoice->IsStealable()) { // remember which voice on which key on which engine channel we stole, so we can simply proceed on next voice stealing this->iuiLastStolenKeyGlobally = iuiSelectedKey; this->itLastStolenVoiceGlobally = itSelectedVoice; this->pLastStolenChannel = pSelectedChannel; - break; // selection succeeded + goto stealable_voice_found; // selection succeeded } ++iuiSelectedKey; // get next key on current engine channel } // get next engine channel iChannelIndex = (iChannelIndex + 1) % engineChannels.size(); pSelectedChannel = engineChannels[iChannelIndex]; + + #if CONFIG_DEVMODE + if (pSelectedChannel == pBegin) { + dmsg(1,("FATAL ERROR: voice stealing endless loop!\n")); + dmsg(1,("VoiceSpawnsLeft=%d.\n", VoiceSpawnsLeft)); + dmsg(1,("Exiting.\n")); + exit(-1); + } + #endif // CONFIG_DEVMODE } } + // jump point if a 'stealable' voice was found + stealable_voice_found: + #if CONFIG_DEVMODE if (!itSelectedVoice->IsActive()) { dmsg(1,("gig::Engine: ERROR, tried to steal a voice which was not active !!!\n")); @@ -930,7 +1071,7 @@ // now kill the selected voice itSelectedVoice->Kill(itNoteOnEvent); - --VoiceTheftsLeft; + --VoiceSpawnsLeft; return 0; // success } @@ -999,27 +1140,29 @@ // update controller value in the engine channel's controller table pEngineChannel->ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value; - // move event from the unsorted event list to the control change event list - Pool::Iterator itControlChangeEventOnCCList = itControlChangeEvent.moveToEndOf(pEngineChannel->pCCEvents); - - switch (itControlChangeEventOnCCList->Param.CC.Controller) { + switch (itControlChangeEvent->Param.CC.Controller) { case 7: { // volume //TODO: not sample accurate yet - pEngineChannel->GlobalVolume = (float) itControlChangeEventOnCCList->Param.CC.Value / 127.0f; + pEngineChannel->GlobalVolume = (float) itControlChangeEvent->Param.CC.Value / 127.0f; + pEngineChannel->bStatusChanged = true; // engine channel status has changed, so set notify flag break; } case 10: { // panpot //TODO: not sample accurate yet - const int pan = (int) itControlChangeEventOnCCList->Param.CC.Value - 64; + const int pan = (int) itControlChangeEvent->Param.CC.Value - 64; pEngineChannel->GlobalPanLeft = 1.0f - float(RTMath::Max(pan, 0)) / 63.0f; pEngineChannel->GlobalPanRight = 1.0f - float(RTMath::Min(pan, 0)) / -64.0f; break; } case 64: { // sustain - if (itControlChangeEventOnCCList->Param.CC.Value >= 64 && !pEngineChannel->SustainPedal) { + if (itControlChangeEvent->Param.CC.Value >= 64 && !pEngineChannel->SustainPedal) { dmsg(4,("PEDAL DOWN\n")); pEngineChannel->SustainPedal = true; + #if !CONFIG_PROCESS_MUTED_CHANNELS + if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted + #endif + // cancel release process of voices if necessary RTList::Iterator iuiKey = pEngineChannel->pActiveKeys->first(); for (; iuiKey; ++iuiKey) { @@ -1027,17 +1170,21 @@ if (!pKey->KeyPressed) { RTList::Iterator itNewEvent = pKey->pEvents->allocAppend(); if (itNewEvent) { - *itNewEvent = *itControlChangeEventOnCCList; // copy event to the key's own event list + *itNewEvent = *itControlChangeEvent; // copy event to the key's own event list itNewEvent->Type = Event::type_cancel_release; // transform event type } else dmsg(1,("Event pool emtpy!\n")); } } } - if (itControlChangeEventOnCCList->Param.CC.Value < 64 && pEngineChannel->SustainPedal) { + if (itControlChangeEvent->Param.CC.Value < 64 && pEngineChannel->SustainPedal) { dmsg(4,("PEDAL UP\n")); pEngineChannel->SustainPedal = false; + #if !CONFIG_PROCESS_MUTED_CHANNELS + if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted + #endif + // release voices if their respective key is not pressed RTList::Iterator iuiKey = pEngineChannel->pActiveKeys->first(); for (; iuiKey; ++iuiKey) { @@ -1045,7 +1192,7 @@ if (!pKey->KeyPressed) { RTList::Iterator itNewEvent = pKey->pEvents->allocAppend(); if (itNewEvent) { - *itNewEvent = *itControlChangeEventOnCCList; // copy event to the key's own event list + *itNewEvent = *itControlChangeEvent; // copy event to the key's own event list itNewEvent->Type = Event::type_release; // transform event type } else dmsg(1,("Event pool emtpy!\n")); @@ -1059,7 +1206,7 @@ // Channel Mode Messages case 120: { // all sound off - KillAllVoices(pEngineChannel, itControlChangeEventOnCCList); + KillAllVoices(pEngineChannel, itControlChangeEvent); break; } case 121: { // reset all controllers @@ -1067,7 +1214,7 @@ break; } case 123: { // all notes off - ReleaseAllVoices(pEngineChannel, itControlChangeEventOnCCList); + ReleaseAllVoices(pEngineChannel, itControlChangeEvent); break; } } @@ -1205,25 +1352,11 @@ RTList::Iterator itVoicesEnd = pKey->pActiveVoices->end(); for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key itVoice->Kill(itKillEvent); + --VoiceSpawnsLeft; //FIXME: just a temporary workaround, we should check the cause in StealVoice() instead } } } - /** - * Initialize the parameter sequence for the modulation destination given by - * by 'dst' with the constant value given by val. - */ - void Engine::ResetSynthesisParameters(Event::destination_t dst, float val) { - int maxsamples = pAudioOutputDevice->MaxSamplesPerCycle(); - float* m = &pSynthesisParameters[dst][0]; - for (int i = 0; i < maxsamples; i += 4) { - m[i] = val; - m[i+1] = val; - m[i+2] = val; - m[i+3] = val; - } - } - uint Engine::VoiceCount() { return ActiveVoiceCount; } @@ -1261,7 +1394,7 @@ } String Engine::Version() { - String s = "$Revision: 1.42 $"; + String s = "$Revision: 1.54 $"; return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword }