From 0c406524360e57db3a41a105e9fe3cfebabb011d Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 20 Aug 2011 03:03:10 -0500 Subject: [PATCH] [Player] Make keysounds respect volume preference. Fixes issue 344. --- Docs/Changelog_sm5.txt | 1 + src/Player.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 5ba5a0e39d..5696fa6e08 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -11,6 +11,7 @@ StepMania 5.0 Preview 3 | 20110820 2011/08/20 ---------- * [PlayerOptions] Add GetMMod() Lua binding. [AJ] +* [Player] Make keysounds respect volume preference. Fixes issue 344. [AJ] 2011/08/19 ---------- diff --git a/src/Player.cpp b/src/Player.cpp index 5f0df3e43e..9ff5a7d923 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -1403,6 +1403,7 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector= 0 && tn.iKeysoundIndex < (int) m_vKeysounds.size() ) { float factor = (tn.subType == TapNote::hold_head_roll ? 2.0 * fLifeFraction : 10.0f * fLifeFraction - 8.5f); + // todo: Make sure the player's volume settings are respected. -aj m_vKeysounds[tn.iKeysoundIndex].SetProperty ("Volume", max(0.0f, min(1.0f, factor))); } } @@ -1939,7 +1940,9 @@ void Player::PlayKeysound( const TapNote &tn, TapNoteScore score ) } } m_vKeysounds[tn.iKeysoundIndex].Play(); - m_vKeysounds[tn.iKeysoundIndex].SetProperty ("Volume", 1); + Preference *pVolume = Preference::GetPreferenceByName("SoundVolume"); + float fVol = pVolume->Get(); + m_vKeysounds[tn.iKeysoundIndex].SetProperty ("Volume", fVol); } }