actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

SoundReader_FileReader -> RageSoundReader_FileReader

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-30 04:22:38 +00:00
parent f41362f7a9
commit cd5f4a6e39
11 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
+1 -1
View File
@@ -174,7 +174,7 @@ bool RageSound::Load( RString sSoundFilePath, bool bPrecache )
if( pSound == NULL ) if( pSound == NULL )
{ {
RString error; RString error;
pSound = SoundReader_FileReader::OpenFile( sSoundFilePath, error ); pSound = RageSoundReader_FileReader::OpenFile( sSoundFilePath, error );
if( pSound == NULL ) if( pSound == NULL )
{ {
LOG->Warn( "RageSound::Load: error opening sound \"%s\": %s", LOG->Warn( "RageSound::Load: error opening sound \"%s\": %s",
stepmania/src/RageSoundReader_Chain.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ bool RageSoundReader_Chain::AddSound( RString sPath, float fOffsetSecs, float fP
if( it == m_apLoadedSounds.end() ) if( it == m_apLoadedSounds.end() )
{ {
RString error; RString error;
RageSoundReader *pReader = SoundReader_FileReader::OpenFile( sPath, error ); RageSoundReader *pReader = RageSoundReader_FileReader::OpenFile( sPath, error );
if( pReader == NULL ) if( pReader == NULL )
{ {
LOG->Warn( "RageSoundReader_Chain: error opening sound \"%s\": %s", LOG->Warn( "RageSoundReader_Chain: error opening sound \"%s\": %s",
stepmania/src/RageSoundReader_FileReader.cpp
+5 -5
View File
@@ -16,9 +16,9 @@
#include "RageSoundReader_Vorbisfile.h" #include "RageSoundReader_Vorbisfile.h"
#endif #endif
SoundReader_FileReader *SoundReader_FileReader::TryOpenFile( RString filename, RString &error, RString format, bool &bKeepTrying ) RageSoundReader_FileReader *RageSoundReader_FileReader::TryOpenFile( RString filename, RString &error, RString format, bool &bKeepTrying )
{ {
SoundReader_FileReader *Sample = NULL; RageSoundReader_FileReader *Sample = NULL;
#ifndef NO_WAV_SUPPORT #ifndef NO_WAV_SUPPORT
if( !format.CompareNoCase("wav") ) if( !format.CompareNoCase("wav") )
@@ -82,7 +82,7 @@ SoundReader_FileReader *SoundReader_FileReader::TryOpenFile( RString filename, R
return NULL; return NULL;
} }
RageSoundReader *SoundReader_FileReader::OpenFile( RString filename, RString &error ) RageSoundReader *RageSoundReader_FileReader::OpenFile( RString filename, RString &error )
{ {
{ {
RageFile TestOpen; RageFile TestOpen;
@@ -108,7 +108,7 @@ RageSoundReader *SoundReader_FileReader::OpenFile( RString filename, RString &er
/* If the extension matches a format, try that first. */ /* If the extension matches a format, try that first. */
if( FileTypes.find(format) != FileTypes.end() ) if( FileTypes.find(format) != FileTypes.end() )
{ {
SoundReader_FileReader *NewSample = TryOpenFile( filename, error, format, bKeepTrying ); RageSoundReader_FileReader *NewSample = TryOpenFile( filename, error, format, bKeepTrying );
if( NewSample ) if( NewSample )
return NewSample; return NewSample;
FileTypes.erase( format ); FileTypes.erase( format );
@@ -116,7 +116,7 @@ RageSoundReader *SoundReader_FileReader::OpenFile( RString filename, RString &er
for( set<RString>::iterator it = FileTypes.begin(); bKeepTrying && it != FileTypes.end(); ++it ) for( set<RString>::iterator it = FileTypes.begin(); bKeepTrying && it != FileTypes.end(); ++it )
{ {
SoundReader_FileReader *NewSample = TryOpenFile( filename, error, *it, bKeepTrying ); RageSoundReader_FileReader *NewSample = TryOpenFile( filename, error, *it, bKeepTrying );
if( NewSample ) if( NewSample )
{ {
LOG->UserLog( "Sound file", filename, "is really %s.", it->c_str() ); LOG->UserLog( "Sound file", filename, "is really %s.", it->c_str() );
stepmania/src/RageSoundReader_FileReader.h
+3 -2
View File
@@ -5,7 +5,8 @@
#include "RageSoundReader.h" #include "RageSoundReader.h"
class SoundReader_FileReader: public RageSoundReader #define SoundReader_FileReader RageSoundReader_FileReader
class RageSoundReader_FileReader: public RageSoundReader
{ {
public: public:
/* /*
@@ -29,7 +30,7 @@ public:
static RageSoundReader *OpenFile( RString filename, RString &error ); static RageSoundReader *OpenFile( RString filename, RString &error );
private: private:
static SoundReader_FileReader *TryOpenFile( RString filename, RString &error, RString format, bool &bKeepTrying ); static RageSoundReader_FileReader *TryOpenFile( RString filename, RString &error, RString format, bool &bKeepTrying );
}; };
#endif #endif
stepmania/src/RageSoundReader_MP3.cpp
+1 -1
View File
@@ -626,7 +626,7 @@ RageSoundReader_MP3::~RageSoundReader_MP3()
delete mad; delete mad;
} }
SoundReader_FileReader::OpenResult RageSoundReader_MP3::Open( RString filename_ ) RageSoundReader_FileReader::OpenResult RageSoundReader_MP3::Open( RString filename_ )
{ {
filename = filename_; filename = filename_;
if( !file.Open( filename ) ) if( !file.Open( filename ) )
stepmania/src/RageSoundReader_MP3.h
+1 -1
View File
@@ -8,7 +8,7 @@
struct madlib_t; struct madlib_t;
class RageSoundReader_MP3: public SoundReader_FileReader class RageSoundReader_MP3: public RageSoundReader_FileReader
{ {
public: public:
OpenResult Open(RString filename); OpenResult Open(RString filename);
stepmania/src/RageSoundReader_Vorbisfile.cpp
+2 -2
View File
@@ -72,7 +72,7 @@ static RString ov_ssprintf( int err, const char *fmt, ...)
return s + ssprintf( " (%s)", errstr.c_str() ); return s + ssprintf( " (%s)", errstr.c_str() );
} }
SoundReader_FileReader::OpenResult RageSoundReader_Vorbisfile::Open(RString filename_) RageSoundReader_FileReader::OpenResult RageSoundReader_Vorbisfile::Open(RString filename_)
{ {
filename=filename_; filename=filename_;
@@ -88,7 +88,7 @@ SoundReader_FileReader::OpenResult RageSoundReader_Vorbisfile::Open(RString file
return Open( f ); return Open( f );
} }
SoundReader_FileReader::OpenResult RageSoundReader_Vorbisfile::Open( RageFileBasic *f ) RageSoundReader_FileReader::OpenResult RageSoundReader_Vorbisfile::Open( RageFileBasic *f )
{ {
vf = new OggVorbis_File; vf = new OggVorbis_File;
memset( vf, 0, sizeof(*vf) ); memset( vf, 0, sizeof(*vf) );
stepmania/src/RageSoundReader_Vorbisfile.h
+1 -1
View File
@@ -8,7 +8,7 @@
typedef struct OggVorbis_File OggVorbis_File; typedef struct OggVorbis_File OggVorbis_File;
class RageFileBasic; class RageFileBasic;
class RageSoundReader_Vorbisfile: public SoundReader_FileReader class RageSoundReader_Vorbisfile: public RageSoundReader_FileReader
{ {
public: public:
OpenResult Open(RString filename); OpenResult Open(RString filename);
stepmania/src/RageSoundReader_WAV.cpp
+1 -1
View File
@@ -396,7 +396,7 @@ RString ReadString( RageFile &f, int iSize, RString &sError )
return OPEN_FATAL_ERROR; \ return OPEN_FATAL_ERROR; \
} }
SoundReader_FileReader::OpenResult RageSoundReader_WAV::Open( RString filename_ ) RageSoundReader_FileReader::OpenResult RageSoundReader_WAV::Open( RString filename_ )
{ {
m_sFilename = filename_; m_sFilename = filename_;
stepmania/src/RageSoundReader_WAV.h
+1 -1
View File
@@ -7,7 +7,7 @@
#include "RageFile.h" #include "RageFile.h"
struct WavReader; struct WavReader;
class RageSoundReader_WAV: public SoundReader_FileReader class RageSoundReader_WAV: public RageSoundReader_FileReader
{ {
public: public:
OpenResult Open( RString m_sFilename ); OpenResult Open( RString m_sFilename );
stepmania/src/Song.cpp
+1 -1
View File
@@ -407,7 +407,7 @@ void Song::TidyUpData()
if( HasMusic() ) if( HasMusic() )
{ {
RString error; RString error;
RageSoundReader *Sample = SoundReader_FileReader::OpenFile( GetMusicPath(), error ); RageSoundReader *Sample = RageSoundReader_FileReader::OpenFile( GetMusicPath(), error );
/* XXX: Checking if the music file exists eliminates a warning originating from BMS files /* XXX: Checking if the music file exists eliminates a warning originating from BMS files
* (which have no music file, per se) but it's something of a hack. */ * (which have no music file, per se) but it's something of a hack. */
if( Sample == NULL && m_sMusicFile != "" ) if( Sample == NULL && m_sMusicFile != "" )