use PREFSMAN->m_iSoundPreferredSampleRate

This commit is contained in:
Glenn Maynard
2005-10-24 01:21:07 +00:00
parent 9bd1ed48d6
commit 9d32f5e9f5
2 changed files with 7 additions and 4 deletions
@@ -2,9 +2,9 @@
#include "RageSoundDriver_Null.h" #include "RageSoundDriver_Null.h"
#include "RageLog.h" #include "RageLog.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "PrefsManager.h"
const int channels = 2; const int channels = 2;
const int samplerate = 44100;
void RageSound_Null::Update( float fDeltaTime ) 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 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() RageSound_Null::RageSound_Null()
{ {
m_iLastCursorPos = GetPosition( NULL ); m_iLastCursorPos = GetPosition( NULL );
m_iSampleRate = PREFSMAN->m_iSoundPreferredSampleRate;
if( m_iSampleRate == -1 )
m_iSampleRate = 44100;
StartDecodeThread(); StartDecodeThread();
} }
@@ -38,7 +40,7 @@ float RageSound_Null::GetPlayLatency() const
int RageSound_Null::GetSampleRate( int iRate ) const int RageSound_Null::GetSampleRate( int iRate ) const
{ {
return samplerate; return m_iSampleRate;
} }
/* /*
@@ -14,6 +14,7 @@ public:
private: private:
int64_t m_iLastCursorPos; int64_t m_iLastCursorPos;
int m_iSampleRate;
}; };
#define USE_RAGE_SOUND_NULL #define USE_RAGE_SOUND_NULL