mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

DSound player seems good now... stop breaking it.

Browse source 
Originally committed to SVN as r1129.
This commit is contained in:
Niels Martin Hansen 2007-04-25 00:35:10 +00:00
parent 14582ad00a
commit 4d0a78b9a9
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
aegisub/audio_player_dsound.cpp
View file

@ -254,6 +254,24 @@ bool DirectSoundPlayer::FillBuffer(bool fill) {
} }
if (toWrite == 0) return true; if (toWrite == 0) return true;
// Make sure we only get as many samples as are available
if (playPos + toWrite/bytesps > endPos) {
toWrite = (endPos - playPos) * bytesps;
}
// If we're going to fill the entire buffer (ie. at start of playback) start by zeroing it out
if (fill) {
RetryClear:
res = buffer->Lock(0, bufSize, &ptr1, &size1, &ptr2, &size2, 0);
if (res == DSERR_BUFFERLOST) {
buffer->Restore();
goto RetryClear;
}
memset(ptr1, 0, size1);
memset(ptr2, 0, size2);
buffer->Unlock(ptr1, size1, ptr2, size2);
}
// Lock buffer // Lock buffer
RetryLock: RetryLock:
if (fill) { if (fill) {
@ -277,24 +295,6 @@ RetryLock:
unsigned long int count1 = size1 / bytesps; unsigned long int count1 = size1 / bytesps;
unsigned long int count2 = size2 / bytesps; unsigned long int count2 = size2 / bytesps;
// Check if remaining buffer is longer than remaining sound
unsigned long int totalCount = count1+count2;
unsigned long int left = 0;
if (endPos > playPos) left = endPos - playPos;
unsigned long int delta = 0;
if (totalCount > left) delta = totalCount - left;
// And only write the remaining samples
if (delta) {
// Lower counts
int temp = MIN(delta,count2);
count2 -= temp;
delta -= temp;
temp = MIN(delta,count1);
count1 -= temp;
delta -= temp;
}
// Get source wave // Get source wave
if (count1) provider->GetAudioWithVolume(ptr1, playPos, count1, volume); if (count1) provider->GetAudioWithVolume(ptr1, playPos, count1, volume);
if (count2) provider->GetAudioWithVolume(ptr2, playPos+count1, count2, volume); if (count2) provider->GetAudioWithVolume(ptr2, playPos+count1, count2, volume);
@ -306,7 +306,7 @@ RetryLock:
// Update offset // Update offset
offset = (offset + count1*bytesps + count2*bytesps) % bufSize; offset = (offset + count1*bytesps + count2*bytesps) % bufSize;
return delta==0; // If delta>0 we hit end of stream return true; // If delta>0 we hit end of stream
} }