Remount depends on FILEMAN existing so make it nonstatic. Removed uses of FILEMAN from RageFileManager member functions.

This commit is contained in:
Steve Checkoway
2007-05-05 11:10:46 +00:00
parent 497126b655
commit cd791f9239
2 changed files with 5 additions and 5 deletions
+4 -4
View File
@@ -441,9 +441,9 @@ void RageFileManager::CreateDir( const RString &sDir )
// YUCK: The dir cache doesn't have this new file we just created, // YUCK: The dir cache doesn't have this new file we just created,
// so the delete will fail unless we flush. // so the delete will fail unless we flush.
FILEMAN->FlushDirCache( sDir ); FlushDirCache( sDir );
FILEMAN->Remove( sTempFile ); Remove( sTempFile );
} }
static void AdjustMountpoint( RString &sMountPoint ) static void AdjustMountpoint( RString &sMountPoint )
@@ -581,7 +581,7 @@ void RageFileManager::Unmount( const RString &sType, const RString &sRoot_, cons
void RageFileManager::Remount( RString sMountpoint, RString sPath ) void RageFileManager::Remount( RString sMountpoint, RString sPath )
{ {
RageFileDriver *pDriver = FILEMAN->GetFileDriver( sMountpoint ); RageFileDriver *pDriver = GetFileDriver( sMountpoint );
if( pDriver == NULL ) if( pDriver == NULL )
{ {
if( LOG ) if( LOG )
@@ -594,7 +594,7 @@ void RageFileManager::Remount( RString sMountpoint, RString sPath )
else else
pDriver->FlushDirCache( "" ); pDriver->FlushDirCache( "" );
FILEMAN->ReleaseFileDriver( pDriver ); ReleaseFileDriver( pDriver );
} }
bool RageFileManager::IsMounted( RString MountPoint ) bool RageFileManager::IsMounted( RString MountPoint )
+1 -1
View File
@@ -41,7 +41,7 @@ public:
/* Change the root of a filesystem. Only a couple drivers support this; it's /* Change the root of a filesystem. Only a couple drivers support this; it's
* used to change memory card mountpoints without having to actually unmount * used to change memory card mountpoints without having to actually unmount
* the driver. */ * the driver. */
static void Remount( RString sMountpoint, RString sPath ); void Remount( RString sMountpoint, RString sPath );
bool IsMounted( RString MountPoint ); bool IsMounted( RString MountPoint );
struct DriverLocation struct DriverLocation
{ {