/[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 2251 by iliev, Sat Aug 20 10:38:31 2011 UTC revision 2299 by iliev, Sun Dec 11 20:50:31 2011 UTC
# Line 322  namespace sfz Line 322  namespace sfz
322          volume_oncc.clear();          volume_oncc.clear();
323          volume_curvecc.clear();          volume_curvecc.clear();
324          volume_smoothcc.clear();          volume_smoothcc.clear();
325            volume_stepcc.clear();
326          pan = 0;          pan = 0;
327          pan_oncc.clear();          pan_oncc.clear();
328          pan_curvecc.clear();          pan_curvecc.clear();
329          pan_smoothcc.clear();          pan_smoothcc.clear();
330            pan_stepcc.clear();
331          width = 100;          width = 100;
332          position = 0;          position = 0;
333          amp_keytrack = 0;          amp_keytrack = 0;
# Line 351  namespace sfz Line 353  namespace sfz
353          bend_up = 200;          bend_up = 200;
354          bend_down = -200;          bend_down = -200;
355          bend_step = 1;          bend_step = 1;
356            
357            pitch_oncc.clear();
358            pitch_smoothcc.clear();
359            pitch_curvecc.clear();
360            pitch_stepcc.clear();
361    
362          // filter          // filter
363          fil_type = LPF_2P;          fil_type = LPF_2P;
# Line 372  namespace sfz Line 379  namespace sfz
379          fil2_keycenter = 60;          fil2_keycenter = 60;
380          fil2_veltrack = 0;          fil2_veltrack = 0;
381          fil2_random = 0;          fil2_random = 0;
382            
383            cutoff_oncc.clear();
384            cutoff_smoothcc.clear();
385            cutoff_curvecc.clear();
386            cutoff_stepcc.clear();
387            cutoff2_oncc.clear();
388            cutoff2_smoothcc.clear();
389            cutoff2_curvecc.clear();
390            cutoff2_stepcc.clear();
391            
392            resonance_oncc.clear();
393            resonance_smoothcc.clear();
394            resonance_curvecc.clear();
395            resonance_stepcc.clear();
396            resonance2_oncc.clear();
397            resonance2_smoothcc.clear();
398            resonance2_curvecc.clear();
399            resonance2_stepcc.clear();
400    
401          // per voice equalizer          // per voice equalizer
402          eq1_freq = 50;          eq1_freq = 50;
# Line 416  namespace sfz Line 441  namespace sfz
441              xfout_locc.set(i, 0);              xfout_locc.set(i, 0);
442              xfout_hicc.set(i, 0);              xfout_hicc.set(i, 0);
443    
             // filter  
             cutoff_oncc.set(i, 0);  
             cutoff_smoothcc.set(i, 0);  
             cutoff_stepcc.set(i, 0);  
             cutoff_curvecc.set(i, 0);  
             resonance_oncc.set(i, 0);  
             resonance_smoothcc.set(i, 0);  
             resonance_stepcc.set(i, 0);  
             resonance_curvecc.set(i, 0);  
   
             cutoff2_oncc.set(i, 0);  
             cutoff2_smoothcc.set(i, 0);  
             cutoff2_stepcc.set(i, 0);  
             cutoff2_curvecc.set(i, 0);  
             resonance2_oncc.set(i, 0);  
             resonance2_smoothcc.set(i, 0);  
             resonance2_stepcc.set(i, 0);  
             resonance2_curvecc.set(i, 0);  
   
444              // per voice equalizer              // per voice equalizer
445              eq1_freq_oncc.set(i, 0);              eq1_freq_oncc.set(i, 0);
446              eq2_freq_oncc.set(i, 0);              eq2_freq_oncc.set(i, 0);
# Line 445  namespace sfz Line 451  namespace sfz
451              eq1_gain_oncc.set(i, 0);              eq1_gain_oncc.set(i, 0);
452              eq2_gain_oncc.set(i, 0);              eq2_gain_oncc.set(i, 0);
453              eq3_gain_oncc.set(i, 0);              eq3_gain_oncc.set(i, 0);
               
             pitchlfo_depthcc.set(i, 0);  
454          }          }
         cutoff_cc = 0;  
455    
456          eg.clear();          eg.clear();
457          lfos.clear();          lfos.clear();
# Line 551  namespace sfz Line 554  namespace sfz
554          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
555          pitchlfo_delay_oncc.clear();          pitchlfo_delay_oncc.clear();
556          pitchlfo_fade_oncc.clear();          pitchlfo_fade_oncc.clear();
557            pitchlfo_depthcc.clear();
558          pitchlfo_freqcc.clear();          pitchlfo_freqcc.clear();
559      }      }
560    
# Line 634  namespace sfz Line 638  namespace sfz
638          region->volume_oncc = volume_oncc;          region->volume_oncc = volume_oncc;
639          region->volume_curvecc = volume_curvecc;          region->volume_curvecc = volume_curvecc;
640          region->volume_smoothcc = volume_smoothcc;          region->volume_smoothcc = volume_smoothcc;
641            region->volume_stepcc = volume_stepcc;
642          region->pan = pan;          region->pan = pan;
643          region->pan_oncc = pan_oncc;          region->pan_oncc = pan_oncc;
644          region->pan_curvecc = pan_curvecc;          region->pan_curvecc = pan_curvecc;
645          region->pan_smoothcc = pan_smoothcc;          region->pan_smoothcc = pan_smoothcc;
646            region->pan_stepcc = pan_stepcc;
647          region->width = width;          region->width = width;
648          region->position = position;          region->position = position;
649          region->amp_keytrack = amp_keytrack;          region->amp_keytrack = amp_keytrack;
# Line 673  namespace sfz Line 679  namespace sfz
679          region->bend_up = bend_up;          region->bend_up = bend_up;
680          region->bend_down = bend_down;          region->bend_down = bend_down;
681          region->bend_step = bend_step;          region->bend_step = bend_step;
682            
683            region->pitch_oncc     = pitch_oncc;
684            region->pitch_smoothcc = pitch_smoothcc;
685            region->pitch_curvecc  = pitch_curvecc;
686            region->pitch_stepcc   = pitch_stepcc;
687    
688          // filter          // filter
689          region->fil_type = fil_type;          region->fil_type = fil_type;
690          region->cutoff = cutoff;          region->cutoff = cutoff;
691          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
         region->cutoff_cc = cutoff_cc;  
692          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
693          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
694          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 1031  namespace sfz Line 1041  namespace sfz
1041              copySmoothValues(r->volume_smoothcc, r->volume_oncc);              copySmoothValues(r->volume_smoothcc, r->volume_oncc);
1042              r->volume_smoothcc.clear();              r->volume_smoothcc.clear();
1043                            
1044                copyStepValues(r->volume_stepcc, r->volume_oncc);
1045                r->volume_stepcc.clear();
1046                
1047                copyCurves(r->pitch_curvecc, r->pitch_oncc);
1048                r->pitch_curvecc.clear();
1049                
1050                copySmoothValues(r->pitch_smoothcc, r->pitch_oncc);
1051                r->pitch_smoothcc.clear();
1052                
1053                copyStepValues(r->pitch_stepcc, r->pitch_oncc);
1054                r->pitch_stepcc.clear();
1055                
1056              copyCurves(r->pan_curvecc, r->pan_oncc);              copyCurves(r->pan_curvecc, r->pan_oncc);
1057              r->pan_curvecc.clear();              r->pan_curvecc.clear();
1058                            
1059              copySmoothValues(r->pan_smoothcc, r->pan_oncc);              copySmoothValues(r->pan_smoothcc, r->pan_oncc);
1060              r->pan_smoothcc.clear();              r->pan_smoothcc.clear();
1061                            
1062                copyStepValues(r->pan_stepcc, r->pan_oncc);
1063                r->pan_stepcc.clear();
1064                
1065                copyCurves(r->cutoff_curvecc, r->cutoff_oncc);
1066                r->cutoff_curvecc.clear();
1067                
1068                copySmoothValues(r->cutoff_smoothcc, r->cutoff_oncc);
1069                r->cutoff_smoothcc.clear();
1070                
1071                copyStepValues(r->cutoff_stepcc, r->cutoff_oncc);
1072                r->cutoff_stepcc.clear();
1073                
1074                copyCurves(r->cutoff2_curvecc, r->cutoff2_oncc);
1075                r->cutoff2_curvecc.clear();
1076                
1077                copySmoothValues(r->cutoff2_smoothcc, r->cutoff2_oncc);
1078                r->cutoff2_smoothcc.clear();
1079                
1080                copyStepValues(r->cutoff2_stepcc, r->cutoff2_oncc);
1081                r->cutoff2_stepcc.clear();
1082                
1083                copyCurves(r->resonance_curvecc, r->resonance_oncc);
1084                r->resonance_curvecc.clear();
1085                
1086                copySmoothValues(r->resonance_smoothcc, r->resonance_oncc);
1087                r->resonance_smoothcc.clear();
1088                
1089                copyStepValues(r->resonance_stepcc, r->resonance_oncc);
1090                r->resonance_stepcc.clear();
1091                
1092                copyCurves(r->resonance2_curvecc, r->resonance2_oncc);
1093                r->resonance2_curvecc.clear();
1094                
1095                copySmoothValues(r->resonance2_smoothcc, r->resonance2_oncc);
1096                r->resonance2_smoothcc.clear();
1097                
1098                copyStepValues(r->resonance2_stepcc, r->resonance2_oncc);
1099                r->resonance2_stepcc.clear();
1100                
1101              for (int j = 0; j < r->eg.size(); j++) {              for (int j = 0; j < r->eg.size(); j++) {
1102                  copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);                  copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1103                  r->eg[j].pan_curvecc.clear();                  r->eg[j].pan_curvecc.clear();
1104              }              }
1105                            
1106              for (int j = 0; j < r->lfos.size(); j++) {              for (int j = 0; j < r->lfos.size(); j++) {
1107                    r->lfos[j].copySmoothValues();
1108                    r->lfos[j].copyStepValues();
1109                    
1110                  copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);                  copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
1111                  r->lfos[j].volume_smoothcc.clear();                  r->lfos[j].volume_smoothcc.clear();
1112                                    
1113                    copyStepValues(r->lfos[j].volume_stepcc, r->lfos[j].volume_oncc);
1114                    r->lfos[j].volume_stepcc.clear();
1115                    
1116                  copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);                  copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
1117                  r->lfos[j].freq_smoothcc.clear();                  r->lfos[j].freq_smoothcc.clear();
1118                                    
1119                    copyStepValues(r->lfos[j].freq_stepcc, r->lfos[j].freq_oncc);
1120                    r->lfos[j].freq_stepcc.clear();
1121                    
1122                  copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);                  copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
1123                  r->lfos[j].pitch_smoothcc.clear();                  r->lfos[j].pitch_smoothcc.clear();
1124                                    
1125                    copyStepValues(r->lfos[j].pitch_stepcc, r->lfos[j].pitch_oncc);
1126                    r->lfos[j].pitch_stepcc.clear();
1127                    
1128                  copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);                  copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
1129                  r->lfos[j].pan_smoothcc.clear();                  r->lfos[j].pan_smoothcc.clear();
1130                                    
1131                    copyStepValues(r->lfos[j].pan_stepcc, r->lfos[j].pan_oncc);
1132                    r->lfos[j].pan_stepcc.clear();
1133                    
1134                  copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);                  copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
1135                  r->lfos[j].cutoff_smoothcc.clear();                  r->lfos[j].cutoff_smoothcc.clear();
1136                                    
1137                    copyStepValues(r->lfos[j].cutoff_stepcc, r->lfos[j].cutoff_oncc);
1138                    r->lfos[j].cutoff_stepcc.clear();
1139                    
1140                  copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);                  copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
1141                  r->lfos[j].resonance_smoothcc.clear();                  r->lfos[j].resonance_smoothcc.clear();
1142                    
1143                    copyStepValues(r->lfos[j].resonance_stepcc, r->lfos[j].resonance_oncc);
1144                    r->lfos[j].resonance_stepcc.clear();
1145              }              }
1146          }          }
1147      }      }
# Line 1096  namespace sfz Line 1178  namespace sfz
1178          }          }
1179      }      }
1180            
1181        void File::copyStepValues(LinuxSampler::ArrayList<CC>& steps, LinuxSampler::ArrayList<CC>& dest) {
1182            for (int i = 0; i < steps.size(); i++) {
1183                for (int j = 0; j < dest.size(); j++) {
1184                    if (steps[i].Controller == dest[j].Controller) {
1185                        dest[j].Step = steps[i].Step;
1186                    }
1187                }
1188            }
1189        }
1190        
1191      int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {      int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1192          int i;          int i;
1193          std::istringstream iss(s);          std::istringstream iss(s);
# Line 1381  namespace sfz Line 1473  namespace sfz
1473          }          }
1474          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);
1475          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);
1476          else if ("cutoff_chanaft"  == key) pCurDef->cutoff_chanaft = ToInt(value);          else if ("cutoff_chanaft"  == key) {
1477          else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);              pCurDef->cutoff_chanaft = check(key, -9600, 9600, ToInt(value));
1478                pCurDef->cutoff_oncc.add( CC(128, check(key, -9600, 9600, ToInt(value))) );
1479            } else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);
1480          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);
1481          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);
1482          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);
# Line 1448  namespace sfz Line 1542  namespace sfz
1542              else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));              else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
1543              else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1544              else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );              else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
1545                else if (strcmp(s, "_eq1freq") == 0) eg(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1546                else if (strcmp(s, "_eq2freq") == 0) eg(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1547                else if (strcmp(s, "_eq3freq") == 0) eg(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1548                else if (strcmp(s, "_eq1bw") == 0) eg(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1549                else if (strcmp(s, "_eq2bw") == 0) eg(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1550                else if (strcmp(s, "_eq3bw") == 0) eg(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1551                else if (strcmp(s, "_eq1gain") == 0) eg(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1552                else if (strcmp(s, "_eq2gain") == 0) eg(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1553                else if (strcmp(s, "_eq3gain") == 0) eg(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1554                else if (sscanf(s, "_eq1freq_oncc%d", &y)) eg(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1555                else if (sscanf(s, "_eq2freq_oncc%d", &y)) eg(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1556                else if (sscanf(s, "_eq3freq_oncc%d", &y)) eg(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1557                else if (sscanf(s, "_eq1bw_oncc%d", &y)) eg(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1558                else if (sscanf(s, "_eq2bw_oncc%d", &y)) eg(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1559                else if (sscanf(s, "_eq3bw_oncc%d", &y)) eg(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1560                else if (sscanf(s, "_eq1gain_oncc%d", &y)) eg(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1561                else if (sscanf(s, "_eq2gain_oncc%d", &y)) eg(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1562                else if (sscanf(s, "_eq3gain_oncc%d", &y)) eg(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1563              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1564          }          }
1565    
# Line 1499  namespace sfz Line 1611  namespace sfz
1611          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1612          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1613          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1614            else if ("amplfo_freqchanaft" == key) pCurDef->amplfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1615          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1616            else if ("amplfo_depthchanaft" == key) pCurDef->amplfo_depthcc.add( CC(128, check(key, -10.0f, 10.0f, ToFloat(value))) );
1617          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1618          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1619          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1620            else if ("fillfo_freqchanaft" == key) pCurDef->fillfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1621          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1622            else if ("fillfo_depthchanaft" == key) pCurDef->fillfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1623          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1624          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1625          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1626            else if ("pitchlfo_freqchanaft" == key) pCurDef->pitchlfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1627          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1628            else if ("pitchlfo_depthchanaft" == key) pCurDef->pitchlfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1629            
1630                    
1631          // v2 LFO          // v2 LFO
1632          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
# Line 1515  namespace sfz Line 1634  namespace sfz
1634              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));
1635              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))) );
1636              else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );              else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1637                else if (sscanf(s, "_freq_stepcc%d", &y)) lfo(x).freq_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 20.0f, ToFloat(value))) );
1638              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1639              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));
1640              else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );              else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
# Line 1525  namespace sfz Line 1645  namespace sfz
1645              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));
1646              else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );              else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1647              else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );              else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1648                else if (sscanf(s, "_volume_stepcc%d", &y)) lfo(x).volume_stepcc.add( CC(y, 0, -1, 0, check(key, -20.0f, 20.0f, ToFloat(value))) );
1649              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));
1650              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))) );
1651              else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );              else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1652                else if (sscanf(s, "_pitch_stepcc%d", &y)) lfo(x).pitch_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1653              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));
1654              else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );              else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1655              else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );              else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1656                else if (sscanf(s, "_cutoff_stepcc%d", &y)) lfo(x).cutoff_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1657              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));
1658              else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );              else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1659              else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );              else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1660                else if (sscanf(s, "_resonance_stepcc%d", &y)) lfo(x).resonance_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(value))) );
1661              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));
1662              else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1663              else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );              else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1664                else if (sscanf(s, "_pan_stepcc%d", &y)) lfo(x).pan_stepcc.add( CC(y, 0, -1, 0, check(key, -100.0f, 100.0f, ToFloat(value))) );
1665                else if (strcmp(s, "_eq1freq") == 0) lfo(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1666                else if (strcmp(s, "_eq2freq") == 0) lfo(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1667                else if (strcmp(s, "_eq3freq") == 0) lfo(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1668                else if (strcmp(s, "_eq1bw") == 0) lfo(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1669                else if (strcmp(s, "_eq2bw") == 0) lfo(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1670                else if (strcmp(s, "_eq3bw") == 0) lfo(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1671                else if (strcmp(s, "_eq1gain") == 0) lfo(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1672                else if (strcmp(s, "_eq2gain") == 0) lfo(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1673                else if (strcmp(s, "_eq3gain") == 0) lfo(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1674                else if (sscanf(s, "_eq1freq_oncc%d", &y)) lfo(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1675                else if (sscanf(s, "_eq1freq_smoothcc%d", &y)) lfo(x).eq1freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1676                else if (sscanf(s, "_eq1freq_stepcc%d", &y)) lfo(x).eq1freq_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1677                else if (sscanf(s, "_eq2freq_oncc%d", &y)) lfo(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1678                else if (sscanf(s, "_eq2freq_smoothcc%d", &y)) lfo(x).eq2freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1679                else if (sscanf(s, "_eq2freq_stepcc%d", &y)) lfo(x).eq2freq_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1680                else if (sscanf(s, "_eq3freq_oncc%d", &y)) lfo(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1681                else if (sscanf(s, "_eq3freq_smoothcc%d", &y)) lfo(x).eq3freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1682                else if (sscanf(s, "_eq3freq_stepcc%d", &y)) lfo(x).eq3freq_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1683                else if (sscanf(s, "_eq1bw_oncc%d", &y)) lfo(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1684                else if (sscanf(s, "_eq1bw_smoothcc%d", &y)) lfo(x).eq1bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1685                else if (sscanf(s, "_eq1bw_stepcc%d", &y)) lfo(x).eq1bw_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1686                else if (sscanf(s, "_eq2bw_oncc%d", &y)) lfo(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1687                else if (sscanf(s, "_eq2bw_smoothcc%d", &y)) lfo(x).eq2bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1688                else if (sscanf(s, "_eq2bw_stepcc%d", &y)) lfo(x).eq2bw_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1689                else if (sscanf(s, "_eq3bw_oncc%d", &y)) lfo(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1690                else if (sscanf(s, "_eq3bw_smoothcc%d", &y)) lfo(x).eq3bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1691                else if (sscanf(s, "_eq3bw_stepcc%d", &y)) lfo(x).eq3bw_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1692                else if (sscanf(s, "_eq1gain_oncc%d", &y)) lfo(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1693                else if (sscanf(s, "_eq1gain_smoothcc%d", &y)) lfo(x).eq1gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1694                else if (sscanf(s, "_eq1gain_stepcc%d", &y)) lfo(x).eq1gain_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1695                else if (sscanf(s, "_eq2gain_oncc%d", &y)) lfo(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1696                else if (sscanf(s, "_eq2gain_smoothcc%d", &y)) lfo(x).eq2gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1697                else if (sscanf(s, "_eq2gain_stepcc%d", &y)) lfo(x).eq2gain_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1698                else if (sscanf(s, "_eq3gain_oncc%d", &y)) lfo(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1699                else if (sscanf(s, "_eq3gain_smoothcc%d", &y)) lfo(x).eq3gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1700                else if (sscanf(s, "_eq3gain_stepcc%d", &y)) lfo(x).eq3gain_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1701              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1702          }          }
1703                    
# Line 1571  namespace sfz Line 1732  namespace sfz
1732              else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));              else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));
1733              else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));              else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));
1734              else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));              else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));
1735                
1736                // pitch
1737                else if ("pitch" == key_cc) pCurDef->pitch_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1738                else if ("pitch_smooth" == key_cc) pCurDef->pitch_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1739                else if ("pitch_curve" == key_cc) pCurDef->pitch_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1740                else if ("pitch_step" == key_cc) pCurDef->pitch_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0, 1200, ToInt(value))) );
1741    
1742              // filter              // filter
1743              else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {              else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {
1744                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1745                  pCurDef->cutoff_cc = num_cc;              } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1746              } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));              else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1747              else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.set(num_cc, ToInt(value));              else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1748              else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value));              else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -1200, 1200, ToInt(value))) );
1749              else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));              else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -1200, 1200, ToInt(value))) );
1750              else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value));              else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1751              else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.set(num_cc, ToInt(value));              else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1752              else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.set(num_cc, ToInt(value));              else if ("resonance" == key_cc) pCurDef->resonance_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1753              else if ("resonance" == key_cc) pCurDef->resonance_oncc.set(num_cc, ToInt(value));              else if ("resonance2" == key_cc) pCurDef->resonance2_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1754              else if ("resonance2" == key_cc) pCurDef->resonance2_oncc.set(num_cc, ToInt(value));              else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1755              else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.set(num_cc, ToInt(value));              else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1756              else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.set(num_cc, ToInt(value));              else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(value))) );
1757              else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value));              else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(value))) );
1758              else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.set(num_cc, ToInt(value));              else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
1759              else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.set(num_cc, ToInt(value));              else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
             else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.set(num_cc, ToInt(value));  
1760    
1761              // per voice equalizer              // per voice equalizer
1762              else if ("eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));              else if ("eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));
# Line 1631  namespace sfz Line 1797  namespace sfz
1797                            
1798              else if ("pitchlfo_delay" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );              else if ("pitchlfo_delay" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1799              else if ("pitchlfo_fade" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );              else if ("pitchlfo_fade" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1800              else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));              else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1801              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))) );
1802              else if ("fillfo_delay" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );              else if ("fillfo_delay" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1803              else if ("fillfo_fade" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );              else if ("fillfo_fade" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
# Line 1644  namespace sfz Line 1810  namespace sfz
1810              else if ("volume" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -144.0f, 100.0f, ToFloat(value))) );              else if ("volume" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -144.0f, 100.0f, ToFloat(value))) );
1811              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))) );
1812              else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );              else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1813                else if ("volume_step" == key_cc) pCurDef->volume_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -20.0f, 20.0f, ToFloat(value))) );
1814              else if ("pan" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("pan" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1815              else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );              else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1816              else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );              else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1817                else if ("pan_step" == key_cc) pCurDef->pan_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -100.0f, 100.0f, ToFloat(value))) );
1818              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1819          }          }
1820    
# Line 1710  namespace sfz Line 1878  namespace sfz
1878      { }      { }
1879            
1880      void EG::Copy(const EG& eg) {      void EG::Copy(const EG& eg) {
1881            EqImpl::Copy(static_cast<const EqImpl>(eg));
1882            
1883          sustain    = eg.sustain;          sustain    = eg.sustain;
1884          loop       = eg.loop;          loop       = eg.loop;
1885          loop_count = eg.loop_count;          loop_count = eg.loop_count;
# Line 1737  namespace sfz Line 1907  namespace sfz
1907      }      }
1908            
1909      void LFO::Copy(const LFO& lfo) {      void LFO::Copy(const LFO& lfo) {
1910            EqSmoothStepImpl::Copy(static_cast<const EqSmoothStepImpl>(lfo));
1911            
1912          delay      = lfo.delay;          delay      = lfo.delay;
1913          freq       = lfo.freq;          freq       = lfo.freq;
1914          fade       = lfo.fade;          fade       = lfo.fade;
# Line 1751  namespace sfz Line 1923  namespace sfz
1923          delay_oncc      = lfo.delay_oncc;          delay_oncc      = lfo.delay_oncc;
1924          freq_oncc       = lfo.freq_oncc;          freq_oncc       = lfo.freq_oncc;
1925          freq_smoothcc   = lfo.freq_smoothcc;          freq_smoothcc   = lfo.freq_smoothcc;
1926            freq_stepcc     = lfo.freq_stepcc;
1927          fade_oncc       = lfo.fade_oncc;          fade_oncc       = lfo.fade_oncc;
1928          phase_oncc      = lfo.phase_oncc;          phase_oncc      = lfo.phase_oncc;
1929          pitch_oncc      = lfo.pitch_oncc;          pitch_oncc      = lfo.pitch_oncc;
1930          pitch_smoothcc  = lfo.pitch_smoothcc;          pitch_smoothcc  = lfo.pitch_smoothcc;
1931            pitch_stepcc    = lfo.pitch_stepcc;
1932          volume_oncc     = lfo.volume_oncc;          volume_oncc     = lfo.volume_oncc;
1933          volume_smoothcc = lfo.volume_smoothcc;          volume_smoothcc = lfo.volume_smoothcc;
1934            volume_stepcc   = lfo.volume_stepcc;
1935          pan_oncc        = lfo.pan_oncc;          pan_oncc        = lfo.pan_oncc;
1936          pan_smoothcc    = lfo.pan_smoothcc;          pan_smoothcc    = lfo.pan_smoothcc;
1937            pan_stepcc      = lfo.pan_stepcc;
1938          cutoff_oncc     = lfo.cutoff_oncc;          cutoff_oncc     = lfo.cutoff_oncc;
1939          cutoff_smoothcc = lfo.cutoff_smoothcc;          cutoff_smoothcc = lfo.cutoff_smoothcc;
1940            cutoff_stepcc   = lfo.cutoff_stepcc;
1941          resonance_oncc     = lfo.resonance_oncc;          resonance_oncc     = lfo.resonance_oncc;
1942          resonance_smoothcc = lfo.resonance_smoothcc;          resonance_smoothcc = lfo.resonance_smoothcc;
1943            resonance_stepcc   = lfo.resonance_stepcc;
1944        }
1945        
1946        EqImpl::EqImpl() {
1947            eq1freq = eq2freq = eq3freq = 0;
1948            eq1bw = eq2bw = eq3bw = 0;
1949            eq1gain = eq2gain = eq3gain = 0;
1950        }
1951        
1952        void EqImpl::Copy(const EqImpl& eq) {
1953            eq1freq = eq.eq1freq;
1954            eq2freq = eq.eq2freq;
1955            eq3freq = eq.eq3freq;
1956            eq1bw   = eq.eq1bw;
1957            eq2bw   = eq.eq2bw;
1958            eq3bw   = eq.eq3bw;
1959            eq1gain = eq.eq1gain;
1960            eq2gain = eq.eq2gain;
1961            eq3gain = eq.eq3gain;
1962            
1963            eq1freq_oncc = eq.eq1freq_oncc;
1964            eq2freq_oncc = eq.eq2freq_oncc;
1965            eq3freq_oncc = eq.eq3freq_oncc;
1966            eq1bw_oncc   = eq.eq1bw_oncc;
1967            eq2bw_oncc   = eq.eq2bw_oncc;
1968            eq3bw_oncc   = eq.eq3bw_oncc;
1969            eq1gain_oncc = eq.eq1gain_oncc;
1970            eq2gain_oncc = eq.eq2gain_oncc;
1971            eq3gain_oncc = eq.eq3gain_oncc;
1972        }
1973        
1974        bool EqImpl::HasEq() {
1975            return eq1freq || eq2freq || eq3freq || eq1bw || eq2bw || eq3bw ||
1976                   eq1gain || eq2gain || eq3gain || !eq1gain_oncc.empty() ||
1977                   !eq2gain_oncc.empty() || !eq3gain_oncc.empty() ||
1978                   !eq1freq_oncc.empty() || !eq2freq_oncc.empty() || !eq3freq_oncc.empty() ||
1979                   !eq1bw_oncc.empty() || !eq2bw_oncc.empty() || !eq3bw_oncc.empty();
1980        }
1981        
1982        void EqSmoothStepImpl::Copy(const EqSmoothStepImpl& eq) {
1983            EqImpl::Copy(eq);
1984            
1985            eq1freq_smoothcc = eq.eq1freq_smoothcc;
1986            eq2freq_smoothcc = eq.eq2freq_smoothcc;
1987            eq3freq_smoothcc = eq.eq3freq_smoothcc;
1988            eq1bw_smoothcc   = eq.eq1bw_smoothcc;
1989            eq2bw_smoothcc   = eq.eq2bw_smoothcc;
1990            eq3bw_smoothcc   = eq.eq3bw_smoothcc;
1991            eq1gain_smoothcc = eq.eq1gain_smoothcc;
1992            eq2gain_smoothcc = eq.eq2gain_smoothcc;
1993            eq3gain_smoothcc = eq.eq3gain_smoothcc;
1994            
1995            eq1freq_stepcc = eq.eq1freq_stepcc;
1996            eq2freq_stepcc = eq.eq2freq_stepcc;
1997            eq3freq_stepcc = eq.eq3freq_stepcc;
1998            eq1bw_stepcc   = eq.eq1bw_stepcc;
1999            eq2bw_stepcc   = eq.eq2bw_stepcc;
2000            eq3bw_stepcc   = eq.eq3bw_stepcc;
2001            eq1gain_stepcc = eq.eq1gain_stepcc;
2002            eq2gain_stepcc = eq.eq2gain_stepcc;
2003            eq3gain_stepcc = eq.eq3gain_stepcc;
2004        }
2005        
2006        void EqSmoothStepImpl::copySmoothValues() {
2007            File::copySmoothValues(eq1freq_smoothcc, eq1freq_oncc);
2008            eq1freq_smoothcc.clear();
2009            
2010            File::copySmoothValues(eq2freq_smoothcc, eq2freq_oncc);
2011            eq2freq_smoothcc.clear();
2012            
2013            File::copySmoothValues(eq3freq_smoothcc, eq3freq_oncc);
2014            eq3freq_smoothcc.clear();
2015            
2016            File::copySmoothValues(eq1bw_smoothcc, eq1bw_oncc);
2017            eq1bw_smoothcc.clear();
2018            
2019            File::copySmoothValues(eq2bw_smoothcc, eq2bw_oncc);
2020            eq2bw_smoothcc.clear();
2021            
2022            File::copySmoothValues(eq3bw_smoothcc, eq3bw_oncc);
2023            eq3bw_smoothcc.clear();
2024            
2025            File::copySmoothValues(eq1gain_smoothcc, eq1gain_oncc);
2026            eq1gain_smoothcc.clear();
2027            
2028            File::copySmoothValues(eq2gain_smoothcc, eq2gain_oncc);
2029            eq2gain_smoothcc.clear();
2030            
2031            File::copySmoothValues(eq3gain_smoothcc, eq3gain_oncc);
2032            eq3gain_smoothcc.clear();
2033        }
2034        
2035        void EqSmoothStepImpl::copyStepValues() {
2036            File::copyStepValues(eq1freq_stepcc, eq1freq_oncc);
2037            eq1freq_stepcc.clear();
2038            
2039            File::copyStepValues(eq2freq_stepcc, eq2freq_oncc);
2040            eq2freq_stepcc.clear();
2041            
2042            File::copyStepValues(eq3freq_stepcc, eq3freq_oncc);
2043            eq3freq_stepcc.clear();
2044            
2045            File::copyStepValues(eq1bw_stepcc, eq1bw_oncc);
2046            eq1bw_stepcc.clear();
2047            
2048            File::copyStepValues(eq2bw_stepcc, eq2bw_oncc);
2049            eq2bw_stepcc.clear();
2050            
2051            File::copyStepValues(eq3bw_stepcc, eq3bw_oncc);
2052            eq3bw_stepcc.clear();
2053            
2054            File::copyStepValues(eq1gain_stepcc, eq1gain_oncc);
2055            eq1gain_stepcc.clear();
2056            
2057            File::copyStepValues(eq2gain_stepcc, eq2gain_oncc);
2058            eq2gain_stepcc.clear();
2059            
2060            File::copyStepValues(eq3gain_stepcc, eq3gain_oncc);
2061            eq3gain_stepcc.clear();
2062      }      }
2063    
2064      EG& File::eg(int x) {      EG& File::eg(int x) {
Legend:
Removed from v.2251  
changed lines
  Added in v.2299
  ViewVC Help
Powered by ViewVC