[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32522] trunk/blender/source: Now sound init param removal revert should be fine ( apparently my cmake project files missed rebuild hint for these, fortunately SCons did its job well).

[Nathan Letwory]

Revision: 32522
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32522
Author:   jesterking
Date:     2010-10-16 17:00:04 +0200 (Sat, 16 Oct 2010)

Log Message:
-----------
Now sound init param removal revert should be fine (apparently my cmake project files missed rebuild hint for these, fortunately SCons did its job well).

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_files.c
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-10-16 14:53:54 UTC (rev 32521)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-10-16 15:00:04 UTC (rev 32522)
@@ -254,7 +254,7 @@
 
 	UI_init_userdef();
 	MEM_CacheLimiter_set_maximum(U.memcachelimit * 1024 * 1024);
-	sound_init();
+	sound_init(CTX_data_main(C));
 
 	/* set the python auto-execute setting from user prefs */
 	/* disabled by default, unless explicitly enabled in the command line */

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2010-10-16 14:53:54 UTC (rev 32521)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2010-10-16 15:00:04 UTC (rev 32522)
@@ -583,7 +583,7 @@
 		if (!m_networkdevice)
 			goto initFailed;
 			
-		sound_init();
+		sound_init(m_maggie);
 
 		// create a ketsjisystem (only needed for timing and stuff)
 		m_kxsystem = new GPG_System (m_system);