/[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 2235 by iliev, Wed Aug 10 19:40:39 2011 UTC revision 2251 by iliev, Sat Aug 20 10:38:31 2011 UTC
# Line 31  Line 31 
31    
32  #include "../../common/File.h"  #include "../../common/File.h"
33  #include "../../common/Path.h"  #include "../../common/Path.h"
 #include "../../common/global_private.h"  
34  #include "LookupTable.h"  #include "LookupTable.h"
35    
36  namespace sfz  namespace sfz
# Line 324  namespace sfz Line 323  namespace sfz
323          volume_curvecc.clear();          volume_curvecc.clear();
324          volume_smoothcc.clear();          volume_smoothcc.clear();
325          pan = 0;          pan = 0;
326            pan_oncc.clear();
327            pan_curvecc.clear();
328            pan_smoothcc.clear();
329          width = 100;          width = 100;
330          position = 0;          position = 0;
331          amp_keytrack = 0;          amp_keytrack = 0;
# Line 411  namespace sfz Line 413  namespace sfz
413              gain_oncc.set(i, 0);              gain_oncc.set(i, 0);
414              xfin_locc.set(i, 0);              xfin_locc.set(i, 0);
415              xfin_hicc.set(i, 0);              xfin_hicc.set(i, 0);
416              xfout_locc.set(i, 127);              xfout_locc.set(i, 0);
417              xfout_hicc.set(i, 127);              xfout_hicc.set(i, 0);
418    
419              // filter              // filter
420              cutoff_oncc.set(i, 0);              cutoff_oncc.set(i, 0);
# Line 490  namespace sfz Line 492  namespace sfz
492          fileg_vel2sustain = 0;          fileg_vel2sustain = 0;
493          fileg_vel2release = 0;          fileg_vel2release = 0;
494          fileg_depth       = 0;          fileg_depth       = 0;
495            
496            fileg_delay_oncc.clear();
497            fileg_start_oncc.clear();
498            fileg_attack_oncc.clear();
499            fileg_hold_oncc.clear();
500            fileg_decay_oncc.clear();
501            fileg_sustain_oncc.clear();
502            fileg_release_oncc.clear();
503            fileg_depth_oncc.clear();
504    
505          pitcheg_delay    = 0;          pitcheg_delay    = 0;
506          pitcheg_start    = 0; //in percentage          pitcheg_start    = 0; //in percentage
# Line 506  namespace sfz Line 517  namespace sfz
517          pitcheg_vel2decay   = 0;          pitcheg_vel2decay   = 0;
518          pitcheg_vel2sustain = 0;          pitcheg_vel2sustain = 0;
519          pitcheg_vel2release = 0;          pitcheg_vel2release = 0;
520            
521            pitcheg_delay_oncc.clear();
522            pitcheg_start_oncc.clear();
523            pitcheg_attack_oncc.clear();
524            pitcheg_hold_oncc.clear();
525            pitcheg_decay_oncc.clear();
526            pitcheg_sustain_oncc.clear();
527            pitcheg_release_oncc.clear();
528            pitcheg_depth_oncc.clear();
529    
530          amplfo_delay     = 0;          amplfo_delay     = 0;
531          amplfo_fade      = 0;          amplfo_fade      = 0;
532          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 */
533          amplfo_depth     = 0;          amplfo_depth     = 0;
534            amplfo_delay_oncc.clear();
535            amplfo_fade_oncc.clear();
536          amplfo_depthcc.clear();          amplfo_depthcc.clear();
537          amplfo_freqcc.clear();          amplfo_freqcc.clear();
538    
# Line 518  namespace sfz Line 540  namespace sfz
540          fillfo_fade      = 0;          fillfo_fade      = 0;
541          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 */
542          fillfo_depth     = 0;          fillfo_depth     = 0;
543            fillfo_delay_oncc.clear();
544            fillfo_fade_oncc.clear();
545          fillfo_depthcc.clear();          fillfo_depthcc.clear();
546          fillfo_freqcc.clear();          fillfo_freqcc.clear();
547    
# Line 525  namespace sfz Line 549  namespace sfz
549          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
550          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
551          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
552            pitchlfo_delay_oncc.clear();
553            pitchlfo_fade_oncc.clear();
554          pitchlfo_freqcc.clear();          pitchlfo_freqcc.clear();
555      }      }
556    
# Line 609  namespace sfz Line 635  namespace sfz
635          region->volume_curvecc = volume_curvecc;          region->volume_curvecc = volume_curvecc;
636          region->volume_smoothcc = volume_smoothcc;          region->volume_smoothcc = volume_smoothcc;
637          region->pan = pan;          region->pan = pan;
638            region->pan_oncc = pan_oncc;
639            region->pan_curvecc = pan_curvecc;
640            region->pan_smoothcc = pan_smoothcc;
641          region->width = width;          region->width = width;
642          region->position = position;          region->position = position;
643          region->amp_keytrack = amp_keytrack;          region->amp_keytrack = amp_keytrack;
# Line 751  namespace sfz Line 780  namespace sfz
780          region->fileg_vel2decay   = fileg_vel2decay;          region->fileg_vel2decay   = fileg_vel2decay;
781          region->fileg_vel2sustain = fileg_vel2sustain;          region->fileg_vel2sustain = fileg_vel2sustain;
782          region->fileg_vel2release = fileg_vel2release;          region->fileg_vel2release = fileg_vel2release;
783            
784            region->fileg_delay_oncc   = fileg_delay_oncc;
785            region->fileg_start_oncc   = fileg_start_oncc;
786            region->fileg_attack_oncc  = fileg_attack_oncc;
787            region->fileg_hold_oncc    = fileg_hold_oncc;
788            region->fileg_decay_oncc   = fileg_decay_oncc;
789            region->fileg_sustain_oncc = fileg_sustain_oncc;
790            region->fileg_release_oncc = fileg_release_oncc;
791            region->fileg_depth_oncc   = fileg_depth_oncc;
792    
793          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
794          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 767  namespace sfz Line 805  namespace sfz
805          region->pitcheg_vel2decay   = pitcheg_vel2decay;          region->pitcheg_vel2decay   = pitcheg_vel2decay;
806          region->pitcheg_vel2sustain = pitcheg_vel2sustain;          region->pitcheg_vel2sustain = pitcheg_vel2sustain;
807          region->pitcheg_vel2release = pitcheg_vel2release;          region->pitcheg_vel2release = pitcheg_vel2release;
808            
809            region->pitcheg_delay_oncc   = pitcheg_delay_oncc;
810            region->pitcheg_start_oncc   = pitcheg_start_oncc;
811            region->pitcheg_attack_oncc  = pitcheg_attack_oncc;
812            region->pitcheg_hold_oncc    = pitcheg_hold_oncc;
813            region->pitcheg_decay_oncc   = pitcheg_decay_oncc;
814            region->pitcheg_sustain_oncc = pitcheg_sustain_oncc;
815            region->pitcheg_release_oncc = pitcheg_release_oncc;
816            region->pitcheg_depth_oncc   = pitcheg_depth_oncc;
817    
818          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
819          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
820          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
821          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
822                    
823            region->amplfo_delay_oncc = amplfo_delay_oncc;
824            region->amplfo_fade_oncc  = amplfo_fade_oncc;
825          region->amplfo_depthcc   = amplfo_depthcc;          region->amplfo_depthcc   = amplfo_depthcc;
826          region->amplfo_freqcc    = amplfo_freqcc;          region->amplfo_freqcc    = amplfo_freqcc;
827    
# Line 781  namespace sfz Line 830  namespace sfz
830          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
831          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
832                    
833            region->fillfo_delay_oncc = fillfo_delay_oncc;
834            region->fillfo_fade_oncc  = fillfo_fade_oncc;
835          region->fillfo_depthcc   = fillfo_depthcc;          region->fillfo_depthcc   = fillfo_depthcc;
836          region->fillfo_freqcc    = fillfo_freqcc;          region->fillfo_freqcc    = fillfo_freqcc;
837    
# Line 789  namespace sfz Line 840  namespace sfz
840          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
841          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
842                    
843            region->pitchlfo_delay_oncc = pitchlfo_delay_oncc;
844            region->pitchlfo_fade_oncc  = pitchlfo_fade_oncc;
845          region->pitchlfo_depthcc = pitchlfo_depthcc;          region->pitchlfo_depthcc = pitchlfo_depthcc;
846          region->pitchlfo_freqcc  = pitchlfo_freqcc;          region->pitchlfo_freqcc  = pitchlfo_freqcc;
847                    
# Line 818  namespace sfz Line 871  namespace sfz
871          currentDir = LinuxSampler::Path::stripLastName(file);          currentDir = LinuxSampler::Path::stripLastName(file);
872          std::string token;          std::string token;
873          std::string line;          std::string line;
874            currentLine = 0;
875    
876          while (std::getline(fs, line))          while (std::getline(fs, line))
877          {          {
878                currentLine++;
879              // COMMENT              // COMMENT
880              std::string::size_type slash_index = line.find("//");              std::string::size_type slash_index = line.find("//");
881              if (slash_index != std::string::npos)              if (slash_index != std::string::npos)
# Line 976  namespace sfz Line 1031  namespace sfz
1031              copySmoothValues(r->volume_smoothcc, r->volume_oncc);              copySmoothValues(r->volume_smoothcc, r->volume_oncc);
1032              r->volume_smoothcc.clear();              r->volume_smoothcc.clear();
1033                            
1034                copyCurves(r->pan_curvecc, r->pan_oncc);
1035                r->pan_curvecc.clear();
1036                
1037                copySmoothValues(r->pan_smoothcc, r->pan_oncc);
1038                r->pan_smoothcc.clear();
1039                
1040                for (int j = 0; j < r->eg.size(); j++) {
1041                    copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1042                    r->eg[j].pan_curvecc.clear();
1043                }
1044                
1045              for (int j = 0; j < r->lfos.size(); j++) {              for (int j = 0; j < r->lfos.size(); j++) {
1046                  copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);                  copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
1047                  r->lfos[j].volume_smoothcc.clear();                  r->lfos[j].volume_smoothcc.clear();
# Line 1029  namespace sfz Line 1095  namespace sfz
1095              }              }
1096          }          }
1097      }      }
1098        
1099        int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1100            int i;
1101            std::istringstream iss(s);
1102            if(!(iss >> i)) {
1103                std::ostringstream oss;
1104                oss << "Line " << currentLine << ": Expected an integer";
1105                throw LinuxSampler::Exception(oss.str());
1106            }
1107            return i;
1108        }
1109    
1110        float File::ToFloat(const std::string& s) throw(LinuxSampler::Exception) {
1111            float i;
1112            std::istringstream iss(s);
1113            if(!(iss >> i)) {
1114                std::ostringstream oss;
1115                oss << "Line " << currentLine << ": Expected a floating-point number";
1116                throw LinuxSampler::Exception(oss.str());
1117            }
1118            return i;
1119        }
1120    
1121      void      void
1122      File::push_header(std::string token)      File::push_header(std::string token)
# Line 1356  namespace sfz Line 1444  namespace sfz
1444              else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );              else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1445              else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));              else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1446              else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );              else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1447                else if (strcmp(s, "_pan") == 0) eg(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1448                else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
1449                else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1450                else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
1451              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1452          }          }
1453    
# Line 1453  namespace sfz Line 1545  namespace sfz
1545          {          {
1546              std::string::size_type delimiter_index = key.find("cc");              std::string::size_type delimiter_index = key.find("cc");
1547              std::string key_cc = key.substr(0, delimiter_index);              std::string key_cc = key.substr(0, delimiter_index);
1548                if (key_cc.size() > 3 && !strcmp(key_cc.c_str() + (key_cc.size() - 3), "_on")) {
1549                    key_cc = key_cc.substr(0, key_cc.size() - 3);
1550                }
1551              int num_cc = ToInt(key.substr(delimiter_index + 2));              int num_cc = ToInt(key.substr(delimiter_index + 2));
1552    
1553              // input controls              // input controls
# Line 1466  namespace sfz Line 1561  namespace sfz
1561              else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));              else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));
1562    
1563              // sample player              // sample player
1564              else if ("delay_on" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));              else if ("delay" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));
1565              else if ("delay_samples_on" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));              else if ("delay_samples" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));
1566              else if ("offset_on" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));              else if ("offset" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));
1567    
1568              // amplifier              // amplifier
1569              else if ("gain_on"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));              else if ("gain"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));
1570              else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));              else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));
1571              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));
1572              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));
1573              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));
1574    
1575              // filter              // filter
1576              else if ("cutoff_on"  == key_cc || "cutoff_" == key_cc) {              else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {
1577                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));
1578                  pCurDef->cutoff_cc = num_cc;                  pCurDef->cutoff_cc = num_cc;
1579              } else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));              } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));
1580              else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.set(num_cc, ToInt(value));              else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.set(num_cc, ToInt(value));
1581              else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value));              else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value));
1582              else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));              else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));
1583              else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value));              else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value));
1584              else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.set(num_cc, ToInt(value));              else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.set(num_cc, ToInt(value));
1585              else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.set(num_cc, ToInt(value));              else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.set(num_cc, ToInt(value));
1586              else if ("resonance_on" == key_cc) pCurDef->resonance_oncc.set(num_cc, ToInt(value));              else if ("resonance" == key_cc) pCurDef->resonance_oncc.set(num_cc, ToInt(value));
1587              else if ("resonance2_on" == key_cc) pCurDef->resonance2_oncc.set(num_cc, ToInt(value));              else if ("resonance2" == key_cc) pCurDef->resonance2_oncc.set(num_cc, ToInt(value));
1588              else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.set(num_cc, ToInt(value));              else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.set(num_cc, ToInt(value));
1589              else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.set(num_cc, ToInt(value));              else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.set(num_cc, ToInt(value));
1590              else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value));              else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value));
# Line 1498  namespace sfz Line 1593  namespace sfz
1593              else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.set(num_cc, ToInt(value));              else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.set(num_cc, ToInt(value));
1594    
1595              // per voice equalizer              // per voice equalizer
1596              else if ("eq1_freq_on" == key_cc || "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));
1597              else if ("eq2_freq_on" == key_cc || "eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));              else if ("eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));
1598              else if ("eq3_freq_on" == key_cc || "eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));              else if ("eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));
1599              else if ("eq1_bw_on" == key_cc || "eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));              else if ("eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));
1600              else if ("eq2_bw_on" == key_cc || "eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));              else if ("eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));
1601              else if ("eq3_bw_on" == key_cc || "eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value));              else if ("eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value));
1602              else if ("eq1_gain_on" == key_cc || "eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));              else if ("eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));
1603              else if ("eq2_gain_on" == key_cc || "eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));              else if ("eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));
1604              else if ("eq3_gain_on" == key_cc || "eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));              else if ("eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));
1605                            
1606              else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1607              else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
# Line 1516  namespace sfz Line 1611  namespace sfz
1611              else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1612              else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1613                            
1614                else if ("fileg_delay"   == key_cc) pCurDef->fileg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1615                else if ("fileg_start"   == key_cc) pCurDef->fileg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1616                else if ("fileg_attack"  == key_cc) pCurDef->fileg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1617                else if ("fileg_hold"    == key_cc) pCurDef->fileg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1618                else if ("fileg_decay"   == key_cc) pCurDef->fileg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1619                else if ("fileg_sustain" == key_cc) pCurDef->fileg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1620                else if ("fileg_release" == key_cc) pCurDef->fileg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1621                else if ("fileg_depth"   == key_cc) pCurDef->fileg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1622                
1623                else if ("pitcheg_delay"   == key_cc) pCurDef->pitcheg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1624                else if ("pitcheg_start"   == key_cc) pCurDef->pitcheg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1625                else if ("pitcheg_attack"  == key_cc) pCurDef->pitcheg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1626                else if ("pitcheg_hold"    == key_cc) pCurDef->pitcheg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1627                else if ("pitcheg_decay"   == key_cc) pCurDef->pitcheg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1628                else if ("pitcheg_sustain" == key_cc) pCurDef->pitcheg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1629                else if ("pitcheg_release" == key_cc) pCurDef->pitcheg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1630                else if ("pitcheg_depth"   == key_cc) pCurDef->pitcheg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1631                
1632                else if ("pitchlfo_delay" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1633                else if ("pitchlfo_fade" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1634              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));
1635              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))) );
1636                else if ("fillfo_delay" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1637                else if ("fillfo_fade" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1638              else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );              else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1639              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))) );
1640                else if ("amplfo_delay" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1641                else if ("amplfo_fade" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1642              else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );              else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1643              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))) );
1644              else if ("volume_on" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -100.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))) );
1645              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))) );
1646              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))) );
1647                else if ("pan" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1648                else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1649                else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1650              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1651          }          }
1652    
# Line 1583  namespace sfz Line 1705  namespace sfz
1705      }      }
1706    
1707      EG::EG() :      EG::EG() :
1708          sustain(0), loop(0), loop_count(0), amplitude(0),          sustain(0), loop(0), loop_count(0), amplitude(0), pan(0), pan_curve(-1),
1709          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
1710      { }      { }
1711            
# Line 1596  namespace sfz Line 1718  namespace sfz
1718          cutoff     = eg.cutoff;          cutoff     = eg.cutoff;
1719          pitch      = eg.pitch;          pitch      = eg.pitch;
1720          resonance  = eg.resonance;          resonance  = eg.resonance;
1721            pan        = eg.pan;
1722            pan_curve  = eg.pan_curve;
1723          node       = eg.node;          node       = eg.node;
1724                    
1725          amplitude_oncc = eg.amplitude_oncc;          amplitude_oncc = eg.amplitude_oncc;
# Line 1603  namespace sfz Line 1727  namespace sfz
1727          cutoff_oncc    = eg.cutoff_oncc;          cutoff_oncc    = eg.cutoff_oncc;
1728          pitch_oncc     = eg.pitch_oncc;          pitch_oncc     = eg.pitch_oncc;
1729          resonance_oncc = eg.resonance_oncc;          resonance_oncc = eg.resonance_oncc;
1730            pan_oncc       = eg.pan_oncc;
1731            pan_curvecc    = eg.pan_curvecc;
1732      }      }
1733            
1734      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 */
1735                  fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {                  fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0), volume(0) {
1736                    
1737      }      }
1738            
Legend:
Removed from v.2235  
changed lines
  Added in v.2251
  ViewVC Help
Powered by ViewVC