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

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

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

revision 2175 by persson, Mon Apr 25 08:12:36 2011 UTC revision 2216 by iliev, Mon Jul 25 17:21:16 2011 UTC
# Line 37  Line 37 
37  namespace sfz  namespace sfz
38  {  {
39    
40      Sample* SampleManager::FindSample(std::string samplePath) {      Sample* SampleManager::FindSample(std::string samplePath, int offset) {
41          std::map<Sample*, std::set<Region*> >::iterator it = sampleMap.begin();          std::map<Sample*, std::set<Region*> >::iterator it = sampleMap.begin();
42          for (; it != sampleMap.end(); it++) {          for (; it != sampleMap.end(); it++) {
43              if (it->first->GetFile() == samplePath) return it->first;              if (it->first->GetFile() == samplePath) {
44                    /* Because the start of the sample is cached in RAM we treat
45                     * same sample with different offset as different samples
46                     * // TODO: Ignore offset when the whole sample is cached in RAM?
47                     */
48                    int maxOffset = it->first->MaxOffset;
49                    if(it->first->Offset == offset || (it->first->Offset < maxOffset && offset < maxOffset)) {
50                        return it->first;
51                    }
52                }
53          }          }
54    
55          return NULL;          return NULL;
# Line 90  namespace sfz Line 99  namespace sfz
99      Sample* Region::GetSample(bool create)      Sample* Region::GetSample(bool create)
100      {      {
101          if(pSample == NULL && create) {          if(pSample == NULL && create) {
102              Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample);              int i = offset ? *offset : 0;
103                Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i);
104              if (sf != NULL) pSample = sf; // Reuse already created sample              if (sf != NULL) pSample = sf; // Reuse already created sample
105              else pSample = new Sample(sample);              else pSample = new Sample(sample, false, i);
106              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);
107          }          }
108          return pSample;          return pSample;
# Line 425  namespace sfz Line 435  namespace sfz
435          ampeg_sustain  = 100; // in percentage          ampeg_sustain  = 100; // in percentage
436          ampeg_release  = 0;          ampeg_release  = 0;
437    
438            ampeg_vel2delay   = 0;
439            ampeg_vel2attack  = 0;
440            ampeg_vel2hold    = 0;
441            ampeg_vel2decay   = 0;
442            ampeg_vel2sustain = 0;
443            ampeg_vel2release = 0;
444    
445          fileg_delay    = 0;          fileg_delay    = 0;
446          fileg_start    = 0; //in percentage          fileg_start    = 0; //in percentage
447          fileg_attack   = 0;          fileg_attack   = 0;
# Line 647  namespace sfz Line 664  namespace sfz
664          region->ampeg_sustain  = ampeg_sustain;          region->ampeg_sustain  = ampeg_sustain;
665          region->ampeg_release  = ampeg_release;          region->ampeg_release  = ampeg_release;
666    
667            region->ampeg_vel2delay   = ampeg_vel2delay;
668            region->ampeg_vel2attack  = ampeg_vel2attack;
669            region->ampeg_vel2hold    = ampeg_vel2hold;
670            region->ampeg_vel2decay   = ampeg_vel2decay;
671            region->ampeg_vel2sustain = ampeg_vel2sustain;
672            region->ampeg_vel2release = ampeg_vel2release;
673    
674          region->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
675          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
676          region->fileg_attack   = fileg_attack;          region->fileg_attack   = fileg_attack;
# Line 1021  namespace sfz Line 1045  namespace sfz
1045          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard
1046          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);
1047          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard
1048            else if ("offset" == key) pCurDef->offset = ToInt(value);
1049          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);
1050          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);
1051    
# Line 1225  namespace sfz Line 1250  namespace sfz
1250          else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);          else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);
1251          else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);          else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);
1252          else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);          else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);
1253          else if ("ampeg_release"   == key) pCurDef->ampeg_release = ToFloat(value);          else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value);
1254            else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value);
1255            else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value);
1256            else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value);
1257            else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value);
1258            else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value);
1259            else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value);
1260          else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);          else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);
1261          else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);          else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);
1262          else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);          else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);
Legend:
Removed from v.2175  
changed lines
  Added in v.2216
  ViewVC Help
Powered by ViewVC