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

apth fixups

Browse Source 
cdtitle fix
This commit is contained in:
Glenn Maynard
2003-12-11 07:26:59 +00:00
parent a7190307f3
commit 58744ad453
1 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Song.cpp
+30 -25
View File
@@ -591,15 +591,32 @@ static bool ImageIsLoadable( const CString &sPath )
return true;
}
/* Fix up song paths. If there's a leading "./", be sure to keep it: it's
* a signal that the path is from the root directory, not the song directory. */
void FixupPath( CString &path )
{
/* Replace backslashes with slashes in all paths. */
FixSlashesInPlace( path );
bool StartsWithDot = false;
if( path.Left(2) == "./" )
StartsWithDot = true;
CollapsePath( path );
/* Many imported files contain erroneous whitespace before or after
* filenames. Paths usually don't actually start or end with spaces,
* so let's just remove it. */
TrimLeft( path );
TrimRight( path );
if( StartsWithDot )
path = "./" + path;
}
/* Songs in BlacklistImages will never be autodetected as song images. */
void Song::TidyUpData()
{
m_sSongDir.Replace( '\\', '/' );
m_sBannerFile.Replace( '\\', '/' );
m_sLyricsFile.Replace( '\\', '/' );
m_sBackgroundFile.Replace( '\\', '/' );
m_sCDTitleFile.Replace( '\\', '/' );
if( !HasMusic() )
{
CStringArray arrayPossibleMusic;
@@ -721,24 +738,12 @@ void Song::TidyUpData()
CHECKPOINT_M( "Looking for images..." );
/* Replace backslashes with slashes in all paths. */
FixSlashesInPlace( m_sMusicFile );
FixSlashesInPlace( m_sBannerFile );
FixSlashesInPlace( m_sBackgroundFile );
FixSlashesInPlace( m_sCDTitleFile );
FixSlashesInPlace( m_sLyricsFile );
/* Many imported files contain erroneous whitespace before or after
* filenames. Paths usually don't actually start or end with spaces,
* so let's just remove it. */
TrimLeft(m_sBannerFile);
TrimRight(m_sBannerFile);
TrimLeft(m_sBackgroundFile);
TrimRight(m_sBackgroundFile);
TrimLeft(m_sCDTitleFile);
TrimRight(m_sCDTitleFile);
TrimLeft(m_sLyricsFile);
TrimRight(m_sLyricsFile);
FixupPath( m_sSongDir );
FixupPath( m_sMusicFile );
FixupPath( m_sBannerFile );
FixupPath( m_sLyricsFile );
FixupPath( m_sBackgroundFile );
FixupPath( m_sCDTitleFile );
//
// First, check the file name for hints.
@@ -1675,7 +1680,7 @@ CString Song::GetLyricsPath() const
CString Song::GetCDTitlePath() const
{
if( m_sCDTitleFile.Find('/') != -1 )
if( m_sCDTitleFile.Find('/') == -1 )
return m_sSongDir+m_sCDTitleFile;
return m_sCDTitleFile;
}