remove unused init-by-filename code path
This commit is contained in:
@@ -11,12 +11,6 @@ RageFileStore::ReadErr::ReadErr( const RageFileBasic &f ):
|
||||
{
|
||||
}
|
||||
|
||||
RageFileStore::RageFileStore()
|
||||
{
|
||||
m_pFile = NULL;
|
||||
m_waiting = false;
|
||||
}
|
||||
|
||||
RageFileStore::RageFileStore( RageFileBasic *pFile )
|
||||
{
|
||||
m_pFile = pFile;
|
||||
@@ -44,20 +38,7 @@ RageFileStore::RageFileStore( const RageFileStore &cpy ):
|
||||
|
||||
void RageFileStore::StoreInitialize(const NameValuePairs ¶meters)
|
||||
{
|
||||
const char *fileName;
|
||||
if( parameters.GetValue("InputFileName", fileName) )
|
||||
{
|
||||
RageFile *pFile = new RageFile;
|
||||
m_pFile = pFile;
|
||||
LOG->Trace( "XXX: not using pFile" );
|
||||
if( !pFile->Open(fileName, RageFile::READ) )
|
||||
throw OpenErr( fileName );
|
||||
}
|
||||
else
|
||||
{
|
||||
ASSERT( m_pFile != NULL );
|
||||
LOG->Trace( "XXX: using pFile" );
|
||||
}
|
||||
ASSERT( m_pFile != NULL );
|
||||
m_waiting = false;
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@ public:
|
||||
class OpenErr : public Err {public: OpenErr(const std::string &filename) : Err("FileStore: error opening file for reading: " + filename) {}};
|
||||
struct ReadErr : public Err { ReadErr( const RageFileBasic &f ); };
|
||||
|
||||
RageFileStore();
|
||||
RageFileStore( RageFileBasic *pFile ); /* pFile will be deleted */
|
||||
~RageFileStore();
|
||||
RageFileStore( const RageFileStore &cpy );
|
||||
@@ -49,8 +48,6 @@ public:
|
||||
|
||||
RageFileSource( RageFileBasic *pFile, bool pumpAll, BufferedTransformation *attachment = NULL, bool binary=true )
|
||||
: SourceTemplate<RageFileStore>(attachment,RageFileStore(pFile)) {SourceInitialize(pumpAll, MakeParameters("InputBinaryMode", binary));}
|
||||
RageFileSource(const char *filename, bool pumpAll, BufferedTransformation *attachment = NULL, bool binary=true)
|
||||
: SourceTemplate<RageFileStore>(attachment) {SourceInitialize(pumpAll, MakeParameters("InputFileName", filename)("InputBinaryMode", binary));}
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user