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

make Song not depend on SOUNDMAN

Browse Source
This commit is contained in:
Glenn Maynard
2004-02-20 05:35:05 +00:00
parent 7840f70144
commit 53e264c10d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Song.cpp
+8 -4
View File
@@ -17,7 +17,7 @@
#include "RageLog.h" #include "RageLog.h"
#include "IniFile.h" #include "IniFile.h"
#include "NoteData.h" #include "NoteData.h"
#include "RageSound.h" #include "RageSoundReader_FileReader.h"
#include "RageException.h" #include "RageException.h"
#include "SongManager.h" #include "SongManager.h"
#include "SongCacheIndex.h" #include "SongCacheIndex.h"
@@ -491,10 +491,14 @@ void Song::TidyUpData()
/* This must be done before radar calculation. */ /* This must be done before radar calculation. */
if( HasMusic() ) if( HasMusic() )
{ {
RageSound sound; CString error;
sound.Load( GetMusicPath(), false ); /* don't pre-cache */ SoundReader *Sample = SoundReader_FileReader::OpenFile( GetMusicPath(), error );
if( Sample == NULL )
RageException::Throw( "Error opening sound '%s': '%s'",
GetMusicPath().c_str(), error.c_str());
m_fMusicLengthSeconds = sound.GetLengthSeconds(); m_fMusicLengthSeconds = Sample->GetLength() / 1000.0f;
delete Sample;
if(m_fMusicLengthSeconds == -1) if(m_fMusicLengthSeconds == -1)
{ {