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

stop passing ugly back-references to the RageFile to RageFileObj

Browse Source
This commit is contained in:
Glenn Maynard
2004-12-09 11:47:20 +00:00
parent b38e2e25f1
commit ec22ffec62
8 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageFileDriverMemory.cpp
+6 -7
View File
@@ -23,8 +23,7 @@ private:
int m_iFilePos;
public:
RageFileObjMem( RageFileObjMemFile *pFile, RageFile &p ):
RageFileObj(p)
RageFileObjMem( RageFileObjMemFile *pFile )
{
m_pFile = pFile;
m_iFilePos = 0;
@@ -80,13 +79,13 @@ public:
return m_pFile->m_sBuf.size();
}
RageFileObj *Copy( RageFile &p ) const
RageFileObj *Copy() const
{
m_pFile->m_Mutex.Unlock();
++m_pFile->m_iRefs;
m_pFile->m_Mutex.Lock();
RageFileObjMem *pRet = new RageFileObjMem( m_pFile, p );
RageFileObjMem *pRet = new RageFileObjMem( m_pFile );
pRet->m_iFilePos = m_iFilePos;
return pRet;
@@ -111,7 +110,7 @@ RageFileDriverMem::~RageFileDriverMem()
}
}
RageFileObj *RageFileDriverMem::Open( const CString &sPath, int mode, RageFile &p, int &err )
RageFileObj *RageFileDriverMem::Open( const CString &sPath, int mode, int &err )
{
LockMut(m_Mutex);
@@ -125,7 +124,7 @@ RageFileObj *RageFileDriverMem::Open( const CString &sPath, int mode, RageFile &
m_Files.push_back( pFile );
FDB->AddFile( sPath, 0, 0, pFile );
return new RageFileObjMem( pFile, p );
return new RageFileObjMem( pFile );
}
RageFileObjMemFile *pFile = (RageFileObjMemFile *) FDB->GetFilePriv( sPath );
@@ -135,7 +134,7 @@ RageFileObj *RageFileDriverMem::Open( const CString &sPath, int mode, RageFile &
return NULL;
}
return new RageFileObjMem( pFile, p );
return new RageFileObjMem( pFile );
}
bool RageFileDriverMem::Remove( const CString &sPath )