use RageSoundReader_Pan for panning

This commit is contained in:
Glenn Maynard
2006-12-10 00:43:51 +00:00
parent 602db9c431
commit 8c7173f26c
3 changed files with 25 additions and 22 deletions
+5 -4
View File
@@ -29,6 +29,7 @@
#include "arch/ArchHooks/ArchHooks.h"
#include "RageSoundUtil.h"
#include "RageSoundReader_Pan.h"
#include "RageSoundReader_PitchChange.h"
#include "RageSoundReader_Preload.h"
#include "RageSoundReader_Resample_Good.h"
@@ -45,7 +46,6 @@ RageSoundParams::RageSoundParams():
m_LengthSeconds = -1;
m_FadeLength = 0;
m_Volume = 1.0f;
m_Balance = 0; // center
m_fPitch = 1.0f;
m_fSpeed = 1.0f;
m_bAccurateSync = false;
@@ -56,6 +56,7 @@ RageSoundParams::RageSoundParams():
RageSoundLoadParams::RageSoundLoadParams()
{
m_bSupportRateChanging = false;
m_bSupportPan = false;
}
RageSound::RageSound():
@@ -225,6 +226,9 @@ bool RageSound::Load( RString sSoundFilePath, bool bPrecache, const RageSoundLoa
m_pSource = pRate;
}
if( pParams->m_bSupportPan )
m_pSource = new RageSoundReader_Pan( m_pSource );
m_sFilePath = sSoundFilePath;
m_Mutex.SetName( ssprintf("RageSound (%s)", Basename(sSoundFilePath).c_str() ) );
@@ -418,9 +422,6 @@ bool RageSound::GetDataToPlay( int16_t *pBuffer, int iFrames, int64_t &iStreamFr
}
}
/* This block goes from iStreamFrame to iStreamFrame+iGotFrames. */
RageSoundUtil::Pan( pBuffer, iGotFrames, m_Param.m_Balance );
iFramesStored += iGotFrames;
iFrames -= iGotFrames;
pBuffer += iGotFrames * channels;