diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp b/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp index 41c8670a0c..d968dc1c1d 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp @@ -2,9 +2,9 @@ #include "RageSoundDriver_Null.h" #include "RageLog.h" #include "RageUtil.h" +#include "PrefsManager.h" const int channels = 2; -const int samplerate = 44100; void RageSound_Null::Update( float fDeltaTime ) { @@ -21,13 +21,15 @@ void RageSound_Null::Update( float fDeltaTime ) int64_t RageSound_Null::GetPosition( const RageSoundBase *snd ) const { - return int64_t( RageTimer::GetTimeSinceStart() * samplerate ); + return int64_t( RageTimer::GetTimeSinceStart() * m_iSampleRate ); } RageSound_Null::RageSound_Null() { m_iLastCursorPos = GetPosition( NULL ); - + m_iSampleRate = PREFSMAN->m_iSoundPreferredSampleRate; + if( m_iSampleRate == -1 ) + m_iSampleRate = 44100; StartDecodeThread(); } @@ -38,7 +40,7 @@ float RageSound_Null::GetPlayLatency() const int RageSound_Null::GetSampleRate( int iRate ) const { - return samplerate; + return m_iSampleRate; } /* diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Null.h b/stepmania/src/arch/Sound/RageSoundDriver_Null.h index fce303cc29..20010f1537 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_Null.h +++ b/stepmania/src/arch/Sound/RageSoundDriver_Null.h @@ -14,6 +14,7 @@ public: private: int64_t m_iLastCursorPos; + int m_iSampleRate; }; #define USE_RAGE_SOUND_NULL