From 3a78d151e74b3ab278c3c9ce851a085ac11b8e00 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 21 Feb 2004 00:14:38 +0000 Subject: [PATCH] remove SoundPreloadAll cleanup --- stepmania/src/PrefsManager.cpp | 19 ++++++++----------- stepmania/src/PrefsManager.h | 7 +++---- stepmania/src/ScreenOptionsMasterPrefs.cpp | 1 - 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 66bc24cca7..4568d9e433 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -222,19 +222,23 @@ PrefsManager::PrefsManager() #ifdef _XBOX m_bInterlaced = true; m_bPAL = false; - m_fScreenPosX = 0 ; - m_fScreenPosY = 0 ; - m_fScreenWidth = 640 ; - m_fScreenHeight = 480 ; + m_fScreenPosX = 0; + m_fScreenPosY = 0; + m_fScreenWidth = 640; + m_fScreenHeight = 480; #else m_bInterlaced = false; #endif + m_sSoundDrivers = DEFAULT_SOUND_DRIVER_LIST; /* Number of frames to write ahead; usually 44100 frames per second. * (Number of millisec would be more flexible, but it's more useful to * specify numbers directly.) This is purely a troubleshooting option * and is not honored by all sound drivers. */ m_iSoundWriteAhead = 0; + m_fSoundVolume = DEFAULT_SOUND_VOLUME; + m_iSoundResampleQuality = RageSoundReader_Resample::RESAMP_NORMAL; + m_sMovieDrivers = DEFAULT_MOVIE_DRIVER_LIST; // StepMania.cpp sets these on first run: @@ -243,12 +247,7 @@ PrefsManager::PrefsManager() m_iLastSeenMemory = 0; #endif - m_fSoundVolume = DEFAULT_SOUND_VOLUME; m_sLightsDriver = DEFAULT_LIGHTS_DRIVER; - /* This is experimental: let's see if preloading helps people's skipping. - * If it doesn't do anything useful, it'll be removed. */ - m_bSoundPreloadAll = false; - m_iSoundResampleQuality = RageSoundReader_Resample::RESAMP_NORMAL; m_bAllowUnacceleratedRenderer = false; m_bThreadedInput = true; @@ -419,7 +418,6 @@ void PrefsManager::ReadGlobalPrefsFromDisk() ini.GetValue( "Options", "MarvelousTiming", (int&)m_iMarvelousTiming ); ini.GetValue( "Options", "SoundVolume", m_fSoundVolume ); ini.GetValue( "Options", "LightsDriver", m_sLightsDriver ); - ini.GetValue( "Options", "SoundPreloadAll", m_bSoundPreloadAll ); ini.GetValue( "Options", "SoundResampleQuality", m_iSoundResampleQuality ); ini.GetValue( "Options", "CoinMode", m_iCoinMode ); ini.GetValue( "Options", "CoinsPerCredit", m_iCoinsPerCredit ); @@ -634,7 +632,6 @@ void PrefsManager::SaveGlobalPrefsToDisk() const ini.SetValue( "Options", "MusicWheelSwitchSpeed", m_iMusicWheelSwitchSpeed ); ini.SetValue( "Options", "EasterEggs", m_bEasterEggs ); ini.SetValue( "Options", "MarvelousTiming", m_iMarvelousTiming ); - ini.SetValue( "Options", "SoundPreloadAll", m_bSoundPreloadAll ); ini.SetValue( "Options", "SoundResampleQuality", m_iSoundResampleQuality ); ini.SetValue( "Options", "CoinMode", m_iCoinMode ); ini.SetValue( "Options", "CoinsPerCredit", m_iCoinsPerCredit ); diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 785f74bf22..cc0bd4127c 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -220,12 +220,11 @@ public: CString m_sVideoRenderers; bool m_bSmoothLines; CString m_sSoundDrivers; - int m_iSoundWriteAhead; + int m_iSoundWriteAhead; + float m_fSoundVolume; + int m_iSoundResampleQuality; CString m_sMovieDrivers; CString m_sLightsDriver; - float m_fSoundVolume; - bool m_bSoundPreloadAll; - int m_iSoundResampleQuality; bool m_bAllowUnacceleratedRenderer; bool m_bThreadedInput; bool m_bScreenTestMode; diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index 673f15cd1b..78f09aba22 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -390,7 +390,6 @@ static void RefreshRate( int &sel, bool ToSel, const CStringArray &choices ) } /* Sound options */ -MOVE( PreloadSounds, PREFSMAN->m_bSoundPreloadAll ); MOVE( ResamplingQuality, PREFSMAN->m_iSoundResampleQuality ); MOVE( AttractSoundFrequency,PREFSMAN->m_iAttractSoundFrequency );