From 008ea637930d7b9ed86cc1da28c2370f89788770 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 18 Jan 2007 09:12:50 +0000 Subject: [PATCH] SOUND->GetPlayLatency -> SOUNDMAN->GetPlayLatency --- stepmania/src/ScreenEdit.cpp | 3 ++- stepmania/src/ScreenGameplay.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 6c51088d23..2a911dbcbb 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -18,6 +18,7 @@ #include "NoteSkinManager.h" #include "NotesWriterSM.h" #include "PrefsManager.h" +#include "RageSoundManager.h" #include "RageInput.h" #include "RageLog.h" #include "ScreenDimensions.h" @@ -811,7 +812,7 @@ void ScreenEdit::PlayTicks() * ahead. This is just to make sure that we request the sound early enough for it to * come out on time; the actual precise timing is handled by SetStartTime. */ float fPositionSeconds = GAMESTATE->m_fMusicSeconds; - fPositionSeconds += SOUND->GetPlayLatency() + (float)CommonMetrics::TICK_EARLY_SECONDS + 0.250f; + fPositionSeconds += SOUNDMAN->GetPlayLatency() + (float)CommonMetrics::TICK_EARLY_SECONDS + 0.250f; const float fSongBeat = GAMESTATE->m_pCurSong->m_Timing.GetBeatFromElapsedTimeNoOffset( fPositionSeconds ); const int iSongRow = max( 0, BeatToNoteRowNotRounded( fSongBeat ) ); diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index a9f0ca6063..25992e72f5 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -22,6 +22,7 @@ #include "ScoreKeeperRave.h" #include "LyricsLoader.h" #include "ActorUtil.h" +#include "RageSoundManager.h" #include "RageSoundReader.h" #include "RageTextureManager.h" #include "GameSoundManager.h" @@ -1406,7 +1407,7 @@ void ScreenGameplay::PlayTicks() * ahead. This is just to make sure that we request the sound early enough for it to * come out on time; the actual precise timing is handled by SetStartTime. */ float fPositionSeconds = GAMESTATE->m_fMusicSeconds; - fPositionSeconds += SOUND->GetPlayLatency() + (float)CommonMetrics::TICK_EARLY_SECONDS + 0.250f; + fPositionSeconds += SOUNDMAN->GetPlayLatency() + (float)CommonMetrics::TICK_EARLY_SECONDS + 0.250f; const float fSongBeat = GAMESTATE->m_pCurSong->m_Timing.GetBeatFromElapsedTimeNoOffset( fPositionSeconds ); const int iSongRow = max( 0, BeatToNoteRowNotRounded( fSongBeat ) );