From c9a265d5f8fc4c26759c8871e2467f3dcad8270b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 25 Sep 2003 00:43:10 +0000 Subject: [PATCH] MP3 GetLength is const now, so we can clean this up, too. --- stepmania/src/RageSoundReader_Resample_Good.cpp | 14 ++++---------- stepmania/src/RageSoundReader_Resample_Good.h | 5 ++--- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/stepmania/src/RageSoundReader_Resample_Good.cpp b/stepmania/src/RageSoundReader_Resample_Good.cpp index fe83286404..f4f26a0f55 100644 --- a/stepmania/src/RageSoundReader_Resample_Good.cpp +++ b/stepmania/src/RageSoundReader_Resample_Good.cpp @@ -21,17 +21,12 @@ RageSoundReader_Resample_Good::RageSoundReader_Resample_Good() } /* Call this if the input position is changed or reset. */ -void RageSoundReader_Resample_Good::Reset() const +void RageSoundReader_Resample_Good::Reset() { BufSamples = 0; eof = false; - FlushResampler(); -} - -/* Call this if the input position is changed or reset. */ -void RageSoundReader_Resample_Good::FlushResampler() const -{ + /* Flush the resampler. */ for( int i = 0; i < 2; ++i ) { if( resamp[i] ) @@ -41,8 +36,9 @@ void RageSoundReader_Resample_Good::FlushResampler() const } } + /* Call this if the sample factor changes. */ -void RageSoundReader_Resample_Good::ReopenResampler() const +void RageSoundReader_Resample_Good::ReopenResampler() { for( int i = 0; i < 2; ++i ) { @@ -89,13 +85,11 @@ void RageSoundReader_Resample_Good::SetSampleRate(int hz) int RageSoundReader_Resample_Good::GetLength() const { - Reset(); return source->GetLength(); } int RageSoundReader_Resample_Good::GetLength_Fast() const { - Reset(); return source->GetLength_Fast(); } diff --git a/stepmania/src/RageSoundReader_Resample_Good.h b/stepmania/src/RageSoundReader_Resample_Good.h index 8eb533eff0..3373d38696 100644 --- a/stepmania/src/RageSoundReader_Resample_Good.h +++ b/stepmania/src/RageSoundReader_Resample_Good.h @@ -20,9 +20,8 @@ class RageSoundReader_Resample_Good: public RageSoundReader_Resample mutable int BufSamples; mutable bool eof; - void Reset() const; - void FlushResampler() const; - void ReopenResampler() const; + void Reset(); + void ReopenResampler(); float GetFactor() const; bool FillBuf();