mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

* Remove variable 'avail'.

Browse source 
* Fold lenAvailable logic into a ternary operator.
* Use GetAduioWithVolume instead of applying volume ourselves.
* Remove code used to zero rest of the buffer. (not required)

Originally committed to SVN as r2805.
This commit is contained in:
Amar Takhar 2009-04-16 20:49:37 +00:00
parent c6364bf43d
commit eb65009f66
1 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
aegisub/src/audio_player_portaudio2.cpp
View file

@ -95,32 +95,13 @@ int PortAudioPlayer::paCallback(const void *inputBuffer, void *outputBuffer, uns
int end = 0; int end = 0;
// Calculate how much left // Calculate how much left
int64_t lenAvailable = player->endPos - player->playPos; int64_t lenAvailable = (player->endPos - player->playPos) > 0 ? framesPerBuffer : 0;
uint64_t avail = 0;
if (lenAvailable > 0) {
avail = lenAvailable;
if (avail > framesPerBuffer) {
lenAvailable = framesPerBuffer;
avail = lenAvailable;
}
}
else {
lenAvailable = 0;
avail = 0;
}
// Play something // Play something
if (lenAvailable > 0) { if (lenAvailable > 0) {
provider->GetAudio(outputBuffer,player->playPos,lenAvailable); provider->GetAudioWithVolume(outputBuffer, player->playPos, lenAvailable, player->GetVolume());
} }
// Set volume
short *output = (short*) outputBuffer;
for (unsigned int i=0;i<avail;i++) output[i] = MID(-(1<<15),int(output[i] * player->GetVolume()),(1<<15)-1);
// Fill rest with blank
for (unsigned int i=avail;i<framesPerBuffer;i++) output[i]=0;
// Set play position // Set play position
player->playPos += framesPerBuffer; player->playPos += framesPerBuffer;