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

CachedObjectPointer<Song> for SongID

Browse Source
This commit is contained in:
Glenn Maynard
2007-08-12 22:03:59 +00:00
parent 17434831f9
commit 66b6b168bb
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SongUtil.cpp
+15 -6
View File
@@ -879,17 +879,25 @@ void SongID::FromSong( const Song *p )
// Strip off leading "/". 2005/05/21 file layer changes added a leading slash.
if( sDir.Left(1) == "/" )
sDir.erase( sDir.begin() );
m_Cache.Unset();
}
Song *SongID::ToSong() const
{
// HACK for backwards compatibility:
// Re-add the leading "/". 2005/05/21 file layer changes added a leading slash.
RString sDir2 = sDir;
if( sDir2.Left(1) != "/" )
sDir2 = "/" + sDir2;
Song *pRet;
if( !m_Cache.Get(&pRet) )
{
// HACK for backwards compatibility:
// Re-add the leading "/". 2005/05/21 file layer changes added a leading slash.
RString sDir2 = sDir;
if( sDir2.Left(1) != "/" )
sDir2 = "/" + sDir2;
return SONGMAN->GetSongFromDir( sDir2 );
pRet = SONGMAN->GetSongFromDir( sDir2 );
m_Cache.Set( pRet );
}
return pRet;
}
XNode* SongID::CreateNode() const
@@ -905,6 +913,7 @@ void SongID::LoadFromNode( const XNode* pNode )
{
ASSERT( pNode->GetName() == "Song" );
pNode->GetAttrValue("Dir", sDir);
m_Cache.Unset();
}
RString SongID::ToString() const