ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1386 from Frank-74/patch-1 

Fix Volume control
This commit is contained in:
zilmar 2017-09-29 10:36:59 +10:00 committed by GitHub
parent 1dd7348e16 72c7c2ffd1
commit adfe3db99a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Project64-audio/Driver/DirectSound.cpp
View File

@ -132,10 +132,16 @@ void DirectSoundDriver::SetFrequency(uint32_t Frequency)
void DirectSoundDriver::SetVolume(uint32_t Volume) void DirectSoundDriver::SetVolume(uint32_t Volume)
{ {
/*DWORD dsVolume = ((DWORD)Volume * -25); LPDIRECTSOUNDBUFFER & lpdsb = (LPDIRECTSOUNDBUFFER &)m_lpdsb;
if (Volume == 100) dsVolume = (DWORD)DSBVOLUME_MIN; int32_t dsVolume = - 10 ^ ((100 - Volume) * 33);
if (Volume == 0) dsVolume = DSBVOLUME_MAX; if (Volume == 0)
if (lpdsb != NULL) lpdsb->SetVolume(dsVolume);*/ {
dsVolume = DSBVOLUME_MIN;
}
if (lpdsb != NULL)
{
lpdsb->SetVolume(dsVolume);
}
} }
void DirectSoundDriver::SetSegmentSize(uint32_t length, uint32_t SampleRate) void DirectSoundDriver::SetSegmentSize(uint32_t length, uint32_t SampleRate)
@ -278,4 +284,4 @@ void DirectSoundDriver::AudioThreadProc()
lpdsbuf->Stop(); lpdsbuf->Stop();
} }
WriteTrace(TraceAudioDriver, TraceDebug, "Audio Thread Terminated..."); WriteTrace(TraceAudioDriver, TraceDebug, "Audio Thread Terminated...");
} }