/[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 2233 by iliev, Mon Aug 8 18:46:19 2011 UTC
# Line 513  namespace sfz Line 513  namespace sfz
513          amplfo_fade      = 0;          amplfo_fade      = 0;
514          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 */
515          amplfo_depth     = 0;          amplfo_depth     = 0;
516            amplfo_depthcc.clear();
517          amplfo_freqcc.clear();          amplfo_freqcc.clear();
518    
519          fillfo_delay     = 0;          fillfo_delay     = 0;
520          fillfo_fade      = 0;          fillfo_fade      = 0;
521          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 */
522          fillfo_depth     = 0;          fillfo_depth     = 0;
523            fillfo_depthcc.clear();
524          fillfo_freqcc.clear();          fillfo_freqcc.clear();
525    
526          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
# Line 773  namespace sfz Line 775  namespace sfz
775          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
776          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
777                    
778            region->amplfo_depthcc   = amplfo_depthcc;
779          region->amplfo_freqcc    = amplfo_freqcc;          region->amplfo_freqcc    = amplfo_freqcc;
780    
781          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
# Line 780  namespace sfz Line 783  namespace sfz
783          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
784          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
785                    
786            region->fillfo_depthcc   = fillfo_depthcc;
787          region->fillfo_freqcc    = fillfo_freqcc;          region->fillfo_freqcc    = fillfo_freqcc;
788    
789          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
# Line 965  namespace sfz Line 969  namespace sfz
969              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
970          }          }
971                    
972          for (int k = 0; k < _instrument->regions.size(); k++) {          for (int i = 0; i < _instrument->regions.size(); i++) {
973              Region* r = _instrument->regions[k];              Region* r = _instrument->regions[i];
974                            
975              copyCurves(r->volume_curvecc, r->volume_oncc);              copyCurves(r->volume_curvecc, r->volume_oncc);
             copySmoothValues(r->volume_smoothcc, r->volume_oncc);  
               
976              r->volume_curvecc.clear();              r->volume_curvecc.clear();
977                
978                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
979              r->volume_smoothcc.clear();              r->volume_smoothcc.clear();
980                
981                for (int j = 0; j < r->lfos.size(); j++) {
982                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
983                    r->lfos[j].volume_smoothcc.clear();
984                    
985                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
986                    r->lfos[j].freq_smoothcc.clear();
987                    
988                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
989                    r->lfos[j].pitch_smoothcc.clear();
990                    
991                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
992                    r->lfos[j].pan_smoothcc.clear();
993                    
994                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
995                    r->lfos[j].cutoff_smoothcc.clear();
996                    
997                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
998                    r->lfos[j].resonance_smoothcc.clear();
999                }
1000          }          }
1001      }      }
1002    
# Line 1392  namespace sfz Line 1416  namespace sfz
1416              const char* s = key.c_str() + y;              const char* s = key.c_str() + y;
1417              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));
1418              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))) );
1419                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1420              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1421              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));
1422                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1423              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));
1424              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))) );
1425              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));
1426              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))) );
1427              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));
1428                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1429                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1430              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));
1431              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))) );
1432                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1433              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));
1434                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1435                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1436              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));
1437                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1438                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1439              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));
1440                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1441                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1442              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1443          }          }
1444                    
# Line 1477  namespace sfz Line 1512  namespace sfz
1512                            
1513              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));
1514              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))) );
1515                else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1516              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))) );
1517                else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1518              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))) );
1519              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))) );
1520              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 1569  namespace sfz Line 1606  namespace sfz
1606          cutoff     = lfo.cutoff;          cutoff     = lfo.cutoff;
1607          resonance  = lfo.resonance;          resonance  = lfo.resonance;
1608          pan        = lfo.pan;          pan        = lfo.pan;
1609          freq_oncc  = lfo.freq_oncc;          
1610          fade_oncc  = lfo.fade_oncc;          delay_oncc      = lfo.delay_oncc;
1611          phase_oncc = lfo.phase_oncc;          freq_oncc       = lfo.freq_oncc;
1612          pitch_oncc = lfo.pitch_oncc;          freq_smoothcc   = lfo.freq_smoothcc;
1613            fade_oncc       = lfo.fade_oncc;
1614            phase_oncc      = lfo.phase_oncc;
1615            pitch_oncc      = lfo.pitch_oncc;
1616            pitch_smoothcc  = lfo.pitch_smoothcc;
1617            volume_oncc     = lfo.volume_oncc;
1618            volume_smoothcc = lfo.volume_smoothcc;
1619            pan_oncc        = lfo.pan_oncc;
1620            pan_smoothcc    = lfo.pan_smoothcc;
1621            cutoff_oncc     = lfo.cutoff_oncc;
1622            cutoff_smoothcc = lfo.cutoff_smoothcc;
1623            resonance_oncc     = lfo.resonance_oncc;
1624            resonance_smoothcc = lfo.resonance_smoothcc;
1625      }      }
1626    
1627      EG& File::eg(int x) {      EG& File::eg(int x) {
Legend:
Removed from v.2232  
changed lines
  Added in v.2233
  ViewVC Help
Powered by ViewVC