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

BackgroundUtil: replace goto with helper function

Browse Source
This commit is contained in:
Devin J. Pohly
2013-01-25 15:45:01 -05:00
parent 7769142ec0
commit e840ac9a6c
1 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BackgroundUtil.cpp
+27 -13
View File
@@ -279,33 +279,31 @@ void BackgroundUtil::GetGlobalBGAnimations( const Song *pSong, const RString &sM
StripCvsAndSvn( vsPathsOut, vsNamesOut ); StripCvsAndSvn( vsPathsOut, vsNamesOut );
} }
void BackgroundUtil::GetGlobalRandomMovies( namespace {
/**
* @brief Fetches the appropriate path(s) for global random movies.
*/
void GetGlobalRandomMoviePaths(
const Song *pSong, const Song *pSong,
const RString &sMatch, const RString &sMatch,
vector<RString> &vsPathsOut, vector<RString> &vsPathsOut,
vector<RString> &vsNamesOut,
bool bTryInsideOfSongGroupAndGenreFirst, bool bTryInsideOfSongGroupAndGenreFirst,
bool bTryInsideOfSongGroupFirst ) bool bTryInsideOfSongGroupFirst )
{ {
vsPathsOut.clear();
vsNamesOut.clear();
// Check for an exact match // Check for an exact match
if( !sMatch.empty() ) if( !sMatch.empty() )
{ {
GetDirListing( SONG_MOVIES_DIR+pSong->m_sGroupName+"/"+sMatch, vsPathsOut, false, true ); // search in SongMovies/SongGroupName/ first GetDirListing( SONG_MOVIES_DIR+pSong->m_sGroupName+"/"+sMatch, vsPathsOut, false, true ); // search in SongMovies/SongGroupName/ first
GetDirListing( SONG_MOVIES_DIR+sMatch, vsPathsOut, false, true ); GetDirListing( SONG_MOVIES_DIR+sMatch, vsPathsOut, false, true );
GetDirListing( RANDOMMOVIES_DIR+sMatch, vsPathsOut, false, true ); GetDirListing( RANDOMMOVIES_DIR+sMatch, vsPathsOut, false, true );
if( !vsPathsOut.empty() ) if( vsPathsOut.empty() && sMatch != NO_SONG_BG_FILE )
goto found_files; {
if( sMatch != NO_SONG_BG_FILE )
LOG->Warn( "Background missing: %s", sMatch.c_str() ); LOG->Warn( "Background missing: %s", sMatch.c_str() );
}
return; return;
} }
// Search for the most appropriate background // Search for the most appropriate background
{
set<RString> ssFileNameWhitelist; set<RString> ssFileNameWhitelist;
if( bTryInsideOfSongGroupAndGenreFirst && pSong && !pSong->m_sGenre.empty() ) if( bTryInsideOfSongGroupAndGenreFirst && pSong && !pSong->m_sGenre.empty() )
GetFilterToFileNames( RANDOMMOVIES_DIR, pSong, ssFileNameWhitelist ); GetFilterToFileNames( RANDOMMOVIES_DIR, pSong, ssFileNameWhitelist );
@@ -342,11 +340,27 @@ void BackgroundUtil::GetGlobalRandomMovies(
} }
if( !vsPathsOut.empty() ) if( !vsPathsOut.empty() )
goto found_files; {
// Return only the first directory found
return;
}
} }
} }
found_files: }
void BackgroundUtil::GetGlobalRandomMovies(
const Song *pSong,
const RString &sMatch,
vector<RString> &vsPathsOut,
vector<RString> &vsNamesOut,
bool bTryInsideOfSongGroupAndGenreFirst,
bool bTryInsideOfSongGroupFirst )
{
vsPathsOut.clear();
vsNamesOut.clear();
GetGlobalRandomMoviePaths( pSong, sMatch, vsPathsOut, bTryInsideOfSongGroupAndGenreFirst, bTryInsideOfSongGroupFirst );
FOREACH_CONST( RString, vsPathsOut, s ) FOREACH_CONST( RString, vsPathsOut, s )
{ {