Merge sound engine initialization stages.

Author: nitrocaster

src/xrEngine/main.cpp

@@ -118,14 +118,9 @@ void destroyInput()
     xr_delete(pInput);
 }
 
-void InitSound1()
+void InitSound()
 {
-    CSound_manager_interface::_create(0);
-}
-
-void InitSound2()
-{
-    CSound_manager_interface::_create(1);
+    CSound_manager_interface::_create();
 }
 
 void destroySound()
@@ -184,9 +179,8 @@ void CheckPrivilegySlowdown()
 
 void Startup()
 {
-    InitSound1();
     execUserScript();
-    InitSound2();
+    InitSound();
     // ...command line for auto start
     const char *startArgs = strstr(Core.Params, "-start ");
     if (startArgs)

src/xrEngine/xrSASH.cpp

@@ -255,8 +255,7 @@ void xrSASH::EndBenchmark()
 void InitInput();
 void destroyInput();
 void InitEngine();
-void InitSound1();
-void InitSound2();
+void InitSound();
 void destroySound();
 void destroyEngine();
 
@@ -488,10 +487,7 @@ void xrSASH::TryInitEngine(bool bNoRun)
     InitInput();
 
     Engine.External.Initialize();
-
-    if (bNoRun)
-        InitSound1();
-
+    
     Console->Execute("unbindall");
     Console->ExecuteScript(Console->ConfigFile);
     if (m_bOpenAutomate)
@@ -503,7 +499,7 @@ void xrSASH::TryInitEngine(bool bNoRun)
 
     if (bNoRun)
     {
-        InitSound2();
+        InitSound();
         Device.Create();
     }
 

src/xrEngine/xr_ioc_cmd.cpp

@@ -469,7 +469,8 @@ class CCC_SND_Restart : public IConsole_Command
     CCC_SND_Restart(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
     virtual void Execute(LPCSTR args)
     {
-        Sound->_restart();
+        if (Sound)
+            Sound->_restart();
     }
 };
 

src/xrSound/Sound.h

@@ -244,7 +244,7 @@ class MODEL;
 /// definition (Sound Manager Interface)
 class XRSOUND_API	CSound_manager_interface
 {
-	virtual void	  				_initialize				(int stage)																			= 0;
+	virtual void	  				_initialize				()																			= 0;
 	virtual void					_clear					( )																						= 0;
 
 protected:
@@ -254,7 +254,7 @@ class XRSOUND_API	CSound_manager_interface
 public:
 	virtual							~CSound_manager_interface(){}
 
-	static void						_create					(int stage);
+	static void						_create					();
 	static void						_destroy				( );
 
 	virtual void					_restart				( )																						= 0;

src/xrSound/SoundRender_Core.cpp

@@ -59,7 +59,7 @@ CSoundRender_Core::~CSoundRender_Core()
 #endif
 }
 
-void CSoundRender_Core::_initialize(int stage)
+void CSoundRender_Core::_initialize()
 {
     Log							("* sound: EAX 2.0 extension:",bEAX?"present":"absent");
     Log							("* sound: EAX 2.0 deferred:",bDeferredEAX?"present":"absent");

src/xrSound/SoundRender_Core.h

@@ -78,7 +78,7 @@ class CSoundRender_Core					: public CSound_manager_interface
 	virtual								~CSoundRender_Core		();
 
 	// General
-	virtual void  						_initialize				(int stage)=0;
+	virtual void  						_initialize				() = 0;
 	virtual void						_clear					( )=0;
 	virtual void						_restart				( );
 

src/xrSound/SoundRender_CoreA.cpp

@@ -47,46 +47,17 @@ BOOL CSoundRender_CoreA::EAXTestSupport	(BOOL bDeferred)
 void  CSoundRender_CoreA::_restart()
 {
 	inherited::_restart();
-/*
-	CSoundRender_Target*	T	= 0;
-	for (u32 tit=0; tit<s_targets.size(); tit++)
-	{
-		T						= s_targets[tit];
-		T->_destroy				();
-	}
-
-	// Reset the current context to NULL.
-    alcMakeContextCurrent		(NULL);         
-    // Release the context and the device.
-    alcDestroyContext			(pContext);		
-	pContext					= NULL;
-    alcCloseDevice				(pDevice);		
-	pDevice						= NULL;
-
-	_initialize					(2);
-
-	for (u32 tit=0; tit<s_targets.size(); tit++)
-	{
-		T						= s_targets[tit];
-		T->_initialize				();
-	}
-*/
 }
 
-void CSoundRender_CoreA::_initialize(int stage)
+void CSoundRender_CoreA::_initialize()
 {
-	if(stage==0)
-	{
-		pDeviceList					= xr_new<ALDeviceList>();
+	pDeviceList					= xr_new<ALDeviceList>();
 
-		if (0==pDeviceList->GetNumDevices())
-		{ 
-			CHECK_OR_EXIT			(0,"OpenAL: Can't create sound device.");
-			xr_delete				(pDeviceList);
-		}
-		return;
+	if (0==pDeviceList->GetNumDevices())
+	{
+		CHECK_OR_EXIT			(0,"OpenAL: Can't create sound device.");
+		xr_delete				(pDeviceList);
 	}
-	
 	pDeviceList->SelectBestDevice	();
 	R_ASSERT						(snd_device_id>=0 && snd_device_id<pDeviceList->GetNumDevices());
 	const ALDeviceDesc& deviceDesc	= pDeviceList->GetDeviceDesc(snd_device_id);
@@ -140,25 +111,22 @@ void CSoundRender_CoreA::_initialize(int stage)
         bEAX 					= EAXTestSupport(FALSE);
     }
 
-    inherited::_initialize		(stage);
+    inherited::_initialize		();
 
-	if(stage==1)//first initialize
+	// Pre-create targets
+	CSoundRender_Target*	T	= 0;
+	for (u32 tit=0; tit<u32(psSoundTargets); tit++)
 	{
-		// Pre-create targets
-		CSoundRender_Target*	T	= 0;
-		for (u32 tit=0; tit<u32(psSoundTargets); tit++)
+		T						=	xr_new<CSoundRender_TargetA>();
+		if (T->_initialize())
+		{
+			s_targets.push_back	(T);
+		}else
 		{
-			T						=	xr_new<CSoundRender_TargetA>();
-			if (T->_initialize())
-			{
-				s_targets.push_back	(T);
-			}else
-			{
-        		Log					("! SOUND: OpenAL: Max targets - ",tit);
-				T->_destroy			();
-        		xr_delete			(T);
-        		break;
-			}
+        	Log					("! SOUND: OpenAL: Max targets - ",tit);
+			T->_destroy			();
+        	xr_delete			(T);
+        	break;
 		}
 	}
 }

src/xrSound/SoundRender_CoreA.h

@@ -40,7 +40,7 @@ class CSoundRender_CoreA: public CSoundRender_Core
 						    CSoundRender_CoreA		();
     virtual					~CSoundRender_CoreA		();
 
-	virtual void			_initialize				(int stage);
+	virtual void			_initialize				();
 	virtual void			_clear					( );
 	virtual void			_restart				( );
 

src/xrSound/sound.cpp

@@ -5,25 +5,15 @@
 
 XRSOUND_API xr_token*		snd_devices_token	= NULL;
 XRSOUND_API u32				snd_device_id		= u32(-1);
-void CSound_manager_interface::_create(int stage)
+void CSound_manager_interface::_create()
 {
-	if(stage==0)
-	{
-		SoundRenderA	= xr_new<CSoundRender_CoreA>();
-		SoundRender		= SoundRenderA;
-		Sound			= SoundRender;
-
-		if (strstr			( Core.Params,"-nosound"))
-		{
-			SoundRender->bPresent = FALSE;
-			return;
-		}else
-			SoundRender->bPresent = TRUE;
-
-	}
-
-	if(!SoundRender->bPresent) return;
-	Sound->_initialize	(stage);
+    SoundRenderA = xr_new<CSoundRender_CoreA>();
+    SoundRender = SoundRenderA;
+    Sound = SoundRender;
+    SoundRender->bPresent = strstr(Core.Params, "-nosound")==nullptr;
+	if (!SoundRender->bPresent)
+        return;
+	Sound->_initialize();
 }
 
 void CSound_manager_interface::_destroy	()