diff --git a/stepmania/src/RageFileDriver.cpp b/stepmania/src/RageFileDriver.cpp index 8abe07bf21..991a98314c 100644 --- a/stepmania/src/RageFileDriver.cpp +++ b/stepmania/src/RageFileDriver.cpp @@ -13,53 +13,6 @@ void RageFileObj::SetError( const CString &err ) parent.SetError( err ); } -int RageFileObj::Seek( int offset ) -{ - const int OldPos = parent.Tell(); - if( offset < OldPos ) - parent.Rewind(); - else - offset -= OldPos; - - char buf[1024*4]; - while( offset ) - { - /* Must call parent.Read: */ - int got = parent.Read( buf, min( (int) sizeof(buf), offset ) ); - if( got == -1 ) - return -1; - - if( got == 0 ) - break; - offset -= got; - } - - return parent.Tell(); -} - -int RageFileObj::GetFileSize() -{ - int OldPos = parent.Tell(); - parent.Rewind(); - char buf[256]; - int ret = 0; - while( 1 ) - { - /* Must call parent.Read: */ - int got = parent.Read( buf, sizeof(buf) ); - if( got == -1 ) - { - ret = -1; - break; - } - if( got == 0 ) - break; - ret += got; - } - Seek( OldPos ); - return ret; -} - int RageFileDriver::GetPathValue( const CString &path ) { vector parts; diff --git a/stepmania/src/RageFileDriver.h b/stepmania/src/RageFileDriver.h index 89965be201..00d2befbda 100644 --- a/stepmania/src/RageFileDriver.h +++ b/stepmania/src/RageFileDriver.h @@ -43,8 +43,8 @@ public: // virtual CString RealPath() const { return parent->GetPath(); } - virtual int Seek( int offset ); - virtual int GetFileSize(); + virtual int Seek( int offset ) = 0; + virtual int GetFileSize() = 0; virtual CString GetDisplayPath() const { return parent.GetRealPath(); } /* Raw I/O: */