diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp index 27486fc6dc..1df818a6f8 100644 --- a/stepmania/src/RageSound.cpp +++ b/stepmania/src/RageSound.cpp @@ -150,7 +150,6 @@ public: 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 464be45e39..e4487c28b8 100644 --- a/stepmania/src/RageSoundReader.h +++ b/stepmania/src/RageSoundReader.h @@ -14,7 +14,6 @@ public: virtual RageSoundReader *Copy() const = 0; virtual int GetSampleRate() const = 0; virtual unsigned GetNumChannels() const = 0; - virtual bool IsStreamingFromDisk() const { return false; } virtual bool SetProperty( const RString &sProperty, float fValue ) { return false; } virtual RageSoundReader *GetSource() { return NULL; } diff --git a/stepmania/src/RageSoundReader_Chain.cpp b/stepmania/src/RageSoundReader_Chain.cpp index 8f47472ee5..097a5b1f95 100644 --- a/stepmania/src/RageSoundReader_Chain.cpp +++ b/stepmania/src/RageSoundReader_Chain.cpp @@ -250,16 +250,6 @@ void RageSoundReader_Chain::ReleaseSound( Sound *s ) m_apActiveSounds.erase( it ); } -bool RageSoundReader_Chain::IsStreamingFromDisk() const -{ - map::const_iterator it; - FOREACH_CONST( RageSoundReader *, m_apLoadedSounds, it ) - if( (*it)->IsStreamingFromDisk() ) - return true; - - return false; -} - bool RageSoundReader_Chain::SetProperty( const RString &sProperty, float fValue ) { bool bRet = false; diff --git a/stepmania/src/RageSoundReader_Chain.h b/stepmania/src/RageSoundReader_Chain.h index c521a61bc5..6c160b0b98 100644 --- a/stepmania/src/RageSoundReader_Chain.h +++ b/stepmania/src/RageSoundReader_Chain.h @@ -37,7 +37,6 @@ public: int Read( char *pBuf, int iFrames ); int GetSampleRate() const { return m_iActualSampleRate; } unsigned GetNumChannels() const { return m_iChannels; } - bool IsStreamingFromDisk() const; bool SetProperty( const RString &sProperty, float fValue ); int GetNextSourceFrame() const; float GetStreamToSourceRatio() const; diff --git a/stepmania/src/RageSoundReader_ChannelSplit.cpp b/stepmania/src/RageSoundReader_ChannelSplit.cpp index 163724b715..62c977fb8b 100644 --- a/stepmania/src/RageSoundReader_ChannelSplit.cpp +++ b/stepmania/src/RageSoundReader_ChannelSplit.cpp @@ -84,7 +84,6 @@ int RageSoundReader_Split::GetLength() const { return m_pImpl->m_pSource->GetLen int RageSoundReader_Split::GetLength_Fast() const { return m_pImpl->m_pSource->GetLength_Fast(); } int RageSoundReader_Split::GetSampleRate() const { return m_pImpl->m_pSource->GetSampleRate(); } unsigned RageSoundReader_Split::GetNumChannels() const { return m_iNumOutputChannels; } -bool RageSoundReader_Split::IsStreamingFromDisk() const { return m_pImpl->m_pSource->IsStreamingFromDisk(); } int RageSoundReader_Split::GetNextSourceFrame() const { return m_iPositionFrame; } float RageSoundReader_Split::GetStreamToSourceRatio() const { return 1.0f; } diff --git a/stepmania/src/RageSoundReader_ChannelSplit.h b/stepmania/src/RageSoundReader_ChannelSplit.h index 9d711d221a..e0de359dac 100644 --- a/stepmania/src/RageSoundReader_ChannelSplit.h +++ b/stepmania/src/RageSoundReader_ChannelSplit.h @@ -20,7 +20,6 @@ public: virtual int Read( char *pBuf, int iFrames ); virtual int GetSampleRate() const; virtual unsigned GetNumChannels() const; - virtual bool IsStreamingFromDisk() const; virtual bool SetProperty( const RString &sProperty, float fValue ); virtual int GetNextSourceFrame() const; virtual float GetStreamToSourceRatio() const; diff --git a/stepmania/src/RageSoundReader_FileReader.h b/stepmania/src/RageSoundReader_FileReader.h index 634fede526..d770f385ec 100644 --- a/stepmania/src/RageSoundReader_FileReader.h +++ b/stepmania/src/RageSoundReader_FileReader.h @@ -24,7 +24,6 @@ public: OPEN_FATAL_ERROR=2, }; virtual OpenResult Open(RString filename) = 0; - virtual bool IsStreamingFromDisk() const { return true; } virtual float GetStreamToSourceRatio() const { return 1.0f; } virtual RString GetError() const { return m_sError; } diff --git a/stepmania/src/RageSoundReader_Filter.h b/stepmania/src/RageSoundReader_Filter.h index d93e44eca0..e1822452a0 100644 --- a/stepmania/src/RageSoundReader_Filter.h +++ b/stepmania/src/RageSoundReader_Filter.h @@ -19,7 +19,6 @@ public: virtual int Read( char *pBuf, int iFrames ) { return m_pSource->Read( pBuf, iFrames ); } virtual int GetSampleRate() const { return m_pSource->GetSampleRate(); } virtual unsigned GetNumChannels() const { return m_pSource->GetNumChannels(); } - virtual bool IsStreamingFromDisk() const { return m_pSource->IsStreamingFromDisk(); } virtual bool SetProperty( const RString &sProperty, float fValue ) { return m_pSource->SetProperty( sProperty, fValue ); } virtual int GetNextSourceFrame() const { return m_pSource->GetNextSourceFrame(); } virtual float GetStreamToSourceRatio() const { return m_pSource->GetStreamToSourceRatio(); } diff --git a/stepmania/src/RageSoundReader_Preload.h b/stepmania/src/RageSoundReader_Preload.h index 4e7993a818..56c469d375 100644 --- a/stepmania/src/RageSoundReader_Preload.h +++ b/stepmania/src/RageSoundReader_Preload.h @@ -19,7 +19,6 @@ public: int Read( char *pBuffer, int iLength ); int GetSampleRate() const { return m_iSampleRate; } unsigned GetNumChannels() const { return m_iChannels; } - bool IsStreamingFromDisk() const { return false; } int GetNextSourceFrame() const; float GetStreamToSourceRatio() const { return m_fRate; } RString GetError() const { return ""; } diff --git a/stepmania/src/RageSoundReader_ThreadedBuffer.h b/stepmania/src/RageSoundReader_ThreadedBuffer.h index 05fe363294..b52951782e 100644 --- a/stepmania/src/RageSoundReader_ThreadedBuffer.h +++ b/stepmania/src/RageSoundReader_ThreadedBuffer.h @@ -25,7 +25,6 @@ public: virtual int GetLength_Fast() const; virtual int GetSampleRate() const { return m_iSampleRate; } virtual unsigned GetNumChannels() const { return m_iChannels; } - virtual bool IsStreamingFromDisk() const { return false; } virtual bool SetProperty( const RString &sProperty, float fValue ); virtual float GetStreamToSourceRatio() const; virtual RageSoundReader *GetSource() { return NULL; }