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

Working at cleaning up the n different ways to get songs. 1 is probably sufficient.

Browse Source
This commit is contained in:
Steve Checkoway
2007-04-07 02:34:17 +00:00
parent 23131dfb6d
commit de3f6e0618
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SongManager.cpp
+21 -20
View File
@@ -520,36 +520,37 @@ RageColor SongManager::GetCourseColor( const Course* pCourse )
}
}
static void GetSongsFromVector( const vector<Song*> &Songs, vector<Song*> &vOut, RString sGroupName )
void SongManager::GetSongs( vector<Song*> &AddTo, const RString &sGroupName ) const
{
vOut.clear();
for( unsigned i=0; i<Songs.size(); i++ )
if( sGroupName==GROUP_ALL || sGroupName==Songs[i]->m_sGroupName )
vOut.push_back( Songs[i] );
const vector<Song *> &vSongs = GetSongsInGroup( sGroupName );
AddTo.insert( AddTo.end(), vSongs.begin(), vSongs.end() );
}
void SongManager::GetSongs( vector<Song*> &AddTo, RString sGroupName ) const
const vector<Song*> &SongManager::GetSongsInGroup( const RString &sGroupName ) const
{
if( sGroupName==GROUP_ALL)
GetSongsFromVector( m_pSongs, AddTo, sGroupName );
else
GetSongsFromVector( GetSongsInGroup(sGroupName), AddTo, GROUP_ALL );
}
const vector<Song*> &SongManager::GetSongsInGroup( RString sGroupName ) const
{
static vector<Song*> empty;
static const vector<Song*> vEmpty;
if( sGroupName == GROUP_ALL )
return m_pSongs;
map<RString, SongPointerVector>::const_iterator iter = m_mapSongGroupIndex.find( sGroupName );
if ( iter != m_mapSongGroupIndex.end() )
return iter->second;
return empty;
return vEmpty;
}
void SongManager::GetPopularSongs( vector<Song*> &AddTo, RString sGroupName, ProfileSlot slot ) const
void SongManager::GetPopularSongs( vector<Song*> &AddTo, const RString &sGroupName, ProfileSlot slot ) const
{
GetSongsFromVector( m_pPopularSongs[slot], AddTo, sGroupName );
if( sGroupName == GROUP_ALL )
{
AddTo.insert( AddTo.end(), m_pPopularSongs[slot].begin(), m_pPopularSongs[slot].end() );
return;
}
FOREACH_CONST( Song*, m_pPopularSongs[slot], song )
{
if( (*song)->m_sGroupName == sGroupName )
AddTo.push_back( *song );
}
}
void SongManager::GetPreferredSortSongs( vector<Song*> &AddTo ) const
stepmania/src/SongManager.h
+3 -4
View File
@@ -73,13 +73,12 @@ public:
// Lookup
const vector<Song*> &GetAllSongs() const { return m_pSongs; }
const vector<Song*> &GetSongsInGroup( RString sGroupName ) const;
void GetPopularSongs( vector<Song*> &AddTo, RString sGroupName, ProfileSlot slot=ProfileSlot_Machine ) const;
const vector<Song*> &GetSongsInGroup( const RString &sGroupName ) const;
void GetPopularSongs( vector<Song*> &AddTo, const RString &sGroupName, ProfileSlot slot=ProfileSlot_Machine ) const;
void GetPreferredSortSongs( vector<Song*> &AddTo ) const;
const vector<Song*> &GetPopularSongs( ProfileSlot slot=ProfileSlot_Machine ) const { return m_pPopularSongs[slot]; }
const vector<Course*> &GetPopularCourses( CourseType ct, ProfileSlot slot=ProfileSlot_Machine ) const { return m_pPopularCourses[slot][ct]; }
void GetSongs( vector<Song*> &AddTo, RString sGroupName ) const;
void GetSongs( vector<Song*> &AddTo ) const { GetSongs(AddTo,GROUP_ALL); }
void GetSongs( vector<Song*> &AddTo, const RString &sGroupName = GROUP_ALL ) const;
Song *FindSong( RString sPath );
Song *FindSong( RString sGroup, RString sSong );
Course *FindCourse( RString sPath );