/[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 2232 by iliev, Mon Aug 8 13:40:04 2011 UTC revision 2235 by iliev, Wed Aug 10 19:40:39 2011 UTC
# Line 51  namespace sfz Line 51  namespace sfz
51          return val;          return val;
52      }      }
53    
54      Sample* SampleManager::FindSample(std::string samplePath, int offset) {      Sample* SampleManager::FindSample(std::string samplePath, uint offset, int end) {
55          std::map<Sample*, std::set<Region*> >::iterator it = sampleMap.begin();          std::map<Sample*, std::set<Region*> >::iterator it = sampleMap.begin();
56          for (; it != sampleMap.end(); it++) {          for (; it != sampleMap.end(); it++) {
57              if (it->first->GetFile() == samplePath) {              if (it->first->GetFile() == samplePath) {
# Line 59  namespace sfz Line 59  namespace sfz
59                   * same sample with different offset as different samples                   * same sample with different offset as different samples
60                   * // TODO: Ignore offset when the whole sample is cached in RAM?                   * // TODO: Ignore offset when the whole sample is cached in RAM?
61                   */                   */
62                  int maxOffset = it->first->MaxOffset;                  if (it->first->Offset == offset && it->first->End == end) return it->first;
                 if(it->first->Offset == offset || (it->first->Offset < maxOffset && offset < maxOffset)) {  
                     return it->first;  
                 }  
63              }              }
64          }          }
65    
# Line 113  namespace sfz Line 110  namespace sfz
110      Sample* Region::GetSample(bool create)      Sample* Region::GetSample(bool create)
111      {      {
112          if(pSample == NULL && create) {          if(pSample == NULL && create) {
113              int i = offset ? *offset : 0;              uint i = offset ? *offset : 0;
114              Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i);              int e = end ? *end : -2;
115                Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i, e);
116              if (sf != NULL) pSample = sf; // Reuse already created sample              if (sf != NULL) pSample = sf; // Reuse already created sample
117              else pSample = new Sample(sample, false, i);              else pSample = new Sample(sample, false, i, e);
118              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);
119          }          }
120          return pSample;          return pSample;
# Line 513  namespace sfz Line 511  namespace sfz
511          amplfo_fade      = 0;          amplfo_fade      = 0;
512          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
513          amplfo_depth     = 0;          amplfo_depth     = 0;
514            amplfo_depthcc.clear();
515          amplfo_freqcc.clear();          amplfo_freqcc.clear();
516    
517          fillfo_delay     = 0;          fillfo_delay     = 0;
518          fillfo_fade      = 0;          fillfo_fade      = 0;
519          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
520          fillfo_depth     = 0;          fillfo_depth     = 0;
521            fillfo_depthcc.clear();
522          fillfo_freqcc.clear();          fillfo_freqcc.clear();
523    
524          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
# Line 773  namespace sfz Line 773  namespace sfz
773          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
774          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
775                    
776            region->amplfo_depthcc   = amplfo_depthcc;
777          region->amplfo_freqcc    = amplfo_freqcc;          region->amplfo_freqcc    = amplfo_freqcc;
778    
779          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
# Line 780  namespace sfz Line 781  namespace sfz
781          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
782          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
783                    
784            region->fillfo_depthcc   = fillfo_depthcc;
785          region->fillfo_freqcc    = fillfo_freqcc;          region->fillfo_freqcc    = fillfo_freqcc;
786    
787          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
# Line 965  namespace sfz Line 967  namespace sfz
967              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
968          }          }
969                    
970          for (int k = 0; k < _instrument->regions.size(); k++) {          for (int i = 0; i < _instrument->regions.size(); i++) {
971              Region* r = _instrument->regions[k];              Region* r = _instrument->regions[i];
972                            
973              copyCurves(r->volume_curvecc, r->volume_oncc);              copyCurves(r->volume_curvecc, r->volume_oncc);
             copySmoothValues(r->volume_smoothcc, r->volume_oncc);  
               
974              r->volume_curvecc.clear();              r->volume_curvecc.clear();
975                
976                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
977              r->volume_smoothcc.clear();              r->volume_smoothcc.clear();
978                
979                for (int j = 0; j < r->lfos.size(); j++) {
980                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
981                    r->lfos[j].volume_smoothcc.clear();
982                    
983                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
984                    r->lfos[j].freq_smoothcc.clear();
985                    
986                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
987                    r->lfos[j].pitch_smoothcc.clear();
988                    
989                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
990                    r->lfos[j].pan_smoothcc.clear();
991                    
992                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
993                    r->lfos[j].cutoff_smoothcc.clear();
994                    
995                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
996                    r->lfos[j].resonance_smoothcc.clear();
997                }
998          }          }
999      }      }
1000    
# Line 1325  namespace sfz Line 1347  namespace sfz
1347              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1348              else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);              else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);
1349              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1350                else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1351                else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1352                else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1353              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1354                else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1355                else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
1356                else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1357                else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1358                else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1359              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1360          }          }
1361    
# Line 1392  namespace sfz Line 1422  namespace sfz
1422              const char* s = key.c_str() + y;              const char* s = key.c_str() + y;
1423              if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));              if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
1424              else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );              else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1425                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1426              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1427              else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));              else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
1428                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1429              else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));              else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1430              else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );              else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1431              else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));              else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1432              else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );              else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1433              else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));              else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1434                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1435                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1436              else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));              else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
1437              else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );              else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1438                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1439              else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));              else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
1440                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1441                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1442              else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));              else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1443                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1444                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1445              else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));              else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1446                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1447                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1448              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1449          }          }
1450                    
# Line 1477  namespace sfz Line 1518  namespace sfz
1518                            
1519              else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));              else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));
1520              else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );              else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1521                else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1522              else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );              else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1523                else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1524              else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );              else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1525              else if ("volume_on" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("volume_on" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1526              else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );              else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
# Line 1540  namespace sfz Line 1583  namespace sfz
1583      }      }
1584    
1585      EG::EG() :      EG::EG() :
1586          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0), amplitude(0),
1587          amplitude(0), cutoff(0) {          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
1588      }      { }
1589            
1590      void EG::Copy(const EG& eg) {      void EG::Copy(const EG& eg) {
1591          sustain    = eg.sustain;          sustain    = eg.sustain;
1592          loop       = eg.loop;          loop       = eg.loop;
1593          loop_count = eg.loop_count;          loop_count = eg.loop_count;
1594          amplitude  = eg.amplitude;          amplitude  = eg.amplitude;
1595            volume     = eg.volume;
1596          cutoff     = eg.cutoff;          cutoff     = eg.cutoff;
1597            pitch      = eg.pitch;
1598            resonance  = eg.resonance;
1599          node       = eg.node;          node       = eg.node;
1600            
1601            amplitude_oncc = eg.amplitude_oncc;
1602            volume_oncc    = eg.volume_oncc;
1603            cutoff_oncc    = eg.cutoff_oncc;
1604            pitch_oncc     = eg.pitch_oncc;
1605            resonance_oncc = eg.resonance_oncc;
1606      }      }
1607            
1608      LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */      LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
# Line 1569  namespace sfz Line 1621  namespace sfz
1621          cutoff     = lfo.cutoff;          cutoff     = lfo.cutoff;
1622          resonance  = lfo.resonance;          resonance  = lfo.resonance;
1623          pan        = lfo.pan;          pan        = lfo.pan;
1624          freq_oncc  = lfo.freq_oncc;          
1625          fade_oncc  = lfo.fade_oncc;          delay_oncc      = lfo.delay_oncc;
1626          phase_oncc = lfo.phase_oncc;          freq_oncc       = lfo.freq_oncc;
1627          pitch_oncc = lfo.pitch_oncc;          freq_smoothcc   = lfo.freq_smoothcc;
1628            fade_oncc       = lfo.fade_oncc;
1629            phase_oncc      = lfo.phase_oncc;
1630            pitch_oncc      = lfo.pitch_oncc;
1631            pitch_smoothcc  = lfo.pitch_smoothcc;
1632            volume_oncc     = lfo.volume_oncc;
1633            volume_smoothcc = lfo.volume_smoothcc;
1634            pan_oncc        = lfo.pan_oncc;
1635            pan_smoothcc    = lfo.pan_smoothcc;
1636            cutoff_oncc     = lfo.cutoff_oncc;
1637            cutoff_smoothcc = lfo.cutoff_smoothcc;
1638            resonance_oncc     = lfo.resonance_oncc;
1639            resonance_smoothcc = lfo.resonance_smoothcc;
1640      }      }
1641    
1642      EG& File::eg(int x) {      EG& File::eg(int x) {
Legend:
Removed from v.2232  
changed lines
  Added in v.2235
  ViewVC Help
Powered by ViewVC