From 7085ec70fefd5134e6fcde3e0d887fb90828a8f7 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 24 Jul 2004 04:11:07 +0000 Subject: [PATCH] vc6 workaround and rearrange --- stepmania/src/RageSoundReader_Resample_Good.h | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/stepmania/src/RageSoundReader_Resample_Good.h b/stepmania/src/RageSoundReader_Resample_Good.h index 110e0df965..e40d8f769f 100644 --- a/stepmania/src/RageSoundReader_Resample_Good.h +++ b/stepmania/src/RageSoundReader_Resample_Good.h @@ -7,8 +7,28 @@ /* This class changes the sampling rate of a sound. */ class RageSoundReader_Resample_Good: public RageSoundReader_Resample { +public: + /* We own source. */ + void Open(SoundReader *source); + int GetLength() const; + int GetLength_Fast() const; + int SetPosition_Accurate(int ms); + int SetPosition_Fast(int ms); + int Read(char *buf, unsigned len); + RageSoundReader_Resample_Good(); + virtual ~RageSoundReader_Resample_Good(); + SoundReader *Copy() const; + + /* Change the actual sample rate of a sound. */ + void SetSampleRate( int hz ); + void SetHighQuality( bool hq ) { HighQuality = hq; } + + int GetSampleRate() const { return samplerate; } + unsigned GetNumChannels() const { return source->GetNumChannels(); } + enum { BUFSIZE = 4096 }; +private: SoundReader *source; bool HighQuality; int samplerate; @@ -28,25 +48,6 @@ class RageSoundReader_Resample_Good: public RageSoundReader_Resample void ReopenResampler(); float GetFactor() const; bool FillBuf(); - -public: - /* We own source. */ - void Open(SoundReader *source); - int GetLength() const; - int GetLength_Fast() const; - int SetPosition_Accurate(int ms); - int SetPosition_Fast(int ms); - int Read(char *buf, unsigned len); - RageSoundReader_Resample_Good(); - virtual ~RageSoundReader_Resample_Good(); - SoundReader *Copy() const; - - /* Change the actual sample rate of a sound. */ - void SetSampleRate( int hz ); - void SetHighQuality( bool hq ) { HighQuality = hq; } - - int GetSampleRate() const { return samplerate; } - unsigned GetNumChannels() const { return source->GetNumChannels(); } }; #endif