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

fix some dumb sync bugs

Browse Source
This commit is contained in:
Glenn Maynard
2002-12-29 00:19:05 +00:00
parent 99c7352994
commit f87e63a386
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/DSoundHelpers.cpp
+5 -4
View File
@@ -151,7 +151,7 @@ bool DSoundBuf::get_output_buf(char **buffer, unsigned *bufsiz, int *play_pos, i
/* Increment last_cursor_pos to point at where the data we're about to /* Increment last_cursor_pos to point at where the data we're about to
* ask for will actually be played. */ * ask for will actually be played. */
last_cursor_pos += buffersize_frames(); last_cursor_pos += num_bytes_empty / samplesize();
buffer_locked = true; buffer_locked = true;
@@ -169,9 +169,10 @@ int DSoundBuf::GetPosition() const
{ {
DWORD cursor, junk; DWORD cursor, junk;
buf->GetCurrentPosition(&cursor, &junk); buf->GetCurrentPosition(&cursor, &junk);
int last_fill = write_cursor; int cursor_frames = int(cursor) / samplesize();
int write_cursor_frames = write_cursor / samplesize();
int frames_behind = (last_fill - int(cursor)) / samplesize(); int frames_behind = write_cursor_frames - cursor_frames;
if(frames_behind <= 0) if(frames_behind <= 0)
frames_behind += buffersize_frames(); /* unwrap */ frames_behind += buffersize_frames(); /* unwrap */
@@ -187,7 +188,7 @@ int DSoundBuf::GetPosition() const
void DSoundBuf::Play() void DSoundBuf::Play()
{ {
HRESULT hr = buf->Play(0, 0, DSBPLAY_LOOPING); buf->Play(0, 0, DSBPLAY_LOOPING);
} }
void DSoundBuf::Stop() void DSoundBuf::Stop()
stepmania/src/arch/Sound/DSoundHelpers.h
+2 -2
View File
@@ -25,9 +25,9 @@ class DSoundBuf
int channels, samplerate, samplebits, buffersize; int channels, samplerate, samplebits, buffersize;
int buffersize_frames() const { return buffersize / samplesize(); } int buffersize_frames() const { return buffersize / samplesize(); }
int samplesize() const { return samplebits; } int samplesize() const { return channels*samplebits/8; }
int write_cursor, last_cursor_pos; int write_cursor, last_cursor_pos; /* frames */
mutable int LastPosition; mutable int LastPosition;
bool buffer_locked; bool buffer_locked;