/[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 2299 by iliev, Sun Dec 11 20:50:31 2011 UTC
# Line 1104  namespace sfz Line 1104  namespace sfz
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                                    
# Line 1539  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 1641  namespace sfz Line 1662  namespace sfz
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))) );              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 1821  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 1848  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 1881  namespace sfz Line 1942  namespace sfz
1942          resonance_smoothcc = lfo.resonance_smoothcc;          resonance_smoothcc = lfo.resonance_smoothcc;
1943          resonance_stepcc   = lfo.resonance_stepcc;          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) {
2065          while (pCurDef->eg.size() <= x) {          while (pCurDef->eg.size() <= x) {
Legend:
Removed from v.2265  
changed lines
  Added in v.2299
  ViewVC Help
Powered by ViewVC