--- linuxsampler/trunk/src/engines/gig/Engine.cpp 2007/09/14 14:45:11 1348 +++ linuxsampler/trunk/src/engines/gig/Engine.cpp 2009/05/02 18:57:49 1893 @@ -2,8 +2,8 @@ * * * LinuxSampler - modular, streaming capable sampler * * * - * Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck * - * Copyright (C) 2005-2007 Christian Schoenebeck * + * Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck * + * Copyright (C) 2005-2009 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,6 +29,8 @@ #include "Engine.h" +#include "../../common/global_private.h" + namespace LinuxSampler { namespace gig { InstrumentResourceManager Engine::instruments; @@ -72,7 +74,7 @@ /** * Once an engine channel is disconnected from an audio output device, - * it wil immediately call this method to unregister itself from the + * it will immediately call this method to unregister itself from the * engine instance and if that engine instance is not used by any other * engine channel anymore, then that engine instance will be destroyed. * @@ -105,12 +107,12 @@ pSysexBuffer = new RingBuffer(CONFIG_SYSEX_BUFFER_SIZE, 0); pEventQueue = new RingBuffer(CONFIG_MAX_EVENTS_PER_FRAGMENT, 0); pEventPool = new Pool(CONFIG_MAX_EVENTS_PER_FRAGMENT); - pVoicePool = new Pool(CONFIG_MAX_VOICES); - pDimRegionsInUse = new ::gig::DimensionRegion*[CONFIG_MAX_VOICES + 1]; + pVoicePool = new Pool(GLOBAL_MAX_VOICES); + pDimRegionPool[0] = new Pool< ::gig::DimensionRegion*>(GLOBAL_MAX_VOICES); + pDimRegionPool[1] = new Pool< ::gig::DimensionRegion*>(GLOBAL_MAX_VOICES); pVoiceStealingQueue = new RTList(pEventPool); pGlobalEvents = new RTList(pEventPool); - InstrumentChangeQueue = new RingBuffer(1, 0); - InstrumentChangeReplyQueue = new RingBuffer(1, 0); + iMaxDiskStreams = GLOBAL_MAX_STREAMS; for (RTList::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) { iterVoice->SetEngine(this); @@ -143,9 +145,8 @@ if (pVoiceStealingQueue) delete pVoiceStealingQueue; if (pSysexBuffer) delete pSysexBuffer; if (pGlobalEvents) delete pGlobalEvents; - if (InstrumentChangeQueue) delete InstrumentChangeQueue; - if (InstrumentChangeReplyQueue) delete InstrumentChangeReplyQueue; - if (pDimRegionsInUse) delete[] pDimRegionsInUse; + if (pDimRegionPool[0]) delete pDimRegionPool[0]; + if (pDimRegionPool[1]) delete pDimRegionPool[1]; ResetSuspendedRegions(); Unregister(); } @@ -189,7 +190,7 @@ * engine afterwards by calling @c ResumeAll() later on! */ void Engine::SuspendAll() { - dmsg(1,("gig::Engine: Suspending all ...\n")); + dmsg(2,("gig::Engine: Suspending all ...\n")); // stop the engine, so we can safely modify the engine's // data structures from this foreign thread DisableAndLock(); @@ -211,6 +212,8 @@ if (hStream != Stream::INVALID_HANDLE) { // voice actually used a stream iPendingStreamDeletions++; } + // free the voice to the voice pool and update key info + FreeVoice(pEngineChannel, itVoice); } } } @@ -223,7 +226,7 @@ if (!iPendingStreamDeletions) break; usleep(10000); // sleep for 10ms } - dmsg(1,("gig::Engine: Everything suspended.\n")); + dmsg(2,("gig::Engine: Everything suspended.\n")); } /** @@ -245,13 +248,13 @@ * @param pRegion - region the engine shall stop using */ void Engine::Suspend(::gig::Region* pRegion) { - dmsg(1,("gig::Engine: Suspending Region %x ...\n",pRegion)); + dmsg(2,("gig::Engine: Suspending Region %x ...\n",pRegion)); SuspendedRegionsMutex.Lock(); SuspensionChangeOngoing.Set(true); pPendingRegionSuspension = pRegion; SuspensionChangeOngoing.WaitAndUnlockIf(true); SuspendedRegionsMutex.Unlock(); - dmsg(1,("gig::Engine: Region %x suspended.",pRegion)); + dmsg(2,("gig::Engine: Region %x suspended.",pRegion)); } /** @@ -261,13 +264,13 @@ * @param pRegion - region the engine shall be allowed to use again */ void Engine::Resume(::gig::Region* pRegion) { - dmsg(1,("gig::Engine: Resuming Region %x ...\n",pRegion)); + dmsg(2,("gig::Engine: Resuming Region %x ...\n",pRegion)); SuspendedRegionsMutex.Lock(); SuspensionChangeOngoing.Set(true); pPendingRegionResumption = pRegion; SuspensionChangeOngoing.WaitAndUnlockIf(true); SuspendedRegionsMutex.Unlock(); - dmsg(1,("gig::Engine: Region %x resumed.\n",pRegion)); + dmsg(2,("gig::Engine: Region %x resumed.\n",pRegion)); } /** @@ -291,7 +294,7 @@ // make sure that the engine does not get any sysex messages // while it's reseting bool sysexDisabled = MidiInputPort::RemoveSysexListener(this); - ActiveVoiceCount = 0; + SetVoiceCount(0); ActiveVoiceCountMax = 0; // reset voice stealing parameters @@ -342,6 +345,9 @@ * @param pAudioOut - audio output device to connect to */ void Engine::Connect(AudioOutputDevice* pAudioOut) { + // caution: don't ignore if connecting to the same device here, + // because otherwise SetMaxDiskStreams() implementation won't work anymore! + pAudioOutputDevice = pAudioOut; ResetInternal(); @@ -358,14 +364,13 @@ 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) * CONFIG_EG_MIN_RELEASE_TIME) - 1; - if (MaxFadeOutPos < 0) { + MinFadeOutSamples = int(double(SampleRate) * CONFIG_EG_MIN_RELEASE_TIME) - 1; + if (MaxSamplesPerCycle < MinFadeOutSamples) { 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; + MinFadeOutSamples = MaxSamplesPerCycle; // lower minimum release time const float minReleaseTime = (float) MaxSamplesPerCycle / (float) SampleRate; for (RTList::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) { @@ -381,8 +386,13 @@ delete this->pDiskThread; dmsg(1,("OK\n")); } - this->pDiskThread = new DiskThread(((pAudioOut->MaxSamplesPerCycle() << CONFIG_MAX_PITCH) << 1) + 6, //FIXME: assuming stereo - &instruments); + this->pDiskThread = + new DiskThread( + iMaxDiskStreams, + ((pAudioOut->MaxSamplesPerCycle() << CONFIG_MAX_PITCH) << 1) + 6, //FIXME: assuming stereo + &instruments + ); + if (!pDiskThread) { dmsg(0,("gig::Engine new diskthread = NULL\n")); exit(EXIT_FAILURE); @@ -408,6 +418,7 @@ exit(EXIT_FAILURE); } } + pVoicePool->clear(); } /** @@ -434,6 +445,7 @@ if (hStream != Stream::INVALID_HANDLE) { // voice actually used a stream iPendingStreamDeletions++; } + //NOTE: maybe we should call FreeVoice() here, shouldn't cause a harm though I think, since the voices should be freed by RenderActiveVoices() in the render loop, they are probably just freed a bit later than they could/should be } } } @@ -458,7 +470,7 @@ // free request slot for next caller (and to make sure that // we're not going to process the same request in the next cycle) pPendingRegionSuspension = NULL; - // if no disk stream deletions are pending, awaker other side, as + // if no disk stream deletions are pending, awaken other side, as // we're done in this case if (!iPendingStreamDeletions) SuspensionChangeOngoing.Set(false); } @@ -569,11 +581,12 @@ * @returns 0 on success */ int Engine::RenderAudio(uint Samples) { - dmsg(7,("RenderAudio(Samples=%d)\n", Samples)); + dmsg(8,("RenderAudio(Samples=%d)\n", Samples)); // return if engine disabled if (EngineDisabled.Pop()) { dmsg(5,("gig::Engine: engine disabled (val=%d)\n",EngineDisabled.GetUnsafe())); + EngineDisabled.RttDone(); return 0; } @@ -584,10 +597,10 @@ // 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 + // We only allow the given maximum number of 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; + VoiceSpawnsLeft = MaxVoices(); // get all events from the engine's global input event queue which belong to the current fragment // (these are usually just SysEx messages) @@ -611,39 +624,47 @@ ActiveVoiceCountTemp = 0; // handle instrument change commands - instrument_change_command_t command; - if (InstrumentChangeQueue->pop(&command) > 0) { - EngineChannel* pEngineChannel = command.pEngineChannel; - pEngineChannel->pInstrument = command.pInstrument; - - //TODO: this is a lazy solution ATM and not safe in case somebody is currently editing the instrument we're currently switching to (we should store all suspended regions on instrument manager side and when switching to another instrument copy that list to the engine's local list of suspensions - ResetSuspendedRegions(); + bool instrumentChanged = false; + for (int i = 0; i < engineChannels.size(); i++) { + EngineChannel* pEngineChannel = engineChannels[i]; - // iterate through all active voices and mark their - // dimension regions as "in use". The instrument resource - // manager may delete all of the instrument except the - // dimension regions and samples that are in use. - int i = 0; - RTList::Iterator iuiKey = pEngineChannel->pActiveKeys->first(); - RTList::Iterator end = pEngineChannel->pActiveKeys->end(); - while (iuiKey != end) { // iterate through all active keys - midi_key_info_t* pKey = &pEngineChannel->pMIDIKeyInfo[*iuiKey]; - ++iuiKey; + // as we're going to (carefully) write some status to the + // synchronized struct, we cast away the const + EngineChannel::instrument_change_command_t& cmd = + const_cast(pEngineChannel->InstrumentChangeCommandReader.Lock()); + + pEngineChannel->pDimRegionsInUse = cmd.pDimRegionsInUse; + pEngineChannel->pDimRegionsInUse->clear(); + + if (cmd.bChangeInstrument) { + // change instrument + dmsg(5,("Engine: instrument change command received\n")); + cmd.bChangeInstrument = false; + pEngineChannel->pInstrument = cmd.pInstrument; + instrumentChanged = true; + + // Iterate through all active voices and mark them as + // "orphans", which means that the dimension regions + // and samples they use should be released to the + // instrument resource manager when the voices die. + int i = 0; + RTList::Iterator iuiKey = pEngineChannel->pActiveKeys->first(); + RTList::Iterator end = pEngineChannel->pActiveKeys->end(); + while (iuiKey != end) { // iterate through all active keys + midi_key_info_t* pKey = &pEngineChannel->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 - if (!itVoice->Orphan) { + RTList::Iterator itVoice = pKey->pActiveVoices->first(); + RTList::Iterator itVoicesEnd = pKey->pActiveVoices->end(); + for (; itVoice != itVoicesEnd; ++itVoice) { // iterate through all voices on this key itVoice->Orphan = true; - pDimRegionsInUse[i++] = itVoice->pDimRgn; } } } - pDimRegionsInUse[i] = 0; // end of list - - // send a reply to the calling thread, which is waiting - instrument_change_reply_t reply; - InstrumentChangeReplyQueue->push(&reply); + } + if (instrumentChanged) { + //TODO: this is a lazy solution ATM and not safe in case somebody is currently editing the instrument we're currently switching to (we should store all suspended regions on instrument manager side and when switching to another instrument copy that list to the engine's local list of suspensions + ResetSuspendedRegions(); } // handle events on all engine channels @@ -678,16 +699,20 @@ pVoiceStealingQueue->clear(); // just some statistics about this engine instance - ActiveVoiceCount = ActiveVoiceCountTemp; - if (ActiveVoiceCount > ActiveVoiceCountMax) ActiveVoiceCountMax = ActiveVoiceCount; + SetVoiceCount(ActiveVoiceCountTemp); + if (VoiceCount() > ActiveVoiceCountMax) ActiveVoiceCountMax = VoiceCount(); // in case regions were previously suspended and we killed voices // with disk streams due to that, check if those streams have finally // been deleted by the disk thread if (iPendingStreamDeletions) ProcessPendingStreamDeletions(); + for (int i = 0; i < engineChannels.size(); i++) { + engineChannels[i]->InstrumentChangeCommandReader.Unlock(); + } FrameTime += Samples; + EngineDisabled.RttDone(); return 0; } @@ -767,11 +792,14 @@ // now render current voice itVoice->Render(Samples); if (itVoice->IsActive()) { // still active + if (!itVoice->Orphan) { + *(pEngineChannel->pDimRegionsInUse->allocAppend()) = itVoice->pDimRgn; + } ActiveVoiceCountTemp++; voiceCount++; if (itVoice->PlaybackState == Voice::playback_state_disk) { - if ((itVoice->DiskStreamRef).State == Stream::state_active) streamCount++; + if ((itVoice->DiskStreamRef).State != Stream::state_unused) streamCount++; } } else { // voice reached end, is now inactive FreeVoice(pEngineChannel, itVoice); // remove voice from the list of active voices @@ -807,11 +835,12 @@ if (itNewVoice) { itNewVoice->Render(Samples); if (itNewVoice->IsActive()) { // still active + *(pEngineChannel->pDimRegionsInUse->allocAppend()) = itNewVoice->pDimRgn; ActiveVoiceCountTemp++; pEngineChannel->SetVoiceCount(pEngineChannel->GetVoiceCount() + 1); if (itNewVoice->PlaybackState == Voice::playback_state_disk) { - if (itNewVoice->DiskStreamRef.State == Stream::state_active) { + if (itNewVoice->DiskStreamRef.State != Stream::state_unused) { pEngineChannel->SetDiskStreamCount(pEngineChannel->GetDiskStreamCount() + 1); } } @@ -842,7 +871,7 @@ * this audio fragment cycle */ void Engine::RouteAudio(EngineChannel* pEngineChannel, uint Samples) { - // route master signal + // route dry signal { AudioChannel* pDstL = pAudioOutputDevice->Channel(pEngineChannel->AudioDeviceChannelLeft); AudioChannel* pDstR = pAudioOutputDevice->Channel(pEngineChannel->AudioDeviceChannelRight); @@ -853,28 +882,47 @@ { for (int iFxSend = 0; iFxSend < pEngineChannel->GetFxSendCount(); iFxSend++) { FxSend* pFxSend = pEngineChannel->GetFxSend(iFxSend); - // left channel - const int iDstL = pFxSend->DestinationChannel(0); - if (iDstL < 0) { - dmsg(1,("Engine::RouteAudio() Error: invalid FX send (L) destination channel")); - } else { - AudioChannel* pDstL = pAudioOutputDevice->Channel(iDstL); - if (!pDstL) { - dmsg(1,("Engine::RouteAudio() Error: invalid FX send (L) destination channel")); - } else pEngineChannel->pChannelLeft->MixTo(pDstL, Samples, pFxSend->Level()); - } - // right channel - const int iDstR = pFxSend->DestinationChannel(1); - if (iDstR < 0) { - dmsg(1,("Engine::RouteAudio() Error: invalid FX send (R) destination channel")); - } else { - AudioChannel* pDstR = pAudioOutputDevice->Channel(iDstR); - if (!pDstR) { - dmsg(1,("Engine::RouteAudio() Error: invalid FX send (R) destination channel")); - } else pEngineChannel->pChannelRight->MixTo(pDstR, Samples, pFxSend->Level()); + for (int iChan = 0; iChan < 2; ++iChan) { + AudioChannel* pSource = + (iChan) + ? pEngineChannel->pChannelRight + : pEngineChannel->pChannelLeft; + const int iDstChan = pFxSend->DestinationChannel(iChan); + if (iDstChan < 0) { + dmsg(1,("Engine::RouteAudio() Error: invalid FX send (%s) destination channel (%d->%d)", ((iChan) ? "R" : "L"), iChan, iDstChan)); + goto channel_cleanup; + } + AudioChannel* pDstChan = NULL; + if (pFxSend->DestinationMasterEffectChain() >= 0) { // fx send routed to an internal master effect + EffectChain* pEffectChain = + pAudioOutputDevice->MasterEffectChain( + pFxSend->DestinationMasterEffectChain() + ); + if (!pEffectChain) { + dmsg(1,("Engine::RouteAudio() Error: invalid FX send (%s) destination effect chain %d", ((iChan) ? "R" : "L"), pFxSend->DestinationMasterEffectChain())); + goto channel_cleanup; + } + Effect* pEffect = + pEffectChain->GetEffect( + pFxSend->DestinationMasterEffect() + ); + if (!pEffect) { + dmsg(1,("Engine::RouteAudio() Error: invalid FX send (%s) destination effect %d of effect chain %d", ((iChan) ? "R" : "L"), pFxSend->DestinationMasterEffect(), pFxSend->DestinationMasterEffectChain())); + goto channel_cleanup; + } + pDstChan = pEffect->InputChannel(iDstChan); + } else { // FX send routed directly to an audio output channel + pDstChan = pAudioOutputDevice->Channel(iDstChan); + } + if (!pDstChan) { + dmsg(1,("Engine::RouteAudio() Error: invalid FX send (%s) destination channel (%d->%d)", ((iChan) ? "R" : "L"), iChan, iDstChan)); + goto channel_cleanup; + } + pSource->MixTo(pDstChan, Samples, pFxSend->Level()); } } } + channel_cleanup: // reset buffers with silence (zero out) for the next audio cycle pEngineChannel->pChannelLeft->Clear(); pEngineChannel->pChannelRight->Clear(); @@ -920,12 +968,15 @@ * * @param pData - pointer to sysex data * @param Size - lenght of sysex data (in bytes) + * @param pSender - the MIDI input port on which the SysEx message was + * received */ - void Engine::SendSysex(void* pData, uint Size) { + void Engine::SendSysex(void* pData, uint Size, MidiInputPort* pSender) { Event event = pEventGenerator->CreateEvent(); event.Type = Event::type_sysex; event.Param.Sysex.Size = Size; event.pEngineChannel = NULL; // as Engine global event + event.pMidiInputPort = pSender; if (pEventQueue->write_space() > 0) { if (pSysexBuffer->write_space() >= Size) { // copy sysex data to input buffer @@ -1603,6 +1654,64 @@ void Engine::ProcessControlChange(EngineChannel* pEngineChannel, Pool::Iterator& itControlChangeEvent) { dmsg(4,("Engine::ContinuousController cc=%d v=%d\n", itControlChangeEvent->Param.CC.Controller, itControlChangeEvent->Param.CC.Value)); + // handle the "control triggered" MIDI rule: a control change + // event can trigger a new note on or note off event + if (pEngineChannel->pInstrument) { + + ::gig::MidiRule* rule; + for (int i = 0 ; (rule = pEngineChannel->pInstrument->GetMidiRule(i)) ; i++) { + + if (::gig::MidiRuleCtrlTrigger* ctrlTrigger = + dynamic_cast< ::gig::MidiRuleCtrlTrigger*>(rule)) { + if (itControlChangeEvent->Param.CC.Controller == + ctrlTrigger->ControllerNumber) { + + uint8_t oldCCValue = pEngineChannel->ControllerTable[ + itControlChangeEvent->Param.CC.Controller]; + uint8_t newCCValue = itControlChangeEvent->Param.CC.Value; + + for (int i = 0 ; i < ctrlTrigger->Triggers ; i++) { + ::gig::MidiRuleCtrlTrigger::trigger_t* pTrigger = + &ctrlTrigger->pTriggers[i]; + + // check if the controller has passed the + // trigger point in the right direction + if ((pTrigger->Descending && + oldCCValue > pTrigger->TriggerPoint && + newCCValue <= pTrigger->TriggerPoint) || + (!pTrigger->Descending && + oldCCValue < pTrigger->TriggerPoint && + newCCValue >= pTrigger->TriggerPoint)) { + + RTList::Iterator itNewEvent = pGlobalEvents->allocAppend(); + if (itNewEvent) { + *itNewEvent = *itControlChangeEvent; + itNewEvent->Param.Note.Key = pTrigger->Key; + + if (pTrigger->NoteOff || pTrigger->Velocity == 0) { + itNewEvent->Type = Event::type_note_off; + itNewEvent->Param.Note.Velocity = 100; + + ProcessNoteOff(pEngineChannel, itNewEvent); + } else { + itNewEvent->Type = Event::type_note_on; + //TODO: if Velocity is 255, the triggered velocity should + // depend on how fast the controller is moving + itNewEvent->Param.Note.Velocity = + pTrigger->Velocity == 255 ? 100 : + pTrigger->Velocity; + + ProcessNoteOn(pEngineChannel, itNewEvent); + } + } + else dmsg(1,("Event pool emtpy!\n")); + } + } + } + } + } + } + // update controller value in the engine channel's controller table pEngineChannel->ControllerTable[itControlChangeEvent->Param.CC.Controller] = itControlChangeEvent->Param.CC.Value; @@ -1636,6 +1745,7 @@ //TODO: not sample accurate yet pEngineChannel->GlobalPanLeft = PanCurve[128 - itControlChangeEvent->Param.CC.Value]; pEngineChannel->GlobalPanRight = PanCurve[itControlChangeEvent->Param.CC.Value]; + pEngineChannel->iLastPanRequest = itControlChangeEvent->Param.CC.Value; break; } case 64: { // sustain @@ -1776,9 +1886,10 @@ if (!pEngineChannel->fxSends.empty()) { for (int iFxSend = 0; iFxSend < pEngineChannel->GetFxSendCount(); iFxSend++) { FxSend* pFxSend = pEngineChannel->GetFxSend(iFxSend); - if (pFxSend->MidiController() == itControlChangeEvent->Param.CC.Controller) + if (pFxSend->MidiController() == itControlChangeEvent->Param.CC.Controller) { pFxSend->SetLevel(itControlChangeEvent->Param.CC.Value); pFxSend->SetInfoChanged(true); + } } } } @@ -1797,6 +1908,43 @@ if (exclusive_status != 0xF0) goto free_sysex_data; switch (id) { + case 0x7f: { // (Realtime) Universal Sysex (GM Standard) + uint8_t sysex_channel, sub_id1, sub_id2, val_msb, val_lsb;; + if (!reader.pop(&sysex_channel)) goto free_sysex_data; + if (!reader.pop(&sub_id1)) goto free_sysex_data; + if (!reader.pop(&sub_id2)) goto free_sysex_data; + if (!reader.pop(&val_lsb)) goto free_sysex_data; + if (!reader.pop(&val_msb)) goto free_sysex_data; + //TODO: for now we simply ignore the sysex channel, seldom used anyway + switch (sub_id1) { + case 0x04: // Device Control + switch (sub_id2) { + case 0x01: { // Master Volume + const double volume = + double((uint(val_msb)<<7) | uint(val_lsb)) / 16383.0; + #if CONFIG_MASTER_VOLUME_SYSEX_BY_PORT + // apply volume to all sampler channels that + // are connected to the same MIDI input port + // this sysex message arrived on + for (int i = 0; i < engineChannels.size(); ++i) { + EngineChannel* pEngineChannel = engineChannels[i]; + if (pEngineChannel->GetMidiInputPort() == + itSysexEvent->pMidiInputPort) + { + pEngineChannel->Volume(volume); + } + } + #else + // apply volume globally to the whole sampler + GLOBAL_VOLUME = volume; + #endif // CONFIG_MASTER_VOLUME_SYSEX_BY_PORT + break; + } + } + break; + } + break; + } case 0x41: { // Roland dmsg(3,("Roland Sysex\n")); uint8_t device_id, model_id, cmd_id; @@ -1812,6 +1960,15 @@ if (reader.read(&addr[0], 3) != 3) goto free_sysex_data; if (addr[0] == 0x40 && addr[1] == 0x00) { // System Parameters dmsg(3,("\tSystem Parameter\n")); + if (addr[2] == 0x7f) { // GS reset + for (int i = 0; i < engineChannels.size(); ++i) { + EngineChannel* pEngineChannel = engineChannels[i]; + if (pEngineChannel->GetMidiInputPort() == itSysexEvent->pMidiInputPort) { + KillAllVoices(pEngineChannel, itSysexEvent); + pEngineChannel->ResetControllers(); + } + } + } } else if (addr[0] == 0x40 && addr[1] == 0x01) { // Common Parameters dmsg(3,("\tCommon Parameter\n")); @@ -1833,6 +1990,32 @@ dmsg(3,("\t\t\tNew scale applied.\n")); break; } + case 0x15: { // chromatic / drumkit mode + dmsg(3,("\t\tMIDI Instrument Map Switch\n")); + uint8_t part = addr[1] & 0x0f; + uint8_t map; + if (!reader.pop(&map)) goto free_sysex_data; + for (int i = 0; i < engineChannels.size(); ++i) { + EngineChannel* pEngineChannel = engineChannels[i]; + if ( + (pEngineChannel->midiChannel == part || + pEngineChannel->midiChannel == midi_chan_all) && + pEngineChannel->GetMidiInputPort() == itSysexEvent->pMidiInputPort + ) { + try { + pEngineChannel->SetMidiInstrumentMap(map); + } catch (Exception e) { + dmsg(2,("\t\t\tCould not apply MIDI instrument map %d to part %d: %s\n", map, part, e.Message().c_str())); + goto free_sysex_data; + } catch (...) { + dmsg(2,("\t\t\tCould not apply MIDI instrument map %d to part %d (unknown exception)\n", map, part)); + goto free_sysex_data; + } + } + } + dmsg(3,("\t\t\tApplied MIDI instrument map %d to part %d.\n", map, part)); + break; + } } } else if (addr[0] == 0x40 && (addr[1] & 0xf0) == 0x20) { // Part Parameters (2) @@ -1939,25 +2122,89 @@ } uint Engine::VoiceCount() { - return ActiveVoiceCount; + return atomic_read(&ActiveVoiceCount); + } + + void Engine::SetVoiceCount(uint Count) { + atomic_set(&ActiveVoiceCount, Count); } uint Engine::VoiceCountMax() { return ActiveVoiceCountMax; } + int Engine::MaxVoices() { + return pVoicePool->poolSize(); + } + + void Engine::SetMaxVoices(int iVoices) throw (Exception) { + if (iVoices < 1) + throw Exception("Maximum voices for an engine cannot be set lower than 1"); + + SuspendAll(); + + // NOTE: we need to clear pDimRegionsInUse before deleting pDimRegionPool, + // otherwise memory corruption will occur if there are active voices (see bug #118) + for (int iChannel = 0; iChannel < engineChannels.size(); iChannel++) { + engineChannels[iChannel]->ClearDimRegionsInUse(); + } + + if (pDimRegionPool[0]) delete pDimRegionPool[0]; + if (pDimRegionPool[1]) delete pDimRegionPool[1]; + + pDimRegionPool[0] = new Pool< ::gig::DimensionRegion*>(iVoices); + pDimRegionPool[1] = new Pool< ::gig::DimensionRegion*>(iVoices); + + for (int iChannel = 0; iChannel < engineChannels.size(); iChannel++) { + engineChannels[iChannel]->ResetDimRegionsInUse(); + } + + try { + pVoicePool->resizePool(iVoices); + } catch (...) { + throw Exception("FATAL: Could not resize voice pool!"); + } + + for (RTList::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) { + iterVoice->SetEngine(this); + iterVoice->pDiskThread = this->pDiskThread; + } + pVoicePool->clear(); + + ResumeAll(); + } + bool Engine::DiskStreamSupported() { return true; } uint Engine::DiskStreamCount() { - return (pDiskThread) ? pDiskThread->ActiveStreamCount : 0; + return (pDiskThread) ? pDiskThread->GetActiveStreamCount() : 0; } uint Engine::DiskStreamCountMax() { return (pDiskThread) ? pDiskThread->ActiveStreamCountMax : 0; } + int Engine::MaxDiskStreams() { + return iMaxDiskStreams; + } + + void Engine::SetMaxDiskStreams(int iStreams) throw (Exception) { + if (iStreams < 0) + throw Exception("Maximum disk streams for an engine cannot be set lower than 0"); + + SuspendAll(); + + iMaxDiskStreams = iStreams; + + // reconnect to audio output device, because that will automatically + // recreate the disk thread with the required amount of streams + if (pAudioOutputDevice) Connect(pAudioOutputDevice); + + ResumeAll(); + } + String Engine::DiskStreamBufferFillBytes() { return pDiskThread->GetBufferFillBytes(); } @@ -1971,11 +2218,11 @@ } String Engine::Description() { - return "Gigasampler Engine"; + return "Gigasampler Format Engine"; } String Engine::Version() { - String s = "$Revision: 1.81 $"; + String s = "$Revision: 1.102 $"; return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword } @@ -1984,9 +2231,9 @@ } // static constant initializers - const float* Engine::VolumeCurve(InitVolumeCurve()); - const float* Engine::PanCurve(InitPanCurve()); - const float* Engine::CrossfadeCurve(InitCrossfadeCurve()); + const Engine::FloatTable Engine::VolumeCurve(InitVolumeCurve()); + const Engine::FloatTable Engine::PanCurve(InitPanCurve()); + const Engine::FloatTable Engine::CrossfadeCurve(InitCrossfadeCurve()); float* Engine::InitVolumeCurve() { // line-segment approximation @@ -2025,28 +2272,4 @@ return y; } - /** - * Changes the instrument for an engine channel. - * - * @param pEngineChannel - engine channel on which the instrument - * should be changed - * @param pInstrument - new instrument - * @returns a list of dimension regions from the old instrument - * that are still in use - */ - ::gig::DimensionRegion** Engine::ChangeInstrument(EngineChannel* pEngineChannel, ::gig::Instrument* pInstrument) { - instrument_change_command_t command; - command.pEngineChannel = pEngineChannel; - command.pInstrument = pInstrument; - InstrumentChangeQueue->push(&command); - - // wait for the audio thread to confirm that the instrument - // change has been done - instrument_change_reply_t reply; - while (InstrumentChangeReplyQueue->pop(&reply) == 0) { - usleep(10000); - } - return pDimRegionsInUse; - } - }} // namespace LinuxSampler::gig