actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

AdjustBalance -> PanSound; balance and panning aren't the same thing

Browse Source
This commit is contained in:
Glenn Maynard
2004-08-29 03:21:45 +00:00
parent 881fc6a6f2
commit 197b54dd8b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
+9 -9
View File
@@ -392,21 +392,21 @@ int RageSound::GetData( char *buffer, int frames )
return got; return got;
} }
/* Adjust the balance of buffer; fBalance is -1...+1. */ /* Pan buffer left or right; fPos is -1...+1. */
void AdjustBalance( int16_t *buffer, int frames, float fBalance ) void PanSound( int16_t *buffer, int frames, float fPos )
{ {
if( fBalance == 0 ) if( fPos == 0 )
return; /* no change */ return; /* no change */
bool bSwap = fBalance < 0; bool bSwap = fPos < 0;
if( bSwap ) if( bSwap )
fBalance = -fBalance; fPos = -fPos;
float fLeftFactors[2] ={ 1-fBalance, 0 }; float fLeftFactors[2] ={ 1-fPos, 0 };
float fRightFactors[2] = float fRightFactors[2] =
{ {
SCALE( fBalance, 0, 1, 0.5f, 0 ), SCALE( fPos, 0, 1, 0.5f, 0 ),
SCALE( fBalance, 0, 1, 0.5f, 1 ) SCALE( fPos, 0, 1, 0.5f, 1 )
}; };
if( bSwap ) if( bSwap )
@@ -545,7 +545,7 @@ bool RageSound::GetDataToPlay( int16_t *buffer, int size, int &sound_frame, int
FadeSound( buffer, got_frames, fStartVolume, fEndVolume ); FadeSound( buffer, got_frames, fStartVolume, fEndVolume );
} }
AdjustBalance( buffer, got_frames, m_Param.m_Balance ); PanSound( buffer, got_frames, m_Param.m_Balance );
sound_frame = decode_position; sound_frame = decode_position;