Remove GetAudio (addendum to 1ed90f2)

See 1ed90f2

The refactor there was not completed

Author: qaisjp

Client/game_sa/CAudioEngineSA.cpp

@@ -430,7 +430,7 @@ __declspec(noinline) bool _cdecl IsAmbientSoundGeneralEnabled(void)
 {
     if (pGame)
     {
-        return pGame->GetAudio()->IsAmbientSoundEnabled(AMBIENT_SOUND_GENERAL);
+        return pGame->GetAudioEngine()->IsAmbientSoundEnabled(AMBIENT_SOUND_GENERAL);
     }
     return false;
 }

Client/game_sa/CGameSA.h

@@ -227,11 +227,6 @@ class CGameSA : public CGame
         return m_pAEAudioHardware;
     };
     CAESoundManager* GetAESoundManager() override { return m_pAESoundManager; }
-    CAudioEngine*    GetAudio()
-    {
-        DEBUG_TRACE("CAudio     * GetAudioEngine()");
-        return m_pAudioEngine;
-    };
     CAudioContainer* GetAudioContainer()
     {
         DEBUG_TRACE("CAudio     * GetAudioContainer()");

Client/mods/deathmatch/ClientCommands.cpp

@@ -982,7 +982,7 @@ float    fTest = 0;
 #include <crtdbg.h>
 void COMMAND_Debug2(const char* szCmdLine)
 {
-    g_pGame->GetAudio()->StopRadio();
+    g_pGame->GetAudioEngine()->StopRadio();
 }
 
 CClientPed*     pTest = NULL;
@@ -998,8 +998,8 @@ void COMMAND_Debug3(const char* szCmdLine)
         call    eax
         popad
     }
-    g_pGame->GetAudio()->StopRadio();
-    g_pGame->GetAudio()->StartRadio(1);
+    g_pGame->GetAudioEngine()->StopRadio();
+    g_pGame->GetAudioEngine()->StartRadio(1);
     return;
 }
 

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -360,8 +360,8 @@ CClientGame::~CClientGame(void)
     // playing these special IDS.
     if (m_bGameLoaded)
     {
-        g_pGame->GetAudio()->PlayFrontEndSound(35);
-        g_pGame->GetAudio()->PlayFrontEndSound(48);
+        g_pGame->GetAudioEngine()->PlayFrontEndSound(35);
+        g_pGame->GetAudioEngine()->PlayFrontEndSound(48);
     }
 
     // Reset the GUI input mode
@@ -442,7 +442,7 @@ CClientGame::~CClientGame(void)
     g_pGame->SetPreWeaponFireHandler(NULL);
     g_pGame->SetPostWeaponFireHandler(NULL);
     g_pGame->SetTaskSimpleBeHitHandler(NULL);
-    g_pGame->GetAudio()->SetWorldSoundHandler(NULL);
+    g_pGame->GetAudioEngine()->SetWorldSoundHandler(NULL);
     g_pCore->SetMessageProcessor(NULL);
     g_pCore->GetKeyBinds()->SetKeyStrokeHandler(NULL);
     g_pCore->GetKeyBinds()->SetCharacterKeyHandler(NULL);
@@ -733,8 +733,8 @@ void CClientGame::DoPulsePreHUDRender(bool bDidUnminimize, bool bDidRecreateRend
         m_bWasMinimized = false;
 
         // Reverse any mute on minimize effects
-        g_pGame->GetAudio()->SetEffectsMasterVolume(g_pGame->GetSettings()->GetSFXVolume());
-        g_pGame->GetAudio()->SetMusicMasterVolume(g_pGame->GetSettings()->GetRadioVolume());
+        g_pGame->GetAudioEngine()->SetEffectsMasterVolume(g_pGame->GetSettings()->GetSFXVolume());
+        g_pGame->GetAudioEngine()->SetMusicMasterVolume(g_pGame->GetSettings()->GetRadioVolume());
         m_pManager->GetSoundManager()->SetMinimizeMuted(false);
     }
 
@@ -3916,10 +3916,10 @@ void CClientGame::IdleHandler(void)
 
             // Apply mute on minimize options
             if (bMuteAll || g_pCore->GetCVars()->GetValue<bool>("mute_radio_when_minimized"))
-                g_pGame->GetAudio()->SetMusicMasterVolume(0);
+                g_pGame->GetAudioEngine()->SetMusicMasterVolume(0);
 
             if (bMuteAll || g_pCore->GetCVars()->GetValue<bool>("mute_sfx_when_minimized"))
-                g_pGame->GetAudio()->SetEffectsMasterVolume(0);
+                g_pGame->GetAudioEngine()->SetEffectsMasterVolume(0);
 
             if (bMuteAll || g_pCore->GetCVars()->GetValue<bool>("mute_mta_when_minimized"))
                 m_pManager->GetSoundManager()->SetMinimizeMuted(true);
@@ -5612,10 +5612,10 @@ void CClientGame::ResetMapInfo(void)
     g_pClientGame->SetBirdsEnabled(true);
 
     // Ambient sounds
-    g_pGame->GetAudio()->ResetAmbientSounds();
+    g_pGame->GetAudioEngine()->ResetAmbientSounds();
 
     // World sounds
-    g_pGame->GetAudio()->ResetWorldSounds();
+    g_pGame->GetAudioEngine()->ResetWorldSounds();
 
     // Cheats
     g_pGame->ResetCheats();
@@ -6454,9 +6454,9 @@ void CClientGame::SetDevelopmentMode(bool bEnable, bool bEnableWeb)
     m_bDevelopmentMode = bEnable;
 
     if (m_bDevelopmentMode)
-        g_pGame->GetAudio()->SetWorldSoundHandler(CClientGame::StaticWorldSoundHandler);
+        g_pGame->GetAudioEngine()->SetWorldSoundHandler(CClientGame::StaticWorldSoundHandler);
     else
-        g_pGame->GetAudio()->SetWorldSoundHandler(NULL);
+        g_pGame->GetAudioEngine()->SetWorldSoundHandler(NULL);
 
     if (g_pCore->IsWebCoreLoaded())
         g_pCore->GetWebCore()->SetTestModeEnabled(bEnableWeb);

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -4264,19 +4264,19 @@ bool CStaticFunctionDefinitions::ResetAmbientSounds(void)
 
 bool CStaticFunctionDefinitions::SetWorldSoundEnabled(uint uiGroup, uint uiIndex, bool bMute, bool bImmediate)
 {
-    g_pGame->GetAudio()->SetWorldSoundEnabled(uiGroup, uiIndex, bMute, bImmediate);
+    g_pGame->GetAudioEngine()->SetWorldSoundEnabled(uiGroup, uiIndex, bMute, bImmediate);
     return true;
 }
 
 bool CStaticFunctionDefinitions::IsWorldSoundEnabled(uint uiGroup, uint uiIndex, bool& bOutMute)
 {
-    bOutMute = g_pGame->GetAudio()->IsWorldSoundEnabled(uiGroup, uiIndex);
+    bOutMute = g_pGame->GetAudioEngine()->IsWorldSoundEnabled(uiGroup, uiIndex);
     return true;
 }
 
 bool CStaticFunctionDefinitions::ResetWorldSounds(void)
 {
-    g_pGame->GetAudio()->ResetWorldSounds();
+    g_pGame->GetAudioEngine()->ResetWorldSounds();
     return true;
 }
 

Client/sdk/game/CGame.h

@@ -142,7 +142,6 @@ class __declspec(novtable) CGame
     virtual CAudioEngine*             GetAudioEngine() = 0;
     virtual CAEAudioHardware*         GetAEAudioHardware() = 0;
     virtual CAESoundManager*          GetAESoundManager() = 0;
-    virtual CAudioEngine*             GetAudio() = 0;
     virtual CAudioContainer*          GetAudioContainer() = 0;
     virtual CMenuManager*             GetMenuManager() = 0;
     virtual CText*                    GetText() = 0;