remove IsStreamingFromDisk
This commit is contained in:
@@ -150,7 +150,6 @@ public:
|
|||||||
RageSoundReader *Copy() const { return new RageSoundReader_Silence; }
|
RageSoundReader *Copy() const { return new RageSoundReader_Silence; }
|
||||||
int GetSampleRate() const { return 44100; }
|
int GetSampleRate() const { return 44100; }
|
||||||
unsigned GetNumChannels() const { return 1; }
|
unsigned GetNumChannels() const { return 1; }
|
||||||
bool IsStreamingFromDisk() const { return false; }
|
|
||||||
int GetNextSourceFrame() const { return 0; }
|
int GetNextSourceFrame() const { return 0; }
|
||||||
float GetStreamToSourceRatio() const { return 1.0f; }
|
float GetStreamToSourceRatio() const { return 1.0f; }
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ public:
|
|||||||
virtual RageSoundReader *Copy() const = 0;
|
virtual RageSoundReader *Copy() const = 0;
|
||||||
virtual int GetSampleRate() const = 0;
|
virtual int GetSampleRate() const = 0;
|
||||||
virtual unsigned GetNumChannels() const = 0;
|
virtual unsigned GetNumChannels() const = 0;
|
||||||
virtual bool IsStreamingFromDisk() const { return false; }
|
|
||||||
virtual bool SetProperty( const RString &sProperty, float fValue ) { return false; }
|
virtual bool SetProperty( const RString &sProperty, float fValue ) { return false; }
|
||||||
virtual RageSoundReader *GetSource() { return NULL; }
|
virtual RageSoundReader *GetSource() { return NULL; }
|
||||||
|
|
||||||
|
|||||||
@@ -250,16 +250,6 @@ void RageSoundReader_Chain::ReleaseSound( Sound *s )
|
|||||||
m_apActiveSounds.erase( it );
|
m_apActiveSounds.erase( it );
|
||||||
}
|
}
|
||||||
|
|
||||||
bool RageSoundReader_Chain::IsStreamingFromDisk() const
|
|
||||||
{
|
|
||||||
map<RString, RageSoundReader *>::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 RageSoundReader_Chain::SetProperty( const RString &sProperty, float fValue )
|
||||||
{
|
{
|
||||||
bool bRet = false;
|
bool bRet = false;
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ public:
|
|||||||
int Read( char *pBuf, int iFrames );
|
int Read( char *pBuf, int iFrames );
|
||||||
int GetSampleRate() const { return m_iActualSampleRate; }
|
int GetSampleRate() const { return m_iActualSampleRate; }
|
||||||
unsigned GetNumChannels() const { return m_iChannels; }
|
unsigned GetNumChannels() const { return m_iChannels; }
|
||||||
bool IsStreamingFromDisk() const;
|
|
||||||
bool SetProperty( const RString &sProperty, float fValue );
|
bool SetProperty( const RString &sProperty, float fValue );
|
||||||
int GetNextSourceFrame() const;
|
int GetNextSourceFrame() const;
|
||||||
float GetStreamToSourceRatio() const;
|
float GetStreamToSourceRatio() const;
|
||||||
|
|||||||
@@ -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::GetLength_Fast() const { return m_pImpl->m_pSource->GetLength_Fast(); }
|
||||||
int RageSoundReader_Split::GetSampleRate() const { return m_pImpl->m_pSource->GetSampleRate(); }
|
int RageSoundReader_Split::GetSampleRate() const { return m_pImpl->m_pSource->GetSampleRate(); }
|
||||||
unsigned RageSoundReader_Split::GetNumChannels() const { return m_iNumOutputChannels; }
|
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; }
|
int RageSoundReader_Split::GetNextSourceFrame() const { return m_iPositionFrame; }
|
||||||
float RageSoundReader_Split::GetStreamToSourceRatio() const { return 1.0f; }
|
float RageSoundReader_Split::GetStreamToSourceRatio() const { return 1.0f; }
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ public:
|
|||||||
virtual int Read( char *pBuf, int iFrames );
|
virtual int Read( char *pBuf, int iFrames );
|
||||||
virtual int GetSampleRate() const;
|
virtual int GetSampleRate() const;
|
||||||
virtual unsigned GetNumChannels() const;
|
virtual unsigned GetNumChannels() const;
|
||||||
virtual bool IsStreamingFromDisk() const;
|
|
||||||
virtual bool SetProperty( const RString &sProperty, float fValue );
|
virtual bool SetProperty( const RString &sProperty, float fValue );
|
||||||
virtual int GetNextSourceFrame() const;
|
virtual int GetNextSourceFrame() const;
|
||||||
virtual float GetStreamToSourceRatio() const;
|
virtual float GetStreamToSourceRatio() const;
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ public:
|
|||||||
OPEN_FATAL_ERROR=2,
|
OPEN_FATAL_ERROR=2,
|
||||||
};
|
};
|
||||||
virtual OpenResult Open(RString filename) = 0;
|
virtual OpenResult Open(RString filename) = 0;
|
||||||
virtual bool IsStreamingFromDisk() const { return true; }
|
|
||||||
virtual float GetStreamToSourceRatio() const { return 1.0f; }
|
virtual float GetStreamToSourceRatio() const { return 1.0f; }
|
||||||
virtual RString GetError() const { return m_sError; }
|
virtual RString GetError() const { return m_sError; }
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ public:
|
|||||||
virtual int Read( char *pBuf, int iFrames ) { return m_pSource->Read( pBuf, iFrames ); }
|
virtual int Read( char *pBuf, int iFrames ) { return m_pSource->Read( pBuf, iFrames ); }
|
||||||
virtual int GetSampleRate() const { return m_pSource->GetSampleRate(); }
|
virtual int GetSampleRate() const { return m_pSource->GetSampleRate(); }
|
||||||
virtual unsigned GetNumChannels() const { return m_pSource->GetNumChannels(); }
|
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 bool SetProperty( const RString &sProperty, float fValue ) { return m_pSource->SetProperty( sProperty, fValue ); }
|
||||||
virtual int GetNextSourceFrame() const { return m_pSource->GetNextSourceFrame(); }
|
virtual int GetNextSourceFrame() const { return m_pSource->GetNextSourceFrame(); }
|
||||||
virtual float GetStreamToSourceRatio() const { return m_pSource->GetStreamToSourceRatio(); }
|
virtual float GetStreamToSourceRatio() const { return m_pSource->GetStreamToSourceRatio(); }
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ public:
|
|||||||
int Read( char *pBuffer, int iLength );
|
int Read( char *pBuffer, int iLength );
|
||||||
int GetSampleRate() const { return m_iSampleRate; }
|
int GetSampleRate() const { return m_iSampleRate; }
|
||||||
unsigned GetNumChannels() const { return m_iChannels; }
|
unsigned GetNumChannels() const { return m_iChannels; }
|
||||||
bool IsStreamingFromDisk() const { return false; }
|
|
||||||
int GetNextSourceFrame() const;
|
int GetNextSourceFrame() const;
|
||||||
float GetStreamToSourceRatio() const { return m_fRate; }
|
float GetStreamToSourceRatio() const { return m_fRate; }
|
||||||
RString GetError() const { return ""; }
|
RString GetError() const { return ""; }
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ public:
|
|||||||
virtual int GetLength_Fast() const;
|
virtual int GetLength_Fast() const;
|
||||||
virtual int GetSampleRate() const { return m_iSampleRate; }
|
virtual int GetSampleRate() const { return m_iSampleRate; }
|
||||||
virtual unsigned GetNumChannels() const { return m_iChannels; }
|
virtual unsigned GetNumChannels() const { return m_iChannels; }
|
||||||
virtual bool IsStreamingFromDisk() const { return false; }
|
|
||||||
virtual bool SetProperty( const RString &sProperty, float fValue );
|
virtual bool SetProperty( const RString &sProperty, float fValue );
|
||||||
virtual float GetStreamToSourceRatio() const;
|
virtual float GetStreamToSourceRatio() const;
|
||||||
virtual RageSoundReader *GetSource() { return NULL; }
|
virtual RageSoundReader *GetSource() { return NULL; }
|
||||||
|
|||||||
Reference in New Issue
Block a user