/[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 3094 by schoenebeck, Tue Jan 10 12:26:38 2017 UTC revision 3095 by schoenebeck, Wed Jan 18 14:52:31 2017 UTC
# Line 1936  namespace sfz Line 1936  namespace sfz
1936                                    
1937                  num_cc_str = _defined_macros[num_cc_str];                  num_cc_str = _defined_macros[num_cc_str];
1938              }              }
1939                
1940              int num_cc = ToInt(num_cc_str);              int num_cc = ToInt(num_cc_str);
1941                if (num_cc < 0 || num_cc > 127) {
1942                    std::cerr << "sfz: WARNING: CC " << num_cc << " of opcode '" << key;
1943                    std::cerr << "' is an invalid MIDI controller number." << std::endl;
1944                }
1945    
1946              // input controls              // input controls
1947              if ("lo" == key_cc) pCurDef->locc.set(num_cc, ToInt(value));              if ("lo" == key_cc) pCurDef->locc.set(num_cc, ToInt(value));
# Line 2043  namespace sfz Line 2047  namespace sfz
2047              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))) );
2048              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))) );
2049              else if ("pan_step" == key_cc) pCurDef->pan_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("pan_step" == key_cc) pCurDef->pan_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -100.0f, 100.0f, ToFloat(value))) );
2050                else if ("set_" == key_cc) _instrument->initialCCValues[num_cc] = (num_cc < 128) ? check(key, 0, 127, ToInt(value)) : ToInt(value);
2051              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
2052          }          }
2053    
Legend:
Removed from v.3094  
changed lines
  Added in v.3095
  ViewVC Help
Powered by ViewVC