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

handle length error returns

Browse Source 
title update
This commit is contained in:
Glenn Maynard
2003-02-10 21:21:48 +00:00
parent 339070638e
commit f6ebc8a30a
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Song.cpp
+14 -4
View File
@@ -402,9 +402,13 @@ void Song::TidyUpData()
sound.Load( GetMusicPath(), false ); /* don't pre-cache */
m_fMusicLengthSeconds = sound.GetLengthSeconds();
/* XXX: if(m_fMusicLengthSeconds == -1), warn and throw out the song */
if(m_fMusicLengthSeconds == 0)
if(m_fMusicLengthSeconds == -1)
{
/* It failed; bad file or something. It's already logged a warning,
* so just set the file to 0 seconds. */
m_fMusicLengthSeconds = 0;
} else if(m_fMusicLengthSeconds == 0) {
LOG->Warn("File %s is empty?", GetMusicPath().GetString());
} else if(m_fMusicLengthSeconds == -1) {
LOG->Warn("File %s: error getting length", GetMusicPath().GetString());
@@ -416,6 +420,12 @@ void Song::TidyUpData()
LOG->Warn("This song has no music file; guessing at %f seconds", m_fMusicLengthSeconds);
}
if(m_fMusicLengthSeconds < 0)
{
LOG->Warn("File %i has negative length? (%i)", GetMusicPath().GetString(), m_fMusicLengthSeconds);
m_fMusicLengthSeconds = 0;
}
/* Generate these before we autogen notes, so the new notes can inherit
* their source's values. */
ReCalculateRadarValuesAndLastBeat();
@@ -644,8 +654,8 @@ void Song::TranslateTitles()
/* ロマンスの神様 */
ttab.push_back(TitleTrans("^God of Romance$", "", "", "&kro;&kma;&kn;&ksu;&hno;&kami;&sama;", "", "") );
/* ダンシン・オール・アローン */
ttab.push_back(TitleTrans("^Dancing Pompokolin$", "", "", "&kda;&kn;&ksi;&kn;&kdot;&ko;&kdash;&kru;&kdot;&ka;&kro;&kdash;&kn;", "", "") );
/* おどるポンポコリン */
ttab.push_back(TitleTrans("^Dancing Pompokolin$", "", "", "&ho;&hdo;&hru;&kpo;&kn;&kpo;&kko;&kri;&kn;", "", "") );
/* 青い振動 */
ttab.push_back(TitleTrans("^Aoi Shoudou$", "", "", "&aoi;&hi;&shoudou1;&shoudou2;", "", "") );