From e45f16abb7ef62c10cedd5d70c6002dead6c6788 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 24 Apr 2007 05:53:41 +0000 Subject: [PATCH] experimental support for per-player sound streams --- stepmania/src/ScreenGameplay.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 18fd068671..c6d99c31fe 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1206,7 +1206,10 @@ void ScreenGameplay::LoadNextSong() /* Give SoundEffectControls the new RageSoundReaders. */ FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi ) { - pi->m_SoundEffectControl.SetSoundReader( m_pSoundMusic->GetSoundReader() ); + RageSoundReader *pPlayerSound = m_AutoKeysounds.GetPlayerSound(pi->m_pn); + if( pPlayerSound == NULL && pi->m_pn == GAMESTATE->m_MasterPlayerNumber ) + pPlayerSound = m_AutoKeysounds.GetSharedSound(); + pi->m_SoundEffectControl.SetSoundReader( pPlayerSound ); } } @@ -2538,7 +2541,9 @@ void ScreenGameplay::HandleMessage( const Message &msg ) if( !pi->GetPlayerState()->m_PlayerOptions.GetCurrent().m_bMuteOnError ) continue; - RageSoundReader *pSoundReader = m_pSoundMusic->GetSoundReader(); + RageSoundReader *pSoundReader = m_AutoKeysounds.GetPlayerSound( pn ); + if( pSoundReader == NULL ) + pSoundReader = m_AutoKeysounds.GetSharedSound(); HoldNoteScore hns; msg.GetParam( "HoldNoteScore", hns );