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:
authorCampbell Barton <ideasman42@gmail.com>2009-09-03 11:12:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2009-09-03 11:12:41 +0400
commit070f12d0ddd186769b0c0760e5ccd2de08d1e493 (patch)
tree4bc9953bfdaab973244e593a999786e01da975a0 /source/gameengine/GamePlayer
parent99fbcbcf4d97c83e3c2d976244919889278a9366 (diff)
sound init/exit so at least the player opens
Diffstat (limited to 'source/gameengine/GamePlayer')
-rw-r--r--source/gameengine/GamePlayer/common/GPC_Engine.cpp2
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_ghost.cpp5
2 files changed, 6 insertions, 1 deletions
diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.cpp b/source/gameengine/GamePlayer/common/GPC_Engine.cpp
index 9ccb55f37bc..f131987095a 100644
--- a/source/gameengine/GamePlayer/common/GPC_Engine.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_Engine.cpp
@@ -343,8 +343,8 @@ void GPC_Engine::Exit()
{
#if 0 //XXX - ADD SOUND
SND_DeviceManager::Unsubscribe();
- m_audiodevice = 0;
#endif
+ m_audiodevice = 0;
}
m_initialized = false;
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 2433c587179..d399d6b3443 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -59,6 +59,7 @@ extern "C"
#include "BKE_icons.h"
#include "BKE_node.h"
#include "BKE_report.h"
+#include "BKE_sound.h"
#include "BLI_blenlib.h"
#include "DNA_scene_types.h"
#include "BLO_readfile.h"
@@ -358,6 +359,8 @@ int main(int argc, char** argv)
quicktime_init();
#endif
+ sound_init();
+
libtiff_init();
// Parse command line options
@@ -818,6 +821,8 @@ int main(int argc, char** argv)
}
free_nodesystem();
+
+ sound_exit();
return error ? -1 : 0;
}