enable the sound code (it still isn't used for anything)
This commit is contained in:
@@ -22,7 +22,7 @@
|
|||||||
#include "RageDisplay.h"
|
#include "RageDisplay.h"
|
||||||
#include "RageTextureManager.h"
|
#include "RageTextureManager.h"
|
||||||
#include "RageSoundBass.h"
|
#include "RageSoundBass.h"
|
||||||
// #include "RageSoundManager.h"
|
#include "RageSoundManager.h"
|
||||||
#include "RageMusic.h"
|
#include "RageMusic.h"
|
||||||
#include "RageInput.h"
|
#include "RageInput.h"
|
||||||
#include "RageTimer.h"
|
#include "RageTimer.h"
|
||||||
@@ -314,6 +314,7 @@ int main(int argc, char* argv[])
|
|||||||
GAMEMAN = new GameManager;
|
GAMEMAN = new GameManager;
|
||||||
THEME = new ThemeManager;
|
THEME = new ThemeManager;
|
||||||
SOUND = new RageSoundBass;
|
SOUND = new RageSoundBass;
|
||||||
|
SOUNDMAN = new RageSoundManager(PREFSMAN->m_bSoundDrivers);
|
||||||
MUSIC = new RageSoundStream;
|
MUSIC = new RageSoundStream;
|
||||||
ANNOUNCER = new AnnouncerManager;
|
ANNOUNCER = new AnnouncerManager;
|
||||||
INPUTFILTER = new InputFilter;
|
INPUTFILTER = new InputFilter;
|
||||||
@@ -348,7 +349,6 @@ int main(int argc, char* argv[])
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
INPUTMAN = new RageInput();
|
INPUTMAN = new RageInput();
|
||||||
// SOUNDMAN = new RageSoundManager();
|
|
||||||
|
|
||||||
// These things depend on the TextureManager, so do them after!
|
// These things depend on the TextureManager, so do them after!
|
||||||
FONT = new FontManager;
|
FONT = new FontManager;
|
||||||
@@ -412,7 +412,7 @@ int main(int argc, char* argv[])
|
|||||||
SAFE_DELETE( INPUTMAN );
|
SAFE_DELETE( INPUTMAN );
|
||||||
SAFE_DELETE( MUSIC );
|
SAFE_DELETE( MUSIC );
|
||||||
SAFE_DELETE( SOUND );
|
SAFE_DELETE( SOUND );
|
||||||
// SAFE_DELETE( SOUNDMAN );
|
SAFE_DELETE( SOUNDMAN );
|
||||||
SAFE_DELETE( TIMER );
|
SAFE_DELETE( TIMER );
|
||||||
SAFE_DELETE( FONT );
|
SAFE_DELETE( FONT );
|
||||||
SAFE_DELETE( TEXTUREMAN );
|
SAFE_DELETE( TEXTUREMAN );
|
||||||
@@ -478,7 +478,7 @@ void GameLoop()
|
|||||||
MUSIC->Update( fDeltaTime );
|
MUSIC->Update( fDeltaTime );
|
||||||
SCREENMAN->Update( fDeltaTime );
|
SCREENMAN->Update( fDeltaTime );
|
||||||
CLIENT->Update( fDeltaTime );
|
CLIENT->Update( fDeltaTime );
|
||||||
// SOUNDMAN->Update( fDeltaTime );
|
SOUNDMAN->Update( fDeltaTime );
|
||||||
|
|
||||||
static InputEventArray ieArray;
|
static InputEventArray ieArray;
|
||||||
ieArray.clear(); // empty the array
|
ieArray.clear(); // empty the array
|
||||||
@@ -573,8 +573,7 @@ void GameLoop()
|
|||||||
DISPLAY->FlushQueue();
|
DISPLAY->FlushQueue();
|
||||||
DISPLAY->Flip();
|
DISPLAY->Flip();
|
||||||
|
|
||||||
if( DISPLAY && DISPLAY->IsWindowed() )
|
::Sleep( 0 ); // give some time to other processes and threads
|
||||||
::Sleep( 0 ); // give some time to other processes
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user