--- linuxsampler/trunk/src/engines/gig/Engine.cpp 2005/07/20 21:43:23 705 +++ linuxsampler/trunk/src/engines/gig/Engine.cpp 2006/01/14 14:07:47 829 @@ -3,7 +3,7 @@ * LinuxSampler - modular, streaming capable sampler * * * * Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck * - * Copyright (C) 2005 Christian Schoenebeck * + * Copyright (C) 2005, 2006 Christian Schoenebeck * * * * 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 * @@ -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(); } /** @@ -249,7 +237,7 @@ // lower minimum release time const float minReleaseTime = (float) MaxSamplesPerCycle / (float) SampleRate; for (RTList::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) { - iterVoice->pEG1->CalculateFadeOutCoeff(minReleaseTime, SampleRate); + iterVoice->EG1.CalculateFadeOutCoeff(minReleaseTime, SampleRate); } pVoicePool->clear(); } @@ -277,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")); @@ -492,7 +463,9 @@ * 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(); @@ -622,9 +595,40 @@ * @param itNoteOnEvent - key, velocity and time stamp of the event */ void Engine::ProcessNoteOn(EngineChannel* pEngineChannel, Pool::Iterator& itNoteOnEvent) { - if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted + #if !CONFIG_PROCESS_MUTED_CHANNELS + if (pEngineChannel->GetMute()) return; // skip if sampler channel is muted + #endif const int key = itNoteOnEvent->Param.Note.Key; + midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[key]; + + // move note on event to the key's own event list + RTList::Iterator itNoteOnEventOnKeyList = itNoteOnEvent.moveToEndOf(pKey->pEvents); + + // if Solo Mode then kill all already active voices + if (pEngineChannel->SoloMode) { + Pool::Iterator itYoungestKey = pEngineChannel->pActiveKeys->last(); + if (itYoungestKey) { + const int iYoungestKey = *itYoungestKey; + const midi_key_info_t* pOtherKey = &pEngineChannel->pMIDIKeyInfo[iYoungestKey]; + if (pOtherKey->Active) { + // get final portamento position of currently active voice + if (pEngineChannel->PortamentoMode) { + RTList::Iterator itVoice = pOtherKey->pActiveVoices->last(); + if (itVoice) itVoice->UpdatePortamentoPos(itNoteOnEventOnKeyList); + } + // 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(itNoteOnEventOnKeyList); + } + } + } + // set this key as 'currently active solo key' + pEngineChannel->SoloKey = key; + } // Change key dimension value if key is in keyswitching area { @@ -634,25 +638,20 @@ (pInstrument->DimensionKeyRange.high - pInstrument->DimensionKeyRange.low + 1); } - midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[key]; - pKey->KeyPressed = true; // the MIDI key was now pressed down - pKey->Velocity = itNoteOnEvent->Param.Note.Velocity; - pKey->NoteOnTime = FrameTime + itNoteOnEvent->FragmentPos(); // will be used to calculate note length + pKey->Velocity = itNoteOnEventOnKeyList->Param.Note.Velocity; + pKey->NoteOnTime = FrameTime + itNoteOnEventOnKeyList->FragmentPos(); // will be used to calculate note length // cancel release process of voices on this key if needed if (pKey->Active && !pEngineChannel->SustainPedal) { RTList::Iterator itCancelReleaseEvent = pKey->pEvents->allocAppend(); if (itCancelReleaseEvent) { - *itCancelReleaseEvent = *itNoteOnEvent; // copy event + *itCancelReleaseEvent = *itNoteOnEventOnKeyList; // copy event itCancelReleaseEvent->Type = Event::type_cancel_release; // transform event type } else dmsg(1,("Event pool emtpy!\n")); } - // move note on event to the key's own event list - RTList::Iterator itNoteOnEventOnKeyList = itNoteOnEvent.moveToEndOf(pKey->pEvents); - // allocate and trigger new voice(s) for the key { // first, get total amount of required voices (dependant on amount of layers) @@ -669,6 +668,7 @@ if (!pKey->Active && !pKey->VoiceTheftsQueued) pKey->pEvents->free(itNoteOnEventOnKeyList); + if (!pEngineChannel->SoloMode || pEngineChannel->PortamentoPos < 0.0f) pEngineChannel->PortamentoPos = (float) key; pKey->RoundRobinIndex++; } @@ -682,17 +682,81 @@ * @param itNoteOffEvent - key, velocity and time stamp of the event */ void Engine::ProcessNoteOff(EngineChannel* pEngineChannel, Pool::Iterator& itNoteOffEvent) { + #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]; + const int iKey = itNoteOffEvent->Param.Note.Key; + midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[iKey]; pKey->KeyPressed = false; // the MIDI key was now released - // release voices on this key if needed - if (pKey->Active && !pEngineChannel->SustainPedal) { - itNoteOffEvent->Type = Event::type_release; // transform event type + // move event to the key's own event list + RTList::Iterator itNoteOffEventOnKeyList = itNoteOffEvent.moveToEndOf(pKey->pEvents); + + bool bShouldRelease = pKey->Active && ShouldReleaseVoice(pEngineChannel, itNoteOffEventOnKeyList->Param.Note.Key); + + // in case Solo Mode is enabled, kill all voices on this key and respawn a voice on the highest pressed key (if any) + if (pEngineChannel->SoloMode) { //TODO: this feels like too much code just for handling solo mode :P + bool bOtherKeysPressed = false; + if (iKey == pEngineChannel->SoloKey) { + pEngineChannel->SoloKey = -1; + // if there's still a key pressed down, respawn a voice (group) on the highest key + for (int i = 127; i > 0; i--) { + midi_key_info_t* pOtherKey = &pEngineChannel->pMIDIKeyInfo[i]; + if (pOtherKey->KeyPressed) { + bOtherKeysPressed = true; + // make the other key the new 'currently active solo key' + pEngineChannel->SoloKey = i; + // get final portamento position of currently active voice + if (pEngineChannel->PortamentoMode) { + RTList::Iterator itVoice = pKey->pActiveVoices->first(); + if (itVoice) itVoice->UpdatePortamentoPos(itNoteOffEventOnKeyList); + } + // create a pseudo note on event + RTList::Iterator itPseudoNoteOnEvent = pOtherKey->pEvents->allocAppend(); + if (itPseudoNoteOnEvent) { + // copy event + *itPseudoNoteOnEvent = *itNoteOffEventOnKeyList; + // transform event to a note on event + itPseudoNoteOnEvent->Type = Event::type_note_on; + itPseudoNoteOnEvent->Param.Note.Key = i; + itPseudoNoteOnEvent->Param.Note.Velocity = pOtherKey->Velocity; + // allocate and trigger new voice(s) for the other key + { + // first, get total amount of required voices (dependant on amount of layers) + ::gig::Region* pRegion = pEngineChannel->pInstrument->GetRegion(i); + if (pRegion) { + int voicesRequired = pRegion->Layers; + // now launch the required amount of voices + for (int iLayer = 0; iLayer < voicesRequired; iLayer++) + LaunchVoice(pEngineChannel, itPseudoNoteOnEvent, iLayer, false, true, false); + } + } + // if neither a voice was spawned or postponed then remove note on event from key again + if (!pOtherKey->Active && !pOtherKey->VoiceTheftsQueued) + pOtherKey->pEvents->free(itPseudoNoteOnEvent); + + } else dmsg(1,("Could not respawn voice, no free event left\n")); + break; // done + } + } + } + if (bOtherKeysPressed) { + if (pKey->Active) { // kill all voices on this key + bShouldRelease = false; // no need to release, as we kill it here + RTList::Iterator itVoiceToBeKilled = pKey->pActiveVoices->first(); + RTList::Iterator end = pKey->pActiveVoices->end(); + for (; itVoiceToBeKilled != end; ++itVoiceToBeKilled) { + if (itVoiceToBeKilled->Type != Voice::type_release_trigger) + itVoiceToBeKilled->Kill(itNoteOffEventOnKeyList); + } + } + } else pEngineChannel->PortamentoPos = -1.0f; + } - // move event to the key's own event list - RTList::Iterator itNoteOffEventOnKeyList = itNoteOffEvent.moveToEndOf(pKey->pEvents); + // if no solo mode (the usual case) or if solo mode and no other key pressed, then release voices on this key if needed + if (bShouldRelease) { + itNoteOffEventOnKeyList->Type = Event::type_release; // transform event type // spawn release triggered voice(s) if needed if (pKey->ReleaseTrigger) { @@ -710,23 +774,23 @@ } pKey->ReleaseTrigger = false; } - - // if neither a voice was spawned or postponed then remove note off event from key again - if (!pKey->Active && !pKey->VoiceTheftsQueued) - pKey->pEvents->free(itNoteOffEventOnKeyList); } + + // if neither a voice was spawned or postponed on this key then remove note off event from key again + if (!pKey->Active && !pKey->VoiceTheftsQueued) + pKey->pEvents->free(itNoteOffEventOnKeyList); } /** - * 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]); } /** @@ -1163,29 +1227,32 @@ // 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 5: { // portamento time + pEngineChannel->PortamentoTime = (float) itControlChangeEvent->Param.CC.Value / 127.0f * (float) CONFIG_PORTAMENTO_TIME_MAX + (float) CONFIG_PORTAMENTO_TIME_MIN; + break; + } 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(); @@ -1194,27 +1261,74 @@ 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 = *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 65: { // portamento on / off + KillAllVoices(pEngineChannel, itControlChangeEvent); + pEngineChannel->PortamentoMode = itControlChangeEvent->Param.CC.Value >= 64; + 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 = *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")); @@ -1228,7 +1342,7 @@ // Channel Mode Messages case 120: { // all sound off - KillAllVoices(pEngineChannel, itControlChangeEventOnCCList); + KillAllVoices(pEngineChannel, itControlChangeEvent); break; } case 121: { // reset all controllers @@ -1236,7 +1350,17 @@ break; } case 123: { // all notes off - ReleaseAllVoices(pEngineChannel, itControlChangeEventOnCCList); + ReleaseAllVoices(pEngineChannel, itControlChangeEvent); + break; + } + case 126: { // mono mode on + KillAllVoices(pEngineChannel, itControlChangeEvent); + pEngineChannel->SoloMode = true; + break; + } + case 127: { // poly mode on + KillAllVoices(pEngineChannel, itControlChangeEvent); + pEngineChannel->SoloMode = false; break; } } @@ -1380,18 +1504,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() { @@ -1431,7 +1558,7 @@ } String Engine::Version() { - String s = "$Revision: 1.50 $"; + String s = "$Revision: 1.57 $"; return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword }