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

allow providing TimingData for music, instead of reading from a file; this

Browse Source 
saves an unnecessary file read since song data is already in memory
This commit is contained in:
Glenn Maynard
2004-08-02 22:12:54 +00:00
parent b59abf6e9f
commit 9f03ab1e1b
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameSoundManager.cpp
+37 -6
View File
@@ -10,6 +10,7 @@
#include "PrefsManager.h"
#include "RageDisplay.h"
#include "AnnouncerManager.h"
#include "song.h"
GameSoundManager *SOUND = NULL;
@@ -71,9 +72,14 @@ struct MusicToPlay
{
CString file, timing_file;
bool HasTiming;
TimingData timing_data;
bool force_loop;
float start_sec, length_sec, fade_len;
bool align_beat;
MusicToPlay()
{
HasTiming = false;
}
};
CircBuf<MusicToPlay *> g_MusicsToPlay;
@@ -99,14 +105,11 @@ CHECKPOINT;
NewMusic->m_Timing = g_Playing->m_Timing;
CHECKPOINT;
/* See if we can find timing data. */
ToPlay.HasTiming = false;
CHECKPOINT;
if( IsAFile(ToPlay.timing_file) )
/* See if we can find timing data, if it's not already loaded. */
if( !ToPlay.HasTiming && IsAFile(ToPlay.timing_file) )
{
LOG->Trace("Found '%s'", ToPlay.timing_file.c_str());
if( SMLoader::LoadTimingFromFile( ToPlay.timing_file, NewMusic->m_NewTiming ) )
if( SMLoader::LoadTimingFromFile( ToPlay.timing_file, ToPlay.timing_data ) )
ToPlay.HasTiming = true;
}
CHECKPOINT;
@@ -192,6 +195,8 @@ CHECKPOINT;
L.Unlock();
{
NewMusic->m_HasTiming = ToPlay.HasTiming;
if( ToPlay.HasTiming )
NewMusic->m_NewTiming = ToPlay.timing_data;
NewMusic->m_TimingDelayed = true;
NewMusic->m_Music->Load( ToPlay.file, false );
@@ -483,6 +488,32 @@ void GameSoundManager::PlayMusic( const CString &file, const CString &timing_fil
StartQueuedSounds();
}
void GameSoundManager::PlayMusic( const CString &file, TimingData *pTiming, bool force_loop, float start_sec, float length_sec, float fade_len, bool align_beat )
{
MusicToPlay *ToPlay = new MusicToPlay;
ToPlay->file = file;
if( pTiming )
{
ToPlay->HasTiming = true;
ToPlay->timing_data = *pTiming;
}
ToPlay->force_loop = force_loop;
ToPlay->start_sec = start_sec;
ToPlay->length_sec = length_sec;
ToPlay->fade_len = fade_len;
ToPlay->align_beat = align_beat;
/* Add the MusicToPlay to the g_MusicsToPlay queue. */
if( !g_MusicsToPlay.write( &ToPlay, 1 ) )
delete ToPlay;
if( !g_ThreadedMusicStart )
StartQueuedSounds();
}
void GameSoundManager::HandleSongTimer( bool on )
{
LockMut( *g_Mutex );
stepmania/src/GameSoundManager.h
+1
View File
@@ -14,6 +14,7 @@ public:
void PlayMusic( const CString &file, bool force_loop = false, float start_sec = 0, float length_sec = -1, float fade_len = 0, bool align_beat = true ) { PlayMusic( file, "", force_loop, start_sec, length_sec, fade_len, align_beat ); }
void PlayMusic( const CString &file, const CString &timing_file, bool force_loop = false, float start_sec = 0, float length_sec = -1, float fade_len = 0, bool align_beat = true );
void PlayMusic( const CString &file, TimingData *pTiming, bool force_loop = false, float start_sec = 0, float length_sec = -1, float fade_len = 0, bool align_beat = true );
void StopMusic() { PlayMusic(""); }
CString GetMusicPath() const;