/[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 2265 by iliev, Mon Aug 22 12:22:34 2011 UTC revision 2311 by persson, Sat Feb 11 11:08:09 2012 UTC
# Line 3  Line 3 
3   *   LinuxSampler - modular, streaming capable sampler                     *   *   LinuxSampler - modular, streaming capable sampler                     *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2008 Anders Dahnielson <anders@dahnielson.com>          *   *   Copyright (C) 2008 Anders Dahnielson <anders@dahnielson.com>          *
6   *   Copyright (C) 2009 - 2011 Anders Dahnielson and Grigor Iliev          *   *   Copyright (C) 2009 - 2012 Anders Dahnielson and Grigor Iliev          *
7   *                                                                         *   *                                                                         *
8   *   This program is free software; you can redistribute it and/or modify  *   *   This program is free software; you can redistribute it and/or modify  *
9   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 893  namespace sfz Line 893  namespace sfz
893    
894              // DEFINITION              // DEFINITION
895              std::stringstream linestream(line);              std::stringstream linestream(line);
896                linestream >> std::noskipws;
897                int spaces = 0;
898              while (linestream >> token)              while (linestream >> token)
899              {              {
900                  if (token[0] == '<' and token[token.size()-1] == '>')                  if (token[0] == '<' && token[token.size()-1] == '>')
901                  {                  {
902                      // HEAD                      // HEAD
903                      if (!token_string.empty())                      if (!token_string.empty())
# Line 936  namespace sfz Line 938  namespace sfz
938                  else                  else
939                  {                  {
940                      // TAIL                      // TAIL
941                      token_string.append(" ");                      token_string.append(spaces, ' ');
942                      token_string.append(token);                      token_string.append(token);
943                  }                  }
944                    spaces = 0;
945                    while (isspace(linestream.peek())) {
946                        linestream.ignore();
947                        spaces++;
948                    }
949              }              }
950    
951              // EOL              // EOL
# Line 1104  namespace sfz Line 1111  namespace sfz
1111              }              }
1112                            
1113              for (int j = 0; j < r->lfos.size(); j++) {              for (int j = 0; j < r->lfos.size(); j++) {
1114                    r->lfos[j].copySmoothValues();
1115                    r->lfos[j].copyStepValues();
1116                    
1117                  copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);                  copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
1118                  r->lfos[j].volume_smoothcc.clear();                  r->lfos[j].volume_smoothcc.clear();
1119                                    
# Line 1273  namespace sfz Line 1283  namespace sfz
1283          {          {
1284              std::string path = default_path + value;              std::string path = default_path + value;
1285              #ifndef WIN32              #ifndef WIN32
1286              for (int i = 0; i < path.length(); i++) if( path[i] == '\\') path[i] = '/';              for (int i = 0; i < path.length(); i++) if (path[i] == '\\') path[i] = '/';
1287                bool absolute = path[0] == '/';
1288                #else
1289                bool absolute = path[0] == '/' || path[0] == '\\' ||
1290                    (path.length() >= 2 && isalpha(path[0]) && path[1] == ':');
1291              #endif              #endif
1292              path = currentDir + LinuxSampler::File::DirSeparator + path; // TODO: check for absolute path              if (!absolute) path = currentDir + LinuxSampler::File::DirSeparator + path;
   
1293              if(pCurDef) pCurDef->sample = path;              if(pCurDef) pCurDef->sample = path;
1294              return;              return;
1295          }          }
# Line 1539  namespace sfz Line 1552  namespace sfz
1552              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));
1553              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))) );
1554              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))) );
1555                else if (strcmp(s, "_eq1freq") == 0) eg(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1556                else if (strcmp(s, "_eq2freq") == 0) eg(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1557                else if (strcmp(s, "_eq3freq") == 0) eg(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1558                else if (strcmp(s, "_eq1bw") == 0) eg(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1559                else if (strcmp(s, "_eq2bw") == 0) eg(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1560                else if (strcmp(s, "_eq3bw") == 0) eg(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1561                else if (strcmp(s, "_eq1gain") == 0) eg(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1562                else if (strcmp(s, "_eq2gain") == 0) eg(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1563                else if (strcmp(s, "_eq3gain") == 0) eg(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1564                else if (sscanf(s, "_eq1freq_oncc%d", &y)) eg(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1565                else if (sscanf(s, "_eq2freq_oncc%d", &y)) eg(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1566                else if (sscanf(s, "_eq3freq_oncc%d", &y)) eg(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1567                else if (sscanf(s, "_eq1bw_oncc%d", &y)) eg(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1568                else if (sscanf(s, "_eq2bw_oncc%d", &y)) eg(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1569                else if (sscanf(s, "_eq3bw_oncc%d", &y)) eg(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1570                else if (sscanf(s, "_eq1gain_oncc%d", &y)) eg(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1571                else if (sscanf(s, "_eq2gain_oncc%d", &y)) eg(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1572                else if (sscanf(s, "_eq3gain_oncc%d", &y)) eg(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1573              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1574          }          }
1575    
# Line 1641  namespace sfz Line 1672  namespace sfz
1672              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))) );
1673              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))) );
1674              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))) );              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))) );
1675                else if (strcmp(s, "_eq1freq") == 0) lfo(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1676                else if (strcmp(s, "_eq2freq") == 0) lfo(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1677                else if (strcmp(s, "_eq3freq") == 0) lfo(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1678                else if (strcmp(s, "_eq1bw") == 0) lfo(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1679                else if (strcmp(s, "_eq2bw") == 0) lfo(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1680                else if (strcmp(s, "_eq3bw") == 0) lfo(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1681                else if (strcmp(s, "_eq1gain") == 0) lfo(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1682                else if (strcmp(s, "_eq2gain") == 0) lfo(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1683                else if (strcmp(s, "_eq3gain") == 0) lfo(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1684                else if (sscanf(s, "_eq1freq_oncc%d", &y)) lfo(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1685                else if (sscanf(s, "_eq1freq_smoothcc%d", &y)) lfo(x).eq1freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1686                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))) );
1687                else if (sscanf(s, "_eq2freq_oncc%d", &y)) lfo(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1688                else if (sscanf(s, "_eq2freq_smoothcc%d", &y)) lfo(x).eq2freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1689                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))) );
1690                else if (sscanf(s, "_eq3freq_oncc%d", &y)) lfo(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1691                else if (sscanf(s, "_eq3freq_smoothcc%d", &y)) lfo(x).eq3freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1692                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))) );
1693                else if (sscanf(s, "_eq1bw_oncc%d", &y)) lfo(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1694                else if (sscanf(s, "_eq1bw_smoothcc%d", &y)) lfo(x).eq1bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1695                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))) );
1696                else if (sscanf(s, "_eq2bw_oncc%d", &y)) lfo(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1697                else if (sscanf(s, "_eq2bw_smoothcc%d", &y)) lfo(x).eq2bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1698                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))) );
1699                else if (sscanf(s, "_eq3bw_oncc%d", &y)) lfo(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1700                else if (sscanf(s, "_eq3bw_smoothcc%d", &y)) lfo(x).eq3bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1701                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))) );
1702                else if (sscanf(s, "_eq1gain_oncc%d", &y)) lfo(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1703                else if (sscanf(s, "_eq1gain_smoothcc%d", &y)) lfo(x).eq1gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1704                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))) );
1705                else if (sscanf(s, "_eq2gain_oncc%d", &y)) lfo(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1706                else if (sscanf(s, "_eq2gain_smoothcc%d", &y)) lfo(x).eq2gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1707                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))) );
1708                else if (sscanf(s, "_eq3gain_oncc%d", &y)) lfo(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1709                else if (sscanf(s, "_eq3gain_smoothcc%d", &y)) lfo(x).eq3gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1710                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))) );
1711              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1712          }          }
1713                    
# Line 1821  namespace sfz Line 1888  namespace sfz
1888      { }      { }
1889            
1890      void EG::Copy(const EG& eg) {      void EG::Copy(const EG& eg) {
1891            EqImpl::Copy(static_cast<const EqImpl>(eg));
1892            
1893          sustain    = eg.sustain;          sustain    = eg.sustain;
1894          loop       = eg.loop;          loop       = eg.loop;
1895          loop_count = eg.loop_count;          loop_count = eg.loop_count;
# Line 1848  namespace sfz Line 1917  namespace sfz
1917      }      }
1918            
1919      void LFO::Copy(const LFO& lfo) {      void LFO::Copy(const LFO& lfo) {
1920            EqSmoothStepImpl::Copy(static_cast<const EqSmoothStepImpl>(lfo));
1921            
1922          delay      = lfo.delay;          delay      = lfo.delay;
1923          freq       = lfo.freq;          freq       = lfo.freq;
1924          fade       = lfo.fade;          fade       = lfo.fade;
# Line 1881  namespace sfz Line 1952  namespace sfz
1952          resonance_smoothcc = lfo.resonance_smoothcc;          resonance_smoothcc = lfo.resonance_smoothcc;
1953          resonance_stepcc   = lfo.resonance_stepcc;          resonance_stepcc   = lfo.resonance_stepcc;
1954      }      }
1955        
1956        EqImpl::EqImpl() {
1957            eq1freq = eq2freq = eq3freq = 0;
1958            eq1bw = eq2bw = eq3bw = 0;
1959            eq1gain = eq2gain = eq3gain = 0;
1960        }
1961        
1962        void EqImpl::Copy(const EqImpl& eq) {
1963            eq1freq = eq.eq1freq;
1964            eq2freq = eq.eq2freq;
1965            eq3freq = eq.eq3freq;
1966            eq1bw   = eq.eq1bw;
1967            eq2bw   = eq.eq2bw;
1968            eq3bw   = eq.eq3bw;
1969            eq1gain = eq.eq1gain;
1970            eq2gain = eq.eq2gain;
1971            eq3gain = eq.eq3gain;
1972            
1973            eq1freq_oncc = eq.eq1freq_oncc;
1974            eq2freq_oncc = eq.eq2freq_oncc;
1975            eq3freq_oncc = eq.eq3freq_oncc;
1976            eq1bw_oncc   = eq.eq1bw_oncc;
1977            eq2bw_oncc   = eq.eq2bw_oncc;
1978            eq3bw_oncc   = eq.eq3bw_oncc;
1979            eq1gain_oncc = eq.eq1gain_oncc;
1980            eq2gain_oncc = eq.eq2gain_oncc;
1981            eq3gain_oncc = eq.eq3gain_oncc;
1982        }
1983        
1984        bool EqImpl::HasEq() {
1985            return eq1freq || eq2freq || eq3freq || eq1bw || eq2bw || eq3bw ||
1986                   eq1gain || eq2gain || eq3gain || !eq1gain_oncc.empty() ||
1987                   !eq2gain_oncc.empty() || !eq3gain_oncc.empty() ||
1988                   !eq1freq_oncc.empty() || !eq2freq_oncc.empty() || !eq3freq_oncc.empty() ||
1989                   !eq1bw_oncc.empty() || !eq2bw_oncc.empty() || !eq3bw_oncc.empty();
1990        }
1991        
1992        void EqSmoothStepImpl::Copy(const EqSmoothStepImpl& eq) {
1993            EqImpl::Copy(eq);
1994            
1995            eq1freq_smoothcc = eq.eq1freq_smoothcc;
1996            eq2freq_smoothcc = eq.eq2freq_smoothcc;
1997            eq3freq_smoothcc = eq.eq3freq_smoothcc;
1998            eq1bw_smoothcc   = eq.eq1bw_smoothcc;
1999            eq2bw_smoothcc   = eq.eq2bw_smoothcc;
2000            eq3bw_smoothcc   = eq.eq3bw_smoothcc;
2001            eq1gain_smoothcc = eq.eq1gain_smoothcc;
2002            eq2gain_smoothcc = eq.eq2gain_smoothcc;
2003            eq3gain_smoothcc = eq.eq3gain_smoothcc;
2004            
2005            eq1freq_stepcc = eq.eq1freq_stepcc;
2006            eq2freq_stepcc = eq.eq2freq_stepcc;
2007            eq3freq_stepcc = eq.eq3freq_stepcc;
2008            eq1bw_stepcc   = eq.eq1bw_stepcc;
2009            eq2bw_stepcc   = eq.eq2bw_stepcc;
2010            eq3bw_stepcc   = eq.eq3bw_stepcc;
2011            eq1gain_stepcc = eq.eq1gain_stepcc;
2012            eq2gain_stepcc = eq.eq2gain_stepcc;
2013            eq3gain_stepcc = eq.eq3gain_stepcc;
2014        }
2015        
2016        void EqSmoothStepImpl::copySmoothValues() {
2017            File::copySmoothValues(eq1freq_smoothcc, eq1freq_oncc);
2018            eq1freq_smoothcc.clear();
2019            
2020            File::copySmoothValues(eq2freq_smoothcc, eq2freq_oncc);
2021            eq2freq_smoothcc.clear();
2022            
2023            File::copySmoothValues(eq3freq_smoothcc, eq3freq_oncc);
2024            eq3freq_smoothcc.clear();
2025            
2026            File::copySmoothValues(eq1bw_smoothcc, eq1bw_oncc);
2027            eq1bw_smoothcc.clear();
2028            
2029            File::copySmoothValues(eq2bw_smoothcc, eq2bw_oncc);
2030            eq2bw_smoothcc.clear();
2031            
2032            File::copySmoothValues(eq3bw_smoothcc, eq3bw_oncc);
2033            eq3bw_smoothcc.clear();
2034            
2035            File::copySmoothValues(eq1gain_smoothcc, eq1gain_oncc);
2036            eq1gain_smoothcc.clear();
2037            
2038            File::copySmoothValues(eq2gain_smoothcc, eq2gain_oncc);
2039            eq2gain_smoothcc.clear();
2040            
2041            File::copySmoothValues(eq3gain_smoothcc, eq3gain_oncc);
2042            eq3gain_smoothcc.clear();
2043        }
2044        
2045        void EqSmoothStepImpl::copyStepValues() {
2046            File::copyStepValues(eq1freq_stepcc, eq1freq_oncc);
2047            eq1freq_stepcc.clear();
2048            
2049            File::copyStepValues(eq2freq_stepcc, eq2freq_oncc);
2050            eq2freq_stepcc.clear();
2051            
2052            File::copyStepValues(eq3freq_stepcc, eq3freq_oncc);
2053            eq3freq_stepcc.clear();
2054            
2055            File::copyStepValues(eq1bw_stepcc, eq1bw_oncc);
2056            eq1bw_stepcc.clear();
2057            
2058            File::copyStepValues(eq2bw_stepcc, eq2bw_oncc);
2059            eq2bw_stepcc.clear();
2060            
2061            File::copyStepValues(eq3bw_stepcc, eq3bw_oncc);
2062            eq3bw_stepcc.clear();
2063            
2064            File::copyStepValues(eq1gain_stepcc, eq1gain_oncc);
2065            eq1gain_stepcc.clear();
2066            
2067            File::copyStepValues(eq2gain_stepcc, eq2gain_oncc);
2068            eq2gain_stepcc.clear();
2069            
2070            File::copyStepValues(eq3gain_stepcc, eq3gain_oncc);
2071            eq3gain_stepcc.clear();
2072        }
2073    
2074      EG& File::eg(int x) {      EG& File::eg(int x) {
2075          while (pCurDef->eg.size() <= x) {          while (pCurDef->eg.size() <= x) {
Legend:
Removed from v.2265  
changed lines
  Added in v.2311
  ViewVC Help
Powered by ViewVC