diff options
| author | Richard Nelson <none@none> | 2010-04-28 19:06:55 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-04-28 19:06:55 -0700 |
| commit | 0ea9fa8d9425cd89a6a8b01b6dc56696ea1b9033 (patch) | |
| tree | 7fdf746f08429e5229010f9ecb87f6389f93ebb9 /indra/media_plugins/winmmshim/winmm_shim.cpp | |
| parent | 8c3feea2a2f3bcb648f712f63ea9c4dab8aaa0c3 (diff) | |
| parent | a1b765189d4b8bfb6ec99bc5e5c0a2cc4c9ccbd2 (diff) | |
merge
Diffstat (limited to 'indra/media_plugins/winmmshim/winmm_shim.cpp')
| -rw-r--r-- | indra/media_plugins/winmmshim/winmm_shim.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp index f7df3b19a0..88c2a28443 100644 --- a/indra/media_plugins/winmmshim/winmm_shim.cpp +++ b/indra/media_plugins/winmmshim/winmm_shim.cpp @@ -120,8 +120,8 @@ extern "C" { // zero out the audio buffer when muted memset(pwh->lpData, 0, pwh->dwBufferLength); } - else - { + else if (sVolumeLevel != 1.f) + { // need to apply volume level wave_out_map_t::iterator found_it = sWaveOuts.find(hwo); if (found_it != sWaveOuts.end()) { @@ -162,10 +162,11 @@ extern "C" // the captain has turned off the MMX sign, you are now free to use floating point registers _mm_empty(); + // finish remaining samples that didn't fit into 64 bit register for (short* sample_16 = (short*)sample_64; sample_16 < (short*)(pwh->lpData + pwh->dwBufferLength); ++sample_16) - { // finish remaining samples that didn't fit into 64 bit register + { *sample_16 = (*sample_16 * volume_16) >> 15; } |