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

Add Group() for USB songs

Browse Source
This commit is contained in:
Crash Cringle
2025-03-21 16:23:04 -04:00
committed by teejusb
parent 04401ca365
commit 7d5a62a537
6 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SongManager.cpp
+21 -9
View File
@@ -271,6 +271,13 @@ void SongManager::SanityCheckGroupDir( RString sDir ) const
void SongManager::AddGroup( RString sDir, RString sGroupDirName, Group* group )
{
if ( group == nullptr ) {
// Could not AddGroup 'sGroupDirName'. Group object is null.
LOG->Warn( "Could not AddGroup '%s'. Group object is null.", sGroupDirName.c_str() );
return;
}
unsigned j;
for(j = 0; j < m_sSongGroupNames.size(); ++j)
if( sGroupDirName == m_sSongGroupNames[j] )
@@ -279,12 +286,6 @@ void SongManager::AddGroup( RString sDir, RString sGroupDirName, Group* group )
if( j != m_sSongGroupNames.size() )
return; // the group is already added
if ( group == nullptr ) {
// Could not AddGroup 'sGroupDirName'. Group object is null.
LOG->Warn( "Could not AddGroup '%s'. Group object is null.", sGroupDirName.c_str() );
return;
}
RString sBannerPath;
// Look for a group banner in this group folder
@@ -346,7 +347,7 @@ void SongManager::AddGroup( RString sDir, RString sGroupDirName, Group* group )
*/
m_sSongGroupBannerPaths.push_back( sBannerPath );
m_sSongGroupNames.push_back( sGroupDirName );
// Add the group to its series if the group has one and if the series exists
if( group->GetSeries() != "" )
{
@@ -706,7 +707,7 @@ RageColor SongManager::GetSongGroupColor( const RString &sSongGroup ) const
Profile* prof= PROFILEMAN->GetProfile(pn);
if(prof != nullptr)
{
if(prof->GetDisplayNameOrHighScoreName() == sSongGroup)
if(prof->m_group->GetGroupName() == sSongGroup)
{
return profile_song_group_colors.GetValue(pn % num_profile_song_group_colors);
}
@@ -880,7 +881,7 @@ const std::vector<Song*> &SongManager::GetSongs( const RString &sGroupName ) con
Profile* prof= PROFILEMAN->GetProfile(pn);
if(prof != nullptr)
{
if(prof->GetDisplayNameOrHighScoreName() == sGroupName)
if(prof->m_group->GetGroupName() == sGroupName)
{
return prof->m_songs;
}
@@ -938,6 +939,17 @@ Group* SongManager::GetGroupFromName( const RString& sGroupName ) const
auto iter = m_mapNameToGroup.find( sGroupName );
if( iter != m_mapNameToGroup.end() )
return iter->second;
FOREACH_EnabledPlayer(pn)
{
Profile* prof= PROFILEMAN->GetProfile(pn);
if(prof != nullptr)
{
if(prof->m_group->GetGroupName() == sGroupName)
{
return prof->m_group;
}
}
}
return nullptr;
}