[Loris-cvs] Loris/scripting loris.i,1.140,1.141

[Kelly F. <kf...@us...>]

Update of /cvsroot/loris/Loris/scripting
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20122

Modified Files:
	loris.i 
Log Message:
Added single-Partial version of PartialUtils functions for setting and
scaling Partial parameter envelopes to the scripting interface (they 
already were implemented in C++).

Index: loris.i
===================================================================
RCS file: /cvsroot/loris/Loris/scripting/loris.i,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** loris.i	9 Nov 2009 04:53:08 -0000	1.140
--- loris.i	29 Dec 2009 05:50:43 -0000	1.141
***************
*** 913,917 ****
  
  %feature("docstring",
! "Scale the amplitude of the Partials in a PartialList according 
  to an envelope representing a time-varying amplitude scale value.")
  scaleAmplitude;
--- 913,917 ----
  
  %feature("docstring",
! "Scale the amplitude of a Partial, or all Partials in a PartialList, according 
  to an envelope representing a time-varying amplitude scale value.")
  scaleAmplitude;
***************
*** 930,933 ****
--- 930,938 ----
  	}
  
+     void scaleAmplitude( Partial * p, Envelope * ampEnv )
+ 	{
+ 		PartialUtils::scaleAmplitude( *p, *ampEnv );
+ 	}
+ 
      void scaleAmp( PartialList * partials, double val )
  	{
***************
*** 942,949 ****
  	}
  	
  %}
  
  %feature("docstring",
! "Scale the bandwidth of the Partials in a PartialList according 
  to an envelope representing a time-varying bandwidth scale value.");
  
--- 947,959 ----
  	}
  	
+ 	void scaleAmplitude( Partial * p, double val )
+ 	{
+ 		LinearEnvelope e( val );
+ 		PartialUtils::scaleAmplitude( *p, e );
+ 	}
  %}
  
  %feature("docstring",
! "Scale the bandwidth of a Partial, or all Partials in a PartialList, according 
  to an envelope representing a time-varying bandwidth scale value.");
  
***************
*** 962,969 ****
  	}
  	
  %}
  
  %feature("docstring",
! "Scale the frequency of the Partials in a PartialList according 
  to an envelope representing a time-varying frequency scale value.");
  				 
--- 972,990 ----
  	}
  	
+ 	void scaleBandwidth( Partial * p, Envelope * bwEnv )
+ 	{
+ 		PartialUtils::scaleBandwidth( *p, *bwEnv );
+ 	}
+ 				 
+ 
+ 	void scaleBandwidth( Partial * p, double val )
+ 	{
+ 		LinearEnvelope e( val );
+ 		PartialUtils::scaleBandwidth( *p, e );
+ 	}	
  %}
  
  %feature("docstring",
! "Scale the frequency of a Partial, or all Partials in a PartialList, according 
  to an envelope representing a time-varying frequency scale value.");
  				 
***************
*** 981,988 ****
  	}
  	
  %}
  
  %feature("docstring",
! "Scale the relative noise content of the Partials in a PartialList 
  according to an envelope representing a (time-varying) noise energy 
  scale value.");
--- 1002,1020 ----
  	}
  	
+ 	void scaleFrequency( Partial * p, Envelope * freqEnv )
+ 	{
+ 		PartialUtils::scaleFrequency( *p, *freqEnv );
+ 	}
+ 
+ 	void scaleFrequency( Partial * p, double val )
+ 	{
+ 		LinearEnvelope e( val );
+ 		PartialUtils::scaleFrequency( *p, e );
+ 	}
+ 	
  %}
  
  %feature("docstring",
! "Scale the relative noise content of a Partial, or all Partials in a PartialList,
  according to an envelope representing a (time-varying) noise energy 
  scale value.");
***************
*** 1003,1010 ****
  	}
  	
  %}
  
  %feature("docstring",
! "Set the bandwidth of the Partials in a PartialList according 
  to an envelope representing a time-varying bandwidth value.");
  
--- 1035,1052 ----
  	}
  	
+ 	void scaleNoiseRatio( Partial * p, Envelope * noiseEnv )
+ 	{
+ 		PartialUtils::scaleNoiseRatio( *p, *noiseEnv );
+ 	}
+ 
+ 	void scaleNoiseRatio( Partial * p, double val )
+ 	{
+ 		LinearEnvelope e( val );
+ 		PartialUtils::scaleNoiseRatio( *p, e );
+ 	}
  %}
  
  %feature("docstring",
! "Set the bandwidth of a Partial, or all Partials in a PartialList, according 
  to an envelope representing a time-varying bandwidth value.");
  
***************
*** 1023,1026 ****
--- 1065,1078 ----
  	}
  	
+ 	void setBandwidth( Partial * p, Envelope * bwEnv )
+ 	{
+ 		PartialUtils::setBandwidth( *p, *bwEnv );
+ 	}
+ 	
+ 	void setBandwidth( Partial * p, double val )
+ 	{
+ 		LinearEnvelope e( val );
+ 		PartialUtils::setBandwidth( *p, e );
+ 	}
  %}