/[svn]/linuxsampler/trunk/src/engines/sfz/InstrumentResourceManager.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/engines/sfz/InstrumentResourceManager.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3053 by persson, Thu Mar 8 19:40:14 2012 UTC revision 3054 by schoenebeck, Thu Dec 15 12:47:45 2016 UTC
# Line 111  namespace LinuxSampler { namespace sfz { Line 111  namespace LinuxSampler { namespace sfz {
111    
112          // cache initial samples points (for actually needed samples)          // cache initial samples points (for actually needed samples)
113          dmsg(1,("Caching initial samples..."));          dmsg(1,("Caching initial samples..."));
114          int regionCount = pInstrument->regions.size();          int regionCount = (int) pInstrument->regions.size();
115          uint maxSamplesPerCycle = GetMaxSamplesPerCycle(pConsumer);          uint maxSamplesPerCycle = GetMaxSamplesPerCycle(pConsumer);
116          for (int i = 0 ; i < regionCount ; i++) {          for (int i = 0 ; i < regionCount ; i++) {
117              float localProgress = (float) i / (float) regionCount;              float localProgress = (float) i / (float) regionCount;
# Line 178  namespace LinuxSampler { namespace sfz { Line 178  namespace LinuxSampler { namespace sfz {
178          bool deleteInstrument = true;          bool deleteInstrument = true;
179          ::sfz::Instrument* pInstr = pResource->GetInstrument();          ::sfz::Instrument* pInstr = pResource->GetInstrument();
180    
181          for (int i = pInstr->regions.size() - 1; i >= 0 ; i--) {          for (int i = (int)pInstr->regions.size() - 1; i >= 0 ; i--) {
182              ::sfz::Region* pRegion = pInstr->regions[i];              ::sfz::Region* pRegion = pInstr->regions[i];
183              std::map< ::sfz::Region*, region_info_t>::iterator iter = parent->RegionInfo.find(pRegion);              std::map< ::sfz::Region*, region_info_t>::iterator iter = parent->RegionInfo.find(pRegion);
184              if (iter != parent->RegionInfo.end()) {              if (iter != parent->RegionInfo.end()) {
Legend:
Removed from v.3053  
changed lines
  Added in v.3054
  ViewVC Help
Powered by ViewVC