cleaning up stuff in here
This commit is contained in:
+4
-44
@@ -7,10 +7,10 @@
|
||||
#include "RageLog.h"
|
||||
#include "arch/ArchHooks/ArchHooks.h"
|
||||
|
||||
/* This screen used to wait for sounds to stop. However, implementing GetPlayingSounds()
|
||||
* is annoying, because sounds might be deleted at any time; they aren't ours to have
|
||||
* references to. Also, it's better to quit on command instead of waiting several seconds
|
||||
* for a sound to stop. */
|
||||
/* This screen used to wait for sounds to stop. However, implementing
|
||||
* GetPlayingSounds() is annoying, because sounds might be deleted at any time;
|
||||
* they aren't ours to have references to. Also, it's better to quit on command
|
||||
* instead of waiting several seconds for a sound to stop. */
|
||||
REGISTER_SCREEN_CLASS( ScreenExit );
|
||||
|
||||
void ScreenExit::Init()
|
||||
@@ -20,46 +20,6 @@ void ScreenExit::Init()
|
||||
m_Exited = false;
|
||||
|
||||
ArchHooks::SetUserQuit();
|
||||
|
||||
/* It'd be better for any previous screen playing music to fade it out as it fades
|
||||
* out the screen. XXX: Check to see if it's fading out; if it'll stop playing in
|
||||
* reasonable time, let it. */
|
||||
// SOUND->StopMusic();
|
||||
}
|
||||
|
||||
void ScreenExit::Update( float fDelta )
|
||||
{
|
||||
#if 0
|
||||
if( m_Exited )
|
||||
return;
|
||||
|
||||
// Grab the list of playing sounds, and see if it's empty.
|
||||
const set<RageSound *> &PlayingSounds = SOUNDMAN->GetPlayingSounds();
|
||||
bool DoQuit = PlayingSounds.empty();
|
||||
|
||||
/* As a safety precaution, don't wait indefinitely, in case some sound was
|
||||
* inadvertently set to play too long. */
|
||||
if( !DoQuit && m_ShutdownTimer.PeekDeltaTime() > 3 )
|
||||
{
|
||||
DoQuit = true;
|
||||
RString warn = ssprintf("ScreenExit: %i sound%s failed to finish playing quickly: ",
|
||||
(int) PlayingSounds.size(), (PlayingSounds.size()==1?"":"s") );
|
||||
for( set<RageSound *>::const_iterator i = PlayingSounds.begin();
|
||||
i != PlayingSounds.end(); ++i )
|
||||
{
|
||||
warn += (*i)->GetLoadedFilePath() + "; ";
|
||||
}
|
||||
|
||||
LOG->Warn("%s", warn.c_str() );
|
||||
}
|
||||
|
||||
if( DoQuit )
|
||||
{
|
||||
m_Exited = true;
|
||||
LOG->Trace("ScreenExit: shutting down");
|
||||
ArchHooks::SetUserQuit();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user