From a62b963fb8ebcada2516fa3c25f760bd341631a1 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 10 Dec 2006 09:04:58 +0000 Subject: [PATCH] make GetNumChannels pure virtual not 1 or 2 anymore; RageSound only supports 1 or 2 but intermediate filters may have more --- stepmania/src/RageSound.cpp | 1 + stepmania/src/RageSoundReader.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp index 6cb9b0e211..ec55cf5f1e 100644 --- a/stepmania/src/RageSound.cpp +++ b/stepmania/src/RageSound.cpp @@ -157,6 +157,7 @@ public: int Read( char *buf, int iFrames ) { return 0; } RageSoundReader *Copy() const { return new RageSoundReader_Silence; } int GetSampleRate() const { return 44100; } + unsigned GetNumChannels() const { return 1; } bool IsStreamingFromDisk() const { return false; } int GetNextSourceFrame() const { return 0; } float GetStreamToSourceRatio() const { return 1.0f; } diff --git a/stepmania/src/RageSoundReader.h b/stepmania/src/RageSoundReader.h index 1ef850c602..604a858fec 100644 --- a/stepmania/src/RageSoundReader.h +++ b/stepmania/src/RageSoundReader.h @@ -13,7 +13,7 @@ public: virtual ~RageSoundReader() { } virtual RageSoundReader *Copy() const = 0; virtual int GetSampleRate() const = 0; - virtual unsigned GetNumChannels() const { return 2; } /* 1 or 2 */ + virtual unsigned GetNumChannels() const = 0; virtual bool IsStreamingFromDisk() const = 0; virtual bool SetProperty( const RString &sProperty, float fValue ) { return false; }