From 783a9de6b0ccf3e50c00d716e36dad4d5e829bf4 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 21 Dec 2002 18:32:06 +0000 Subject: [PATCH] s/ThrowFatal/Throw/ --- stepmania/src/RageException.cpp | 2 +- stepmania/src/RageException.h | 9 ++++----- stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/stepmania/src/RageException.cpp b/stepmania/src/RageException.cpp index 86143e877d..a80be820bf 100644 --- a/stepmania/src/RageException.cpp +++ b/stepmania/src/RageException.cpp @@ -32,7 +32,7 @@ const char* RageException::what() const throw () return m_sError; } -RageException::ThrowFatal(const char *fmt, ...) +RageException::Throw(const char *fmt, ...) { va_list va; va_start(va, fmt); diff --git a/stepmania/src/RageException.h b/stepmania/src/RageException.h index 50fb6517f0..ba871abdd8 100644 --- a/stepmania/src/RageException.h +++ b/stepmania/src/RageException.h @@ -23,11 +23,10 @@ public: virtual const char *what() const throw(); virtual ~RageException() throw() { } - /* The only difference between these is that ThrowFatal triggers debug - * behavior, and Nonfatal doesn't. Nonfatal is used when the exception - * happens normally and will be caught, such as when a driver fails to - * initialize. */ - static ThrowFatal(const char *fmt, ...); + /* The only difference between these is that Throw triggers debug behavior + * and Nonfatal doesn't. Nonfatal is used when the exception happens + * normally and will be caught, such as when a driver fails to initialize. */ + static Throw(const char *fmt, ...); static ThrowNonfatal(const char *fmt, ...); protected: diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp index 08d0bb6e76..a6173ddda0 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp @@ -106,7 +106,7 @@ bool RageSound_WaveOut::GetPCM() MMRESULT ret = waveOutWrite(wo, &buffers[b], sizeof(buffers[b])); if(ret != MMSYSERR_NOERROR) - RageException::ThrowFatal(wo_ssprintf(ret, "waveOutWrite failed")); + RageException::Throw(wo_ssprintf(ret, "waveOutWrite failed")); /* Increment last_cursor_pos. */ last_cursor_pos += chunksize_frames; @@ -167,7 +167,7 @@ int RageSound_WaveOut::GetPosition(const RageSound *snd) const tm.wType = TIME_SAMPLES; MMRESULT ret = waveOutGetPosition(wo, &tm, sizeof(tm)); if(ret != MMSYSERR_NOERROR) - RageException::ThrowFatal(wo_ssprintf(ret, "waveOutGetPosition failed")); + RageException::Throw(wo_ssprintf(ret, "waveOutGetPosition failed")); return tm.u.sample; }