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

Fixed compiler warning and removed some dead code.

Browse source 
Originally committed to SVN as r1101.
This commit is contained in:
Niels Martin Hansen 2007-04-20 21:15:21 +00:00
parent c1cb6e4367
commit 168d08acc2
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
aegisub/audio_player_dsound.cpp
View file

@ -314,19 +314,6 @@ __int64 DirectSoundPlayer::GetCurrentPosition() {
DWORD curtime = GetTickCount(); DWORD curtime = GetTickCount();
__int64 tdiff = curtime - startTime; __int64 tdiff = curtime - startTime;
return startPos + tdiff * provider->GetSampleRate() / 1000; return startPos + tdiff * provider->GetSampleRate() / 1000;
// Read position
unsigned long int play,write;
HRESULT res = buffer->GetCurrentPosition(&play,NULL);
if (SUCCEEDED(res)) {
int bytesps = provider->GetBytesPerSample();
write = offset;
if (write < play) write += bufSize;
return playPos + play/bytesps - write/bytesps;
}
// Failed, just return playPos
return playPos;
} }

2
aegisub/audio_player_dsound.h
View file

@ -76,7 +76,7 @@ private:
volatile bool playing; volatile bool playing;
float volume; float volume;
int offset; int offset;
int bufSize; DWORD bufSize;
volatile __int64 playPos; volatile __int64 playPos;
__int64 startPos; __int64 startPos;