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

push file opening upwards

Browse Source
This commit is contained in:
Glenn Maynard
2007-02-21 10:24:52 +00:00
parent b99f9ba239
commit 00f9745c75
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_FileReader.cpp
+17 -19
View File
@@ -16,7 +16,7 @@
#include "RageSoundReader_Vorbisfile.h" #include "RageSoundReader_Vorbisfile.h"
#endif #endif
RageSoundReader_FileReader *RageSoundReader_FileReader::TryOpenFile( RString filename, RString &error, RString format, bool &bKeepTrying ) RageSoundReader_FileReader *RageSoundReader_FileReader::TryOpenFile( RageFileBasic *pFile, RString &error, RString format, bool &bKeepTrying )
{ {
RageSoundReader_FileReader *Sample = NULL; RageSoundReader_FileReader *Sample = NULL;
@@ -37,15 +37,8 @@ RageSoundReader_FileReader *RageSoundReader_FileReader::TryOpenFile( RString fil
if( !Sample ) if( !Sample )
return NULL; return NULL;
RageFile file; OpenResult ret = Sample->Open( pFile );
if( !file.Open(filename) ) pFile = NULL; // Sample owns it now
{
error = ssprintf( "Couldn't open file: %s", file.GetError().c_str() );
bKeepTrying = false;
return NULL;
}
OpenResult ret = Sample->Open( file.Copy() );
if( ret == OPEN_OK ) if( ret == OPEN_OK )
return Sample; return Sample;
@@ -90,23 +83,28 @@ RageSoundReader_FileReader *RageSoundReader_FileReader::TryOpenFile( RString fil
return NULL; return NULL;
} }
RageSoundReader *RageSoundReader_FileReader::OpenFile( RString filename, RString &error ) RageSoundReader_FileReader *RageSoundReader_FileReader::OpenFile( RString filename, RString &error )
{ {
RageFile *pFile = new RageFile;
if( !pFile->Open(filename) )
{ {
RageFile TestOpen; error = pFile->GetError();
if( !TestOpen.Open( filename ) ) delete pFile;
{
error = TestOpen.GetError();
return NULL; return NULL;
} }
return OpenFile( pFile, error );
} }
RageSoundReader_FileReader *RageSoundReader_FileReader::OpenFile( RageFileBasic *pFile, RString &error )
{
set<RString> FileTypes; set<RString> FileTypes;
FileTypes.insert("ogg"); FileTypes.insert("ogg");
FileTypes.insert("mp3"); FileTypes.insert("mp3");
FileTypes.insert("wav"); FileTypes.insert("wav");
RString format = GetExtension(filename); RString format = GetExtension( pFile->GetDisplayPath() );
format.MakeLower(); format.MakeLower();
error = ""; error = "";
@@ -116,7 +114,7 @@ RageSoundReader *RageSoundReader_FileReader::OpenFile( RString filename, RString
/* 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() )
{ {
RageSoundReader_FileReader *NewSample = TryOpenFile( filename, error, format, bKeepTrying ); RageSoundReader_FileReader *NewSample = TryOpenFile( pFile->Copy(), error, format, bKeepTrying );
if( NewSample ) if( NewSample )
return NewSample; return NewSample;
FileTypes.erase( format ); FileTypes.erase( format );
@@ -124,10 +122,10 @@ RageSoundReader *RageSoundReader_FileReader::OpenFile( RString filename, RString
for( set<RString>::iterator it = FileTypes.begin(); bKeepTrying && it != FileTypes.end(); ++it ) for( set<RString>::iterator it = FileTypes.begin(); bKeepTrying && it != FileTypes.end(); ++it )
{ {
RageSoundReader_FileReader *NewSample = TryOpenFile( filename, error, *it, bKeepTrying ); RageSoundReader_FileReader *NewSample = TryOpenFile( pFile->Copy(), error, *it, bKeepTrying );
if( NewSample ) if( NewSample )
{ {
LOG->UserLog( "Sound file", filename, "is really %s.", it->c_str() ); LOG->UserLog( "Sound file", pFile->GetDisplayPath(), "is really %s.", it->c_str() );
return NewSample; return NewSample;
} }
} }
stepmania/src/RageSoundReader_FileReader.h
+4 -2
View File
@@ -31,14 +31,16 @@ public:
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; }
static RageSoundReader *OpenFile( RString filename, RString &error ); /* Takes ownership of pFile (even on failure). */
static RageSoundReader_FileReader *OpenFile( RageFileBasic *pFile, RString &error );
static RageSoundReader_FileReader *OpenFile( RString filename, RString &error );
protected: protected:
void SetError( RString sError ) const { m_sError = sError; } void SetError( RString sError ) const { m_sError = sError; }
HiddenPtr<RageFileBasic> m_pFile; HiddenPtr<RageFileBasic> m_pFile;
private: private:
static RageSoundReader_FileReader *TryOpenFile( RString filename, RString &error, RString format, bool &bKeepTrying ); static RageSoundReader_FileReader *TryOpenFile( RageFileBasic *pFile, RString &error, RString format, bool &bKeepTrying );
mutable RString m_sError; mutable RString m_sError;
}; };