--- linuxsampler/trunk/src/engines/gig/Engine.cpp 2005/06/21 13:33:19 669 +++ linuxsampler/trunk/src/engines/gig/Engine.cpp 2005/09/26 10:17:00 781 @@ -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")); @@ -481,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 @@ -609,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; @@ -668,12 +657,15 @@ * @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 - if (pKey->Active && !pEngineChannel->SustainPedal) { + if (pKey->Active && ShouldReleaseVoice(pEngineChannel, itNoteOffEvent->Param.Note.Key)) { itNoteOffEvent->Type = Event::type_release; // transform event type // move event to the key's own event list @@ -703,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]); } /** @@ -1148,28 +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 * CONFIG_GLOBAL_ATTENUATION; 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) { - dmsg(4,("PEDAL DOWN\n")); + if (itControlChangeEvent->Param.CC.Value >= 64 && !pEngineChannel->SustainPedal) { + dmsg(4,("DAMPER (RIGHT) 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) { @@ -1177,25 +1170,69 @@ 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) { - dmsg(4,("PEDAL UP\n")); + if (itControlChangeEvent->Param.CC.Value < 64 && pEngineChannel->SustainPedal) { + dmsg(4,("DAMPER (RIGHT) 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) { midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey]; - if (!pKey->KeyPressed) { + if (!pKey->KeyPressed && ShouldReleaseVoice(pEngineChannel, *iuiKey)) { 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")); + } + } + } + break; + } + case 66: { // sostenuto + if (itControlChangeEvent->Param.CC.Value >= 64 && !pEngineChannel->SostenutoPedal) { + dmsg(4,("SOSTENUTO (CENTER) PEDAL DOWN\n")); + pEngineChannel->SostenutoPedal = true; + + #if !CONFIG_PROCESS_MUTED_CHANNELS + if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted + #endif + + SostenutoKeyCount = 0; + // Remeber the pressed keys + RTList::Iterator iuiKey = pEngineChannel->pActiveKeys->first(); + for (; iuiKey; ++iuiKey) { + midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey]; + if (pKey->KeyPressed && SostenutoKeyCount < 128) SostenutoKeys[SostenutoKeyCount++] = *iuiKey; + } + } + if (itControlChangeEvent->Param.CC.Value < 64 && pEngineChannel->SostenutoPedal) { + dmsg(4,("SOSTENUTO (CENTER) PEDAL UP\n")); + pEngineChannel->SostenutoPedal = false; + + #if !CONFIG_PROCESS_MUTED_CHANNELS + if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted + #endif + + // release voices if the damper pedal is up and their respective key is not pressed + for (int i = 0; i < SostenutoKeyCount; i++) { + midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[SostenutoKeys[i]]; + if (!pKey->KeyPressed && !pEngineChannel->SustainPedal) { + RTList::Iterator itNewEvent = pKey->pEvents->allocAppend(); + if (itNewEvent) { + *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")); @@ -1209,7 +1246,7 @@ // Channel Mode Messages case 120: { // all sound off - KillAllVoices(pEngineChannel, itControlChangeEventOnCCList); + KillAllVoices(pEngineChannel, itControlChangeEvent); break; } case 121: { // reset all controllers @@ -1217,7 +1254,7 @@ break; } case 123: { // all notes off - ReleaseAllVoices(pEngineChannel, itControlChangeEventOnCCList); + ReleaseAllVoices(pEngineChannel, itControlChangeEvent); break; } } @@ -1361,18 +1398,21 @@ } /** - * 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; + * Determines whether the specified voice should be released. + * + * @param pEngineChannel - The engine channel on which the voice should be checked + * @param Key - The key number + * @returns true if the specified should be released, false otherwise. + */ + bool Engine::ShouldReleaseVoice(EngineChannel* pEngineChannel, int Key) { + if (pEngineChannel->SustainPedal) return false; + + if (pEngineChannel->SostenutoPedal) { + for (int i = 0; i < SostenutoKeyCount; i++) + if (Key == SostenutoKeys[i]) return false; } + + return true; } uint Engine::VoiceCount() { @@ -1412,7 +1452,7 @@ } String Engine::Version() { - String s = "$Revision: 1.47 $"; + String s = "$Revision: 1.56 $"; return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword }