[Loris-cvs] Loris/src Makefile.am, 1.58, 1.59 Resampler.C, 1.21, 1.22 Resampler.h, 1.14, 1.15

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

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

Modified Files:
	Makefile.am Resampler.C Resampler.h 
Log Message:
Removed resampling capabilties with timing envelope. These are not ready 
for prime time yet, and will be introduced in the next release version of
Loris. 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/loris/Loris/src/Makefile.am,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** Makefile.am	2 Jan 2010 04:55:12 -0000	1.58
--- Makefile.am	11 Jan 2010 03:50:25 -0000	1.59
***************
*** 113,120 ****
  libloris_la_LIBADD = $(LINK_FFTW) $(CSOUND_LIB)
  
! # the library version for Loris 1.5.5 is 11:0:0
  # it is incompatible with the Loris 1.5.4 interface
! # (changed NoiseGenerator interface)
! libloris_la_LDFLAGS = -version-info 10:0:0 $(EXTRA_LD_FLAGS)
  
  # loris.h is generated automatically from loris.h.in
--- 113,120 ----
  libloris_la_LIBADD = $(LINK_FFTW) $(CSOUND_LIB)
  
! # the library version for Loris 1.6 is 11:0:0
  # it is incompatible with the Loris 1.5.4 interface
! # (changed NoiseGenerator and Resampler interface)
! libloris_la_LDFLAGS = -version-info 11:0:0 $(EXTRA_LD_FLAGS)
  
  # loris.h is generated automatically from loris.h.in

Index: Resampler.h
===================================================================
RCS file: /cvsroot/loris/Loris/src/Resampler.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Resampler.h	10 Jan 2010 07:09:27 -0000	1.14
--- Resampler.h	11 Jan 2010 03:50:25 -0000	1.15
***************
*** 82,85 ****
--- 82,86 ----
      explicit Resampler( double sampleInterval );
  
+ /*
      //! Initialize a Resampler having the specified timing envelope.
      //! The timing envelope represents a map of Breakpoint times in  
***************
*** 125,129 ****
      Resampler( const LinearEnvelope & timingEnv, double sampleInterval );
  
! 
      // --- use compiler-generated copy/assign/destroy ---
      
--- 126,130 ----
      Resampler( const LinearEnvelope & timingEnv, double sampleInterval );
  
! */
      // --- use compiler-generated copy/assign/destroy ---
      

Index: Resampler.C
===================================================================
RCS file: /cvsroot/loris/Loris/src/Resampler.C,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Resampler.C	10 Jan 2010 07:09:27 -0000	1.21
--- Resampler.C	11 Jan 2010 03:50:25 -0000	1.22
***************
*** 81,84 ****
--- 81,89 ----
      Revisit the default values for parameters, and define necessary
      constructors and members related to the timing envelope.
+     
+     
+     version 1.6 - the timing envelope implementation is not yet ready 
+     for prime time, delay until after this release, which focusses on 
+     the phase-correct synthesis bugs
  */
  
***************
*** 114,117 ****
--- 119,124 ----
  }
  
+ #if 0
+ 
  // ---------------------------------------------------------------------------
  //	constructor - timing envelope
***************
*** 186,189 ****
--- 193,197 ----
  }
  
+ #endif
  
  // ---------------------------------------------------------------------------
***************
*** 271,281 ****
  
  	//  find time of first and last breakpoint for the resampled envelope:
! 	double firstTime = interval * int( 0.5 + p.startTime() / interval );
! 	double stopTime  = p.endTime() + ( 0.5 * interval );
  	
  	
  	//  resample:
! 	for (  double tins = firstTime; tins < stopTime; tins += interval ) 
  	{
  	    double tsamp = tins;
  	    if ( 0 != env.size() )
--- 279,300 ----
  
  	//  find time of first and last breakpoint for the resampled envelope:
! 	double firstSampleTime = interval * int( 0.5 + p.startTime() / interval );
! 	double lastSampleTime  = p.endTime() + ( 0.5 * interval );
  	
+ 	//  find the extent of the timing envelope, if specified, otherwise
+ 	//  the insert time range is the same as the sample time range:
+ 	double firstInsertTime = firstSampleTime;
+ 	double lastInsertTime = lastSampleTime;
+ 	if ( 0 != env.size() )
+ 	{
+ 	    firstInsertTime = interval * int( 0.5 + env.begin()->first / interval );
+ 	    lastInsertTime = (--env.end())->first + ( 0.5 * interval );
+ 	}
  	
  	//  resample:
! 	for (  double tins = firstInsertTime; tins <= lastInsertTime; tins += interval ) 
  	{
+ 	    //  sample time is obtained from the timing envelope, if specified, 
+ 	    //  otherwise same as the insert time:
  	    double tsamp = tins;
  	    if ( 0 != env.size() )
***************
*** 283,286 ****
--- 302,306 ----
  	        tsamp = env.valueAt( tins );
  	    }
+ 	    
          insert_resampled_at( newp, p, tsamp, tins );        
  	}