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

Merge pull request #492 from kyzentun/use_cached_length

Browse Source 
Use cached song length.
This commit is contained in:
Kyzentun
2015-03-05 20:20:23 -07:00
parent 6c24f59429 ebb79d0ea6
commit 4fd79b212e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Song.cpp
+9 -2
View File
@@ -536,7 +536,14 @@ void Song::TidyUpData( bool fromCache, bool /* duringCache */ )
} }
// This must be done before radar calculation. // This must be done before radar calculation.
if( HasMusic() ) if(m_fMusicLengthSeconds > 0.0f || lastSecond > -1.0f)
{
if(m_fMusicLengthSeconds == 0.0f)
{
m_fMusicLengthSeconds= lastSecond;
}
}
else if(HasMusic())
{ {
RString error; RString error;
RageSoundReader *Sample = RageSoundReader_FileReader::OpenFile( GetMusicPath(), error ); RageSoundReader *Sample = RageSoundReader_FileReader::OpenFile( GetMusicPath(), error );
@@ -575,7 +582,7 @@ void Song::TidyUpData( bool fromCache, bool /* duringCache */ )
m_fMusicLengthSeconds); m_fMusicLengthSeconds);
} }
if(!m_PreviewFile.empty()) if(!m_PreviewFile.empty() && m_fMusicSampleStartSeconds == -1)
{ {
RString error; RString error;
RageSoundReader* sample= RageSoundReader_FileReader::OpenFile(GetPreviewMusicPath(), error); RageSoundReader* sample= RageSoundReader_FileReader::OpenFile(GetPreviewMusicPath(), error);