Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Mueller <nexyon@gmail.com>2009-09-05 00:03:27 +0400
committerJoerg Mueller <nexyon@gmail.com>2009-09-05 00:03:27 +0400
commit944d0e908728d07a5a8da809baf448592ba9e701 (patch)
tree719d6adf8cd67891395fd681a5058e3fcdd3349f /source/gameengine/GamePlayer/common/GPC_Engine.cpp
parent9303254e4f137c2810c5bc99ef1783fab249bc16 (diff)
Fixed sound stuff for gameplayer, no sound though as U.audiodevice is set to 0 (="No Audio").
Diffstat (limited to 'source/gameengine/GamePlayer/common/GPC_Engine.cpp')
-rw-r--r--source/gameengine/GamePlayer/common/GPC_Engine.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.cpp b/source/gameengine/GamePlayer/common/GPC_Engine.cpp
index f131987095a..85a362d042a 100644
--- a/source/gameengine/GamePlayer/common/GPC_Engine.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_Engine.cpp
@@ -58,9 +58,6 @@
#include "NG_LoopBackNetworkDeviceInterface.h"
#include "RAS_IRenderTools.h"
-#if 0 //XXX - ADD SOUND
- #include "SND_DeviceManager.h"
-#endif
#include "GPC_Engine.h"
#include "GPC_KeyboardDevice.h"
@@ -77,8 +74,7 @@ GPC_Engine::GPC_Engine(char *customLoadingAnimationURL,
m_system(NULL), m_keyboarddev(NULL),
m_mousedev(NULL), m_canvas(NULL), m_rendertools(NULL),
m_portal(NULL), m_sceneconverter(NULL), m_networkdev(NULL),
- m_audiodevice(NULL), m_curarea(NULL),
- m_customLoadingAnimationURL(NULL),
+ m_curarea(NULL), m_customLoadingAnimationURL(NULL),
m_foregroundColor(foregroundColor), m_backgroundColor(backgroundColor),
m_frameRate(frameRate),
m_BlenderLogo(0), m_Blender3DLogo(0)/*, m_NaNLogo(0)*/
@@ -203,7 +199,6 @@ bool GPC_Engine::StartKetsji(void)
m_keyboarddev,
m_mousedev,
m_networkdev,
- m_audiodevice,
m_system);
m_system->SetMainLoop(m_portal->m_ketsjieng);
@@ -339,14 +334,6 @@ void GPC_Engine::Exit()
m_networkdev = 0;
}
- if (m_audiodevice)
- {
-#if 0 //XXX - ADD SOUND
- SND_DeviceManager::Unsubscribe();
-#endif
- m_audiodevice = 0;
- }
-
m_initialized = false;
}