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

revert RageSounds::TakeOverSound stuff; ended up not using it

Browse Source 
and it broke changing BPM during gameplay
SDL_Delay -> usleep
This commit is contained in:
Glenn Maynard
2004-05-21 00:58:48 +00:00
parent 811bf3fd49
commit 98a0b812f0
6 changed files with 30 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSounds.cpp
+2 -24
View File
@@ -263,7 +263,7 @@ int MusicThread_start( void *p )
{
while( !g_Shutdown )
{
SDL_Delay( 10 );
usleep( 10000 );
StartQueuedSounds();
}
@@ -325,7 +325,7 @@ RageSounds::~RageSounds()
delete pMusic;
}
static float GetFrameTimingAdjustment( float fDeltaTime )
float RageSounds::GetFrameTimingAdjustment( float fDeltaTime )
{
/*
* We get one update per frame, and we're updated early, almost immediately after vsync,
@@ -501,28 +501,6 @@ float RageSounds::GetPlayLatency() const
return SOUNDMAN->GetPlayLatency();
}
void RageSounds::TakeOverSound( RageSound *snd, const TimingData *Timing )
{
MusicPlaying *NewMusic = new MusicPlaying( snd );
NewMusic->m_TimingDelayed = false;
NewMusic->m_HasTiming = false;
if( Timing )
{
NewMusic->m_HasTiming = true;
NewMusic->m_Timing = *Timing;
}
LockMut( *g_Mutex );
delete g_Playing;
g_Playing = NewMusic;
Update( 0 );
const float fSeconds = g_Playing->m_Music->GetPositionSeconds();
LOG->Trace("Updated: %f sec, %f beat", fSeconds, GAMESTATE->m_fSongBeat );
}
/*
* Copyright (c) 2003-2004 Glenn Maynard
* All rights reserved.