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

fix mix volume

Browse Source 
cleanup
This commit is contained in:
Glenn Maynard
2003-10-18 20:17:10 +00:00
parent f5c9acaac0
commit 69402a35aa
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/RageSoundDriver_OSS.cpp
+3 -9
View File
@@ -76,6 +76,7 @@ bool RageSound_OSS::GetData()
/* Create a 32-bit buffer to mix sounds. */ /* Create a 32-bit buffer to mix sounds. */
static SoundMixBuffer mix; static SoundMixBuffer mix;
mix.SetVolume( SOUNDMAN->GetMixVolume() );
for(unsigned i = 0; i < sounds.size(); ++i) for(unsigned i = 0; i < sounds.size(); ++i)
{ {
@@ -156,20 +157,13 @@ int RageSound_OSS::GetPosition(const RageSound *snd) const
{ {
LockMutex L(SOUNDMAN->lock); LockMutex L(SOUNDMAN->lock);
ASSERT( fd != -1 );
int delay; int delay;
if(ioctl(fd, SNDCTL_DSP_GETODELAY, &delay) == -1) if(ioctl(fd, SNDCTL_DSP_GETODELAY, &delay) == -1)
RageException::ThrowNonfatal("RageSound_OSS: ioctl(SNDCTL_DSP_GETODELAY): %s", strerror(errno)); RageException::ThrowNonfatal("RageSound_OSS: ioctl(SNDCTL_DSP_GETODELAY): %s", strerror(errno));
return last_cursor_pos - (delay / samplesize); return last_cursor_pos - (delay / samplesize);
/* MMTIME tm;
tm.wType = TIME_SAMPLES;
MMRESULT ret = waveOutGetPosition(wo, &tm, sizeof(tm));
if(ret != MMSYSERR_NOERROR)
RageException::Throw(wo_ssprintf(ret, "waveOutGetPosition failed"));
return tm.u.sample;
*/
} }