--- linuxsampler/trunk/src/engines/gig/InstrumentResourceManager.cpp 2008/12/04 19:33:13 1797 +++ linuxsampler/trunk/src/engines/gig/InstrumentResourceManager.cpp 2015/01/04 17:16:05 2687 @@ -3,7 +3,7 @@ * LinuxSampler - modular, streaming capable sampler * * * * Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck * - * Copyright (C) 2005 - 2008 Christian Schoenebeck * + * Copyright (C) 2005 - 2013 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 * @@ -24,26 +24,14 @@ #include #include "InstrumentResourceManager.h" +#include "EngineChannel.h" +#include "Engine.h" #include "../../common/global_private.h" #include "../../plugins/InstrumentEditorFactory.h" -// We need to know the maximum number of sample points which are going to -// be processed for each render cycle of the audio output driver, to know -// how much initial sample points we need to cache into RAM. If the given -// sampler channel does not have an audio output device assigned yet -// though, we simply use this default value. -#define GIG_RESOURCE_MANAGER_DEFAULT_MAX_SAMPLES_PER_CYCLE 128 - namespace LinuxSampler { namespace gig { - // data stored as long as an instrument resource exists - struct instr_entry_t { - InstrumentManager::instrument_id_t ID; - ::gig::File* pGig; - uint MaxSamplesPerCycle; ///< if some engine requests an already allocated instrument with a higher value, we have to reallocate the instrument - }; - // some data needed for the libgig callback function struct progress_callback_arg_t { InstrumentResourceManager* pManager; @@ -88,19 +76,6 @@ pArg->pManager->DispatchResourceProgressEvent(*pArg->pInstrumentKey, localProgress); } - std::vector InstrumentResourceManager::Instruments() { - return Entries(); - } - - InstrumentManager::mode_t InstrumentResourceManager::GetMode(const instrument_id_t& ID) { - return static_cast(AvailabilityMode(ID)); - } - - void InstrumentResourceManager::SetMode(const instrument_id_t& ID, InstrumentManager::mode_t Mode) { - dmsg(2,("gig::InstrumentResourceManager: setting mode for %s (Index=%d) to %d\n",ID.FileName.c_str(),ID.Index,Mode)); - SetAvailabilityMode(ID, static_cast::mode_t>(Mode)); - } - String InstrumentResourceManager::GetInstrumentName(instrument_id_t ID) { Lock(); ::gig::Instrument* pInstrument = Resource(ID, false); @@ -154,13 +129,13 @@ ::RIFF::File* riff = NULL; ::gig::File* gig = NULL; try { - if(!loaded) { + if (!loaded) { riff = new ::RIFF::File(ID.FileName); gig = new ::gig::File(riff); gig->SetAutoLoad(false); // avoid time consuming samples scanning pInstrument = gig->GetInstrument(ID.Index); } - + if (!pInstrument) throw InstrumentManagerException("There is no instrument " + ToString(ID.Index) + " in " + ID.FileName); instrument_info_t info; @@ -233,7 +208,7 @@ } } - void InstrumentResourceManager::LaunchInstrumentEditor(instrument_id_t ID) throw (InstrumentManagerException) { + InstrumentEditor* InstrumentResourceManager::LaunchInstrumentEditor(LinuxSampler::EngineChannel* pEngineChannel, instrument_id_t ID, void* pUserData) throw (InstrumentManagerException) { const String sDataType = GetInstrumentDataStructureName(ID); const String sDataVersion = GetInstrumentDataStructureVersion(ID); // find instrument editors capable to handle given instrument @@ -260,23 +235,25 @@ InstrumentEditorProxies.add(pProxy); InstrumentEditorProxiesMutex.Unlock(); // launch the instrument editor for the given instrument - pEditor->Launch(pInstrument, sDataType, sDataVersion); + pEditor->Launch(pEngineChannel, pInstrument, sDataType, sDataVersion, pUserData); // register the instrument editor as virtual MIDI device as well ... VirtualMidiDevice* pVirtualMidiDevice = dynamic_cast(pEditor); if (!pVirtualMidiDevice) { std::cerr << "Instrument editor not a virtual MIDI device\n" << std::flush; - return; + return pEditor; } // NOTE: for now connect the virtual MIDI keyboard of the instrument editor (if any) with all engine channels that have the same instrument as the editor was opened for ( other ideas ? ) Lock(); - std::set engineChannels = + std::set engineChannels = GetEngineChannelsUsing(pInstrument, false/*don't lock again*/); - std::set::iterator iter = engineChannels.begin(); - std::set::iterator end = engineChannels.end(); - for (; iter != end; ++iter) (*iter)->Connect(pVirtualMidiDevice); + std::set::iterator iter = engineChannels.begin(); + std::set::iterator end = engineChannels.end(); + for (; iter != end; ++iter) (static_cast(*iter))->Connect(pVirtualMidiDevice); Unlock(); + + return pEditor; } /** @@ -294,19 +271,20 @@ int iProxyIndex = -1; // first find the editor proxy entry for this editor - InstrumentEditorProxiesMutex.Lock(); - for (int i = 0; i < InstrumentEditorProxies.size(); i++) { - InstrumentEditorProxy* pCurProxy = - dynamic_cast( - InstrumentEditorProxies[i] - ); - if (pCurProxy->pEditor == pSender) { - pProxy = pCurProxy; - iProxyIndex = i; - pInstrument = pCurProxy->pInstrument; + { + LockGuard lock(InstrumentEditorProxiesMutex); + for (int i = 0; i < InstrumentEditorProxies.size(); i++) { + InstrumentEditorProxy* pCurProxy = + dynamic_cast( + InstrumentEditorProxies[i] + ); + if (pCurProxy->pEditor == pSender) { + pProxy = pCurProxy; + iProxyIndex = i; + pInstrument = pCurProxy->pInstrument; + } } } - InstrumentEditorProxiesMutex.Unlock(); if (!pProxy) { std::cerr << "Eeeek, could not find instrument editor proxy, " @@ -320,10 +298,10 @@ if (pVirtualMidiDevice) { Lock(); // NOTE: see note in LaunchInstrumentEditor() - std::set engineChannels = + std::set engineChannels = GetEngineChannelsUsing(pInstrument, false/*don't lock again*/); - std::set::iterator iter = engineChannels.begin(); - std::set::iterator end = engineChannels.end(); + std::set::iterator iter = engineChannels.begin(); + std::set::iterator end = engineChannels.end(); for (; iter != end; ++iter) (*iter)->Disconnect(pVirtualMidiDevice); Unlock(); } else { @@ -334,9 +312,10 @@ // finally delete proxy entry and hand back instrument if (pInstrument) { - InstrumentEditorProxiesMutex.Lock(); - InstrumentEditorProxies.remove(iProxyIndex); - InstrumentEditorProxiesMutex.Unlock(); + { + LockGuard lock(InstrumentEditorProxiesMutex); + InstrumentEditorProxies.remove(iProxyIndex); + } HandBack(pInstrument, pProxy); delete pProxy; @@ -430,10 +409,10 @@ ::gig::Instrument* pInstrument = (::gig::Instrument*) pRegion->GetParent(); Lock(); - std::set engines = + std::set engines = GetEnginesUsing(pInstrument, false/*don't lock again*/); - std::set::iterator iter = engines.begin(); - std::set::iterator end = engines.end(); + std::set::iterator iter = engines.begin(); + std::set::iterator end = engines.end(); for (; iter != end; ++iter) (*iter)->Suspend(pRegion); Unlock(); } else if (sStructType == "gig::DimensionRegion") { @@ -447,10 +426,10 @@ ::gig::Instrument* pInstrument = (::gig::Instrument*) pRegion->GetParent(); Lock(); - std::set engines = + std::set engines = GetEnginesUsing(pInstrument, false/*don't lock again*/); - std::set::iterator iter = engines.begin(); - std::set::iterator end = engines.end(); + std::set::iterator iter = engines.begin(); + std::set::iterator end = engines.end(); for (; iter != end; ++iter) (*iter)->Suspend(pRegion); Unlock(); } else { @@ -470,6 +449,28 @@ } else if (sStructType == "gig::Instrument") { // resume all previously suspended engines ResumeAllEngines(); + } else if (sStructType == "gig::Sample") { + // we're assuming here, that OnDataStructureToBeChanged() with + // "gig::File" was called previously, so we won't resume anything + // here, but just re-cache the given sample + Lock(); + ::gig::Sample* pSample = (::gig::Sample*) pStruct; + ::gig::File* pFile = (::gig::File*) pSample->GetParent(); + UncacheInitialSamples(pSample); + // now re-cache ... + std::vector< ::gig::Instrument*> instruments = + GetInstrumentsCurrentlyUsedOf(pFile, false/*don't lock again*/); + for (int i = 0; i < instruments.size(); i++) { + if (SampleReferencedByInstrument(pSample, instruments[i])) { + std::set engineChannels = + GetEngineChannelsUsing(instruments[i], false/*don't lock again*/); + std::set::iterator iter = engineChannels.begin(); + std::set::iterator end = engineChannels.end(); + for (; iter != end; ++iter) + CacheInitialSamples(pSample, *iter); + } + } + Unlock(); } else if (sStructType == "gig::Region") { // advice the engines to resume the given region, that is to // using it for playback again @@ -477,10 +478,10 @@ ::gig::Instrument* pInstrument = (::gig::Instrument*) pRegion->GetParent(); Lock(); - std::set engines = + std::set engines = GetEnginesUsing(pInstrument, false/*don't lock again*/); - std::set::iterator iter = engines.begin(); - std::set::iterator end = engines.end(); + std::set::iterator iter = engines.begin(); + std::set::iterator end = engines.end(); for (; iter != end; ++iter) (*iter)->Resume(pRegion); Unlock(); } else if (sStructType == "gig::DimensionRegion") { @@ -492,10 +493,10 @@ ::gig::Instrument* pInstrument = (::gig::Instrument*) pRegion->GetParent(); Lock(); - std::set engines = + std::set engines = GetEnginesUsing(pInstrument, false/*don't lock again*/); - std::set::iterator iter = engines.begin(); - std::set::iterator end = engines.end(); + std::set::iterator iter = engines.begin(); + std::set::iterator end = engines.end(); for (; iter != end; ++iter) (*iter)->Resume(pRegion); Unlock(); } else { @@ -513,11 +514,16 @@ Lock(); ::gig::Sample* pSample = (::gig::Sample*) pOldSample; ::gig::File* pFile = (::gig::File*) pSample->GetParent(); + bool bSampleStillInUse = false; std::vector< ::gig::Instrument*> instruments = GetInstrumentsCurrentlyUsedOf(pFile, false/*don't lock again*/); - for (int i = 0; i < instruments.size(); i++) - if (!SampleReferencedByInstrument(pSample, instruments[i])) - UncacheInitialSamples(pSample); + for (int i = 0; i < instruments.size(); i++) { + if (SampleReferencedByInstrument(pSample, instruments[i])) { + bSampleStillInUse = true; + break; + } + } + if (!bSampleStillInUse) UncacheInitialSamples(pSample); Unlock(); } // make sure new sample reference is cached @@ -526,9 +532,9 @@ ::gig::Sample* pSample = (::gig::Sample*) pNewSample; ::gig::File* pFile = (::gig::File*) pSample->GetParent(); // get all engines that use that same gig::File - std::set engines = GetEnginesUsing(pFile, false/*don't lock again*/); - std::set::iterator iter = engines.begin(); - std::set::iterator end = engines.end(); + std::set engines = GetEnginesUsing(pFile, false/*don't lock again*/); + std::set::iterator iter = engines.begin(); + std::set::iterator end = engines.end(); for (; iter != end; ++iter) CacheInitialSamples(pSample, *iter); Unlock(); @@ -537,7 +543,7 @@ ::gig::Instrument* InstrumentResourceManager::Create(instrument_id_t Key, InstrumentConsumer* pConsumer, void*& pArg) { // get gig file from internal gig file manager - ::gig::File* pGig = Gigs.Borrow(Key.FileName, (GigConsumer*) Key.Index); // conversion kinda hackish :/ + ::gig::File* pGig = Gigs.Borrow(Key.FileName, reinterpret_cast(Key.Index)); // conversion kinda hackish :/ // we pass this to the progress callback mechanism of libgig progress_callback_arg_t callbackArg; @@ -558,6 +564,8 @@ pGig->GetFirstSample(); // just to force complete instrument loading dmsg(1,("OK\n")); + uint maxSamplesPerCycle = GetMaxSamplesPerCycle(pConsumer); + // cache initial samples points (for actually needed samples) dmsg(1,("Caching initial samples...")); uint iRegion = 0; // just for progress calculation @@ -569,10 +577,10 @@ if (pRgn->GetSample() && !pRgn->GetSample()->GetCache().Size) { dmsg(2,("C")); - CacheInitialSamples(pRgn->GetSample(), (gig::EngineChannel*) pConsumer); + CacheInitialSamples(pRgn->GetSample(), maxSamplesPerCycle); } for (uint i = 0; i < pRgn->DimensionRegions; i++) { - CacheInitialSamples(pRgn->pDimensionRegions[i]->pSample, (gig::EngineChannel*) pConsumer); + CacheInitialSamples(pRgn->pDimensionRegions[i]->pSample, maxSamplesPerCycle); } pRgn = pInstrument->GetNextRegion(); @@ -585,86 +593,38 @@ instr_entry_t* pEntry = new instr_entry_t; pEntry->ID.FileName = Key.FileName; pEntry->ID.Index = Key.Index; - pEntry->pGig = pGig; + pEntry->pFile = pGig; - gig::EngineChannel* pEngineChannel = dynamic_cast(pConsumer); - // and we save this to check if we need to reallocate for a engine with higher value of 'MaxSamplesPerSecond' - pEntry->MaxSamplesPerCycle = - (!pEngineChannel) ? 0 /* don't care for instrument editors */ : - (pEngineChannel->GetEngine()) ? - dynamic_cast(pEngineChannel->GetEngine())->pAudioOutputDevice->MaxSamplesPerCycle() - : GIG_RESOURCE_MANAGER_DEFAULT_MAX_SAMPLES_PER_CYCLE; + // and we save this to check if we need to reallocate for an engine with higher value of 'MaxSamplesPerSecond' + pEntry->MaxSamplesPerCycle = maxSamplesPerCycle; + pArg = pEntry; return pInstrument; } - void InstrumentResourceManager::Destroy( ::gig::Instrument* pResource, void* pArg) { + void InstrumentResourceManager::Destroy(::gig::Instrument* pResource, void* pArg) { instr_entry_t* pEntry = (instr_entry_t*) pArg; // we don't need the .gig file here anymore - Gigs.HandBack(pEntry->pGig, (GigConsumer*) pEntry->ID.Index); // conversion kinda hackish :/ + Gigs.HandBack(pEntry->pFile, reinterpret_cast(pEntry->ID.Index)); // conversion kinda hackish :/ delete pEntry; } - void InstrumentResourceManager::OnBorrow(::gig::Instrument* pResource, InstrumentConsumer* pConsumer, void*& pArg) { - instr_entry_t* pEntry = (instr_entry_t*) pArg; - gig::EngineChannel* pEngineChannel = dynamic_cast(pConsumer); - uint maxSamplesPerCycle = - (pEngineChannel && pEngineChannel->GetEngine()) ? dynamic_cast(pEngineChannel->GetEngine())->pAudioOutputDevice->MaxSamplesPerCycle() - : GIG_RESOURCE_MANAGER_DEFAULT_MAX_SAMPLES_PER_CYCLE; - if (pEntry->MaxSamplesPerCycle < maxSamplesPerCycle) { - Update(pResource, pConsumer); - } + void InstrumentResourceManager::DeleteRegionIfNotUsed(::gig::DimensionRegion* pRegion, region_info_t* pRegInfo) { + // TODO: we could delete Region and Instrument here if they have become unused } - /** - * Give back an instrument. This should be used instead of - * HandBack if there are some dimension regions that are still in - * use. (When an instrument is changed, the voices currently - * playing are allowed to keep playing with the old instrument - * until note off arrives. New notes will use the new instrument.) - */ - void InstrumentResourceManager::HandBackInstrument(::gig::Instrument* pResource, InstrumentConsumer* pConsumer, - RTList< ::gig::DimensionRegion*>* pDimRegionsInUse) { - DimRegInfoMutex.Lock(); - for (RTList< ::gig::DimensionRegion*>::Iterator i = pDimRegionsInUse->first() ; i != pDimRegionsInUse->end() ; i++) { - DimRegInfo[*i].refCount++; - SampleRefCount[(*i)->pSample]++; - } - HandBack(pResource, pConsumer, true); - DimRegInfoMutex.Unlock(); - } - - /** - * Give back a dimension region that belongs to an instrument that - * was previously handed back. - */ - void InstrumentResourceManager::HandBackDimReg(::gig::DimensionRegion* pDimReg) { - DimRegInfoMutex.Lock(); - dimreg_info_t& dimRegInfo = DimRegInfo[pDimReg]; - int dimRegRefCount = --dimRegInfo.refCount; - int sampleRefCount = --SampleRefCount[pDimReg->pSample]; - if (dimRegRefCount == 0) { - ::gig::File* gig = dimRegInfo.file; - ::RIFF::File* riff = dimRegInfo.riff; - DimRegInfo.erase(pDimReg); - // TODO: we could delete Region and Instrument here if - // they have become unused - - if (sampleRefCount == 0) { - SampleRefCount.erase(pDimReg->pSample); - - if (gig) { - gig->DeleteSample(pDimReg->pSample); - if (!gig->GetFirstSample()) { - dmsg(2,("No more samples in use - freeing gig\n")); - delete gig; - delete riff; - } - } + void InstrumentResourceManager::DeleteSampleIfNotUsed(::gig::Sample* pSample, region_info_t* pRegInfo) { + ::gig::File* gig = pRegInfo->file; + ::RIFF::File* riff = static_cast< ::RIFF::File*>(pRegInfo->pArg); + if (gig) { + gig->DeleteSample(pSample); + if (!gig->GetFirstSample()) { + dmsg(2,("No more samples in use - freeing gig\n")); + delete gig; + delete riff; } } - DimRegInfoMutex.Unlock(); } /** @@ -675,10 +635,10 @@ * (may be NULL, in this case default amount of samples * will be cached) */ - void InstrumentResourceManager::CacheInitialSamples(::gig::Sample* pSample, gig::EngineChannel* pEngineChannel) { - gig::Engine* pEngine = + void InstrumentResourceManager::CacheInitialSamples(::gig::Sample* pSample, EngineChannel* pEngineChannel) { + Engine* pEngine = (pEngineChannel && pEngineChannel->GetEngine()) ? - dynamic_cast(pEngineChannel->GetEngine()) : NULL; + dynamic_cast(pEngineChannel->GetEngine()) : NULL; CacheInitialSamples(pSample, pEngine); } @@ -693,7 +653,14 @@ * (may be NULL, in this case default amount of samples * will be cached) */ - void InstrumentResourceManager::CacheInitialSamples(::gig::Sample* pSample, gig::Engine* pEngine) { + void InstrumentResourceManager::CacheInitialSamples(::gig::Sample* pSample, AbstractEngine* pEngine) { + uint maxSamplesPerCycle = + (pEngine) ? pEngine->pAudioOutputDevice->MaxSamplesPerCycle() : + DefaultMaxSamplesPerCycle(); + CacheInitialSamples(pSample, maxSamplesPerCycle); + } + + void InstrumentResourceManager::CacheInitialSamples(::gig::Sample* pSample, uint maxSamplesPerCycle) { if (!pSample) { dmsg(4,("gig::InstrumentResourceManager: Skipping sample (pSample == NULL)\n")); return; @@ -706,9 +673,6 @@ // number of '0' samples (silence samples) behind the official buffer // border, to allow the interpolator do it's work even at the end of // the sample. - const uint maxSamplesPerCycle = - (pEngine) ? pEngine->pAudioOutputDevice->MaxSamplesPerCycle() - : GIG_RESOURCE_MANAGER_DEFAULT_MAX_SAMPLES_PER_CYCLE; const uint neededSilenceSamples = (maxSamplesPerCycle << CONFIG_MAX_PITCH) + 3; const uint currentlyCachedSilenceSamples = pSample->GetCache().NullExtensionSize / pSample->FrameSize; if (currentlyCachedSilenceSamples < neededSilenceSamples) { @@ -758,14 +722,14 @@ * @param bLock - whether we should lock (mutex) the instrument manager * during this call and unlock at the end of this call */ - std::set InstrumentResourceManager::GetEngineChannelsUsing(::gig::Instrument* pInstrument, bool bLock) { + std::set InstrumentResourceManager::GetEngineChannelsUsing(::gig::Instrument* pInstrument, bool bLock) { if (bLock) Lock(); - std::set result; + std::set result; std::set*> consumers = ConsumersOf(pInstrument); std::set*>::iterator iter = consumers.begin(); std::set*>::iterator end = consumers.end(); for (; iter != end; ++iter) { - gig::EngineChannel* pEngineChannel = dynamic_cast(*iter); + EngineChannel* pEngineChannel = dynamic_cast(*iter); if (!pEngineChannel) continue; result.insert(pEngineChannel); } @@ -781,16 +745,16 @@ * @param bLock - whether we should lock (mutex) the instrument manager * during this call and unlock at the end of this call */ - std::set InstrumentResourceManager::GetEnginesUsing(::gig::Instrument* pInstrument, bool bLock) { + std::set InstrumentResourceManager::GetEnginesUsing(::gig::Instrument* pInstrument, bool bLock) { if (bLock) Lock(); - std::set result; + std::set result; std::set*> consumers = ConsumersOf(pInstrument); std::set*>::iterator iter = consumers.begin(); std::set*>::iterator end = consumers.end(); for (; iter != end; ++iter) { - gig::EngineChannel* pEngineChannel = dynamic_cast(*iter); + EngineChannel* pEngineChannel = dynamic_cast(*iter); if (!pEngineChannel) continue; - gig::Engine* pEngine = dynamic_cast(pEngineChannel->GetEngine()); + Engine* pEngine = dynamic_cast(pEngineChannel->GetEngine()); if (!pEngine) continue; result.insert(pEngine); } @@ -806,23 +770,23 @@ * @param bLock - whether we should lock (mutex) the instrument manager * during this call and unlock at the end of this call */ - std::set InstrumentResourceManager::GetEnginesUsing(::gig::File* pFile, bool bLock) { + std::set InstrumentResourceManager::GetEnginesUsing(::gig::File* pFile, bool bLock) { if (bLock) Lock(); // get all instruments (currently in usage) that use that same gig::File std::vector< ::gig::Instrument*> instrumentsOfInterest = GetInstrumentsCurrentlyUsedOf(pFile, false/*don't lock again*/); // get all engines that use that same gig::File - std::set result; + std::set result; { for (int i = 0; i < instrumentsOfInterest.size(); i++) { std::set*> consumers = ConsumersOf(instrumentsOfInterest[i]); std::set*>::iterator iter = consumers.begin(); std::set*>::iterator end = consumers.end(); for (; iter != end; ++iter) { - gig::EngineChannel* pEngineChannel = dynamic_cast(*iter); + EngineChannel* pEngineChannel = dynamic_cast(*iter); if (!pEngineChannel) continue; - gig::Engine* pEngine = dynamic_cast(pEngineChannel->GetEngine()); + Engine* pEngine = dynamic_cast(pEngineChannel->GetEngine()); if (!pEngine) continue; // the unique, sorted container std::set makes // sure we won't have duplicates @@ -876,8 +840,8 @@ // get all engines that use that same gig::Instrument suspendedEngines = GetEnginesUsing(pInstrument, true/*lock*/); // finally, completely suspend all engines that use that same gig::Instrument - std::set::iterator iter = suspendedEngines.begin(); - std::set::iterator end = suspendedEngines.end(); + std::set::iterator iter = suspendedEngines.begin(); + std::set::iterator end = suspendedEngines.end(); for (; iter != end; ++iter) (*iter)->SuspendAll(); } @@ -900,8 +864,8 @@ // get all engines that use that same gig::File suspendedEngines = GetEnginesUsing(pFile, true/*lock*/); // finally, completely suspend all engines that use that same gig::File - std::set::iterator iter = suspendedEngines.begin(); - std::set::iterator end = suspendedEngines.end(); + std::set::iterator iter = suspendedEngines.begin(); + std::set::iterator end = suspendedEngines.end(); for (; iter != end; ++iter) (*iter)->SuspendAll(); } @@ -936,7 +900,7 @@ } void InstrumentResourceManager::GigResourceManager::Destroy(::gig::File* pResource, void* pArg) { - dmsg(1,("Freeing gig file from memory...")); + dmsg(1,("Freeing gig file '%s' from memory ...", pResource->GetFileName().c_str())); // Delete as much as possible of the gig file. Some of the // dimension regions and samples may still be in use - these @@ -957,11 +921,11 @@ for (int i = 0 ; i < region->DimensionRegions ; i++) { ::gig::DimensionRegion *d = region->pDimensionRegions[i]; - std::map< ::gig::DimensionRegion*, dimreg_info_t>::iterator iter = parent->DimRegInfo.find(d); - if (iter != parent->DimRegInfo.end()) { - dimreg_info_t& dimRegInfo = (*iter).second; + std::map< ::gig::DimensionRegion*, region_info_t>::iterator iter = parent->RegionInfo.find(d); + if (iter != parent->RegionInfo.end()) { + region_info_t& dimRegInfo = (*iter).second; dimRegInfo.file = pResource; - dimRegInfo.riff = (::RIFF::File*)pArg; + dimRegInfo.pArg = (::RIFF::File*)pArg; deleteFile = deleteInstrument = deleteRegion = false; } }