actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

honor m_iSoundWriteAhead

Browse Source
This commit is contained in:
Glenn Maynard
2004-03-01 05:05:43 +00:00
parent 34dd476d5e
commit 6fc9ab707f
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
+14 -11
View File
@@ -7,18 +7,17 @@
#include "RageSound.h" #include "RageSound.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageSoundManager.h" #include "RageSoundManager.h"
#include "PrefsManager.h"
static const int channels = 2; static const int channels = 2;
static const int bytes_per_frame = channels*2; /* 16-bit */ static const int bytes_per_frame = channels*2; /* 16-bit */
static const int samplerate = 44100; static const int samplerate = 44100;
static const int buffersize = 1024*4; /* in frames */ static const int safe_writeahead = 1024*4; /* in frames */
static int max_writeahead;
/* We'll fill the buffer in chunks this big. This should evenly divide the /* We'll fill the buffer in chunks this big. */
* buffer size. */
static const int num_chunks = 8; static const int num_chunks = 8;
static const int chunksize = buffersize / num_chunks; static int chunksize() { return max_writeahead / num_chunks; }
int RageSound_DSound_Software::MixerThread_start(void *p) int RageSound_DSound_Software::MixerThread_start(void *p)
{ {
((RageSound_DSound_Software *) p)->MixerThread(); ((RageSound_DSound_Software *) p)->MixerThread();
@@ -43,7 +42,7 @@ void RageSound_DSound_Software::MixerThread()
pcm->Play(); pcm->Play();
while(!shutdown) { while(!shutdown) {
Sleep(10); Sleep( chunksize()*1000 / samplerate );
while(GetData()) while(GetData())
; ;
} }
@@ -62,13 +61,13 @@ bool RageSound_DSound_Software::GetData()
const int64_t play_pos = pcm->GetOutputPosition(); const int64_t play_pos = pcm->GetOutputPosition();
int64_t cur_play_pos = -1; int64_t cur_play_pos = -1;
if(!pcm->get_output_buf(&locked_buf, &len, chunksize)) if( !pcm->get_output_buf(&locked_buf, &len, chunksize()) )
return false; return false;
/* Silence the buffer. */ /* Silence the buffer. */
memset(locked_buf, 0, len); memset(locked_buf, 0, len);
static Sint16 *buf = NULL; static Sint16 *buf = NULL;
int bufsize = buffersize * channels; int bufsize = max_writeahead * channels;
if(!buf) if(!buf)
{ {
buf = new Sint16[bufsize]; buf = new Sint16[bufsize];
@@ -190,10 +189,14 @@ RageSound_DSound_Software::RageSound_DSound_Software()
if(ds.IsEmulated()) if(ds.IsEmulated())
RageException::ThrowNonfatal("Driver unusable (emulated device)"); RageException::ThrowNonfatal("Driver unusable (emulated device)");
max_writeahead = safe_writeahead;
if( PREFSMAN->m_iSoundWriteAhead )
max_writeahead = PREFSMAN->m_iSoundWriteAhead;
/* Create a DirectSound stream, but don't force it into hardware. */ /* Create a DirectSound stream, but don't force it into hardware. */
pcm = new DSoundBuf(ds, pcm = new DSoundBuf(ds,
DSoundBuf::HW_DONT_CARE, DSoundBuf::HW_DONT_CARE,
channels, samplerate, 16, buffersize); channels, samplerate, 16, max_writeahead);
MixingThread.SetName("Mixer thread"); MixingThread.SetName("Mixer thread");
MixingThread.Create( MixerThread_start, this ); MixingThread.Create( MixerThread_start, this );
@@ -214,7 +217,7 @@ RageSound_DSound_Software::~RageSound_DSound_Software()
float RageSound_DSound_Software::GetPlayLatency() const float RageSound_DSound_Software::GetPlayLatency() const
{ {
return (1.0f / samplerate) * buffersize; return (1.0f / samplerate) * max_writeahead;
} }
int RageSound_DSound_Software::GetSampleRate( int rate ) const int RageSound_DSound_Software::GetSampleRate( int rate ) const