[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11561] branches/soc-2007-hcube/intern/ tinySND/samplerate: Changed constant SND_MIX_BUFFER_SIZE to SND_MIX_BUFFER_FRAMES

[Csaba Hruska]

Revision: 11561
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11561
Author:   hcube
Date:     2007-08-12 16:21:42 +0200 (Sun, 12 Aug 2007)

Log Message:
-----------
Changed constant SND_MIX_BUFFER_SIZE to SND_MIX_BUFFER_FRAMES

Modified Paths:
--------------
    branches/soc-2007-hcube/intern/tinySND/samplerate/SND_FXSRC.cpp
    branches/soc-2007-hcube/intern/tinySND/samplerate/SND_FXSRC.h

Modified: branches/soc-2007-hcube/intern/tinySND/samplerate/SND_FXSRC.cpp
===================================================================
--- branches/soc-2007-hcube/intern/tinySND/samplerate/SND_FXSRC.cpp	2007-08-12 14:20:39 UTC (rev 11560)
+++ branches/soc-2007-hcube/intern/tinySND/samplerate/SND_FXSRC.cpp	2007-08-12 14:21:42 UTC (rev 11561)
@@ -9,8 +9,8 @@
 	mConverterType = SRC_SINC_MEDIUM_QUALITY;
     
 	// assign mix buffer
-	mBuffer = new float[ SND_MIX_BUFFER_SIZE ];
-	mBufferSize = SND_MIX_BUFFER_SIZE;
+	mBuffer = new float[ SND_MIX_BUFFER_FRAMES ];
+	mBufferSize = SND_MIX_BUFFER_FRAMES;
 	
 	mSampleRate = 0.0;
 	mIsMuted = false;
@@ -82,18 +82,6 @@
 
 float *SND_FXSRC::getPCMDataPtr( int framesNum )
 {
-/*
-typedef struct
-{	float	*data_in, *data_out ;
-
-	long	input_frames, output_frames ;
-	long	input_frames_used, output_frames_gen ;
-
-	int	end_of_input ;
-
-	double	src_ratio ;
-} SRC_DATA ;
-*/
 	assert( mSRC_State != 0 );
 	assert( mInput != 0 );
 
@@ -108,7 +96,7 @@
 	if( mBufferSize < framesNum )
 	{
 		delete mBuffer;
-		mBufferSize = (framesNum / SND_MIX_BUFFER_SIZE + 1) * SND_MIX_BUFFER_SIZE;
+		mBufferSize = (framesNum / SND_MIX_BUFFER_FRAMES + 1) * SND_MIX_BUFFER_FRAMES;
 		mBuffer = new float[ mBufferSize ];
 	}
 	

Modified: branches/soc-2007-hcube/intern/tinySND/samplerate/SND_FXSRC.h
===================================================================
--- branches/soc-2007-hcube/intern/tinySND/samplerate/SND_FXSRC.h	2007-08-12 14:20:39 UTC (rev 11560)
+++ branches/soc-2007-hcube/intern/tinySND/samplerate/SND_FXSRC.h	2007-08-12 14:21:42 UTC (rev 11561)
@@ -37,7 +37,7 @@
 	
 private:
     float	*mBuffer;
-    int		mBufferSize;
+    int		mBufferSize;	// number of frames 
 
     int		mConverterType;
     bool	mIsMuted;