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

fix up error handling

Browse Source
This commit is contained in:
Glenn Maynard
2002-12-21 08:23:16 +00:00
parent 678a07e035
commit f53a120204
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
+18 -3
View File
@@ -22,6 +22,19 @@ const int num_chunks = 8;
const int chunksize_frames = buffersize_frames / num_chunks; const int chunksize_frames = buffersize_frames / num_chunks;
const int chunksize = buffersize / num_chunks; const int chunksize = buffersize / num_chunks;
static CString wo_ssprintf( MMRESULT err, const char *fmt, ...)
{
char buf[MAXERRORLENGTH];
waveOutGetErrorText(err, buf, MAXERRORLENGTH);
va_list va;
va_start(va, fmt);
CString s = vssprintf( fmt, va );
va_end(va);
return s += ssprintf( "(%s)", buf );
}
int RageSound_WaveOut::MixerThread_start(void *p) int RageSound_WaveOut::MixerThread_start(void *p)
{ {
((RageSound_WaveOut *) p)->MixerThread(); ((RageSound_WaveOut *) p)->MixerThread();
@@ -91,7 +104,7 @@ bool RageSound_WaveOut::GetPCM()
MMRESULT ret = waveOutWrite(wo, &buffers[b], sizeof(buffers[b])); MMRESULT ret = waveOutWrite(wo, &buffers[b], sizeof(buffers[b]));
if(ret != MMSYSERR_NOERROR) if(ret != MMSYSERR_NOERROR)
RageException::ThrowNonfatal("blah"); // XXX RageException::ThrowFatal(wo_ssprintf(ret, "waveOutWrite failed"));
/* Increment last_cursor_pos to point at where the data we're about to /* Increment last_cursor_pos to point at where the data we're about to
* ask for will actually be played. */ * ask for will actually be played. */
@@ -152,6 +165,8 @@ int RageSound_WaveOut::GetPosition(const RageSound *snd) const
MMTIME tm; MMTIME tm;
tm.wType = TIME_SAMPLES; tm.wType = TIME_SAMPLES;
MMRESULT ret = waveOutGetPosition(wo, &tm, sizeof(tm)); MMRESULT ret = waveOutGetPosition(wo, &tm, sizeof(tm));
if(ret != MMSYSERR_NOERROR)
RageException::ThrowFatal(wo_ssprintf(ret, "waveOutGetPosition failed"));
return tm.u.sample; return tm.u.sample;
} }
@@ -177,7 +192,7 @@ RageSound_WaveOut::RageSound_WaveOut()
(DWORD_PTR) sound_event, NULL, CALLBACK_EVENT); (DWORD_PTR) sound_event, NULL, CALLBACK_EVENT);
if(ret != MMSYSERR_NOERROR) if(ret != MMSYSERR_NOERROR)
RageException::ThrowNonfatal("blah"); // XXX RageException::ThrowNonfatal(wo_ssprintf(ret, "waveOutOpen failed"));
for(int b = 0; b < num_chunks; ++b) for(int b = 0; b < num_chunks; ++b)
{ {
@@ -186,7 +201,7 @@ RageSound_WaveOut::RageSound_WaveOut()
buffers[b].lpData = new char[chunksize]; buffers[b].lpData = new char[chunksize];
ret = waveOutPrepareHeader(wo, &buffers[b], sizeof(buffers[b])); ret = waveOutPrepareHeader(wo, &buffers[b], sizeof(buffers[b]));
if(ret != MMSYSERR_NOERROR) if(ret != MMSYSERR_NOERROR)
RageException::ThrowNonfatal("blah"); // XXX RageException::ThrowNonfatal(wo_ssprintf(ret, "waveOutPrepareHeader failed"));
buffers[b].dwFlags |= WHDR_DONE; buffers[b].dwFlags |= WHDR_DONE;
} }