Merge pull request #6 from Audifire/sound

ccw808 · ccw808 · commit efbf598d5d2b · 2015-05-10T22:08:05.000+01:00
Add sound throttling from ID #0008814
diff --git a/MTA10/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/MTA10/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -7282,17 +7282,17 @@ CClientEffect* CStaticFunctionDefinitions::CreateEffect(CResource& Resource, con
 }
 
 
-CClientSound* CStaticFunctionDefinitions::PlaySound ( CResource* pResource, const SString& strSound, bool bIsURL, bool bLoop )
+CClientSound* CStaticFunctionDefinitions::PlaySound ( CResource* pResource, const SString& strSound, bool bIsURL, bool bLoop, bool bThrottle )
 {
-    CClientSound* pSound = m_pSoundManager->PlaySound2D ( strSound, bIsURL, bLoop );
+    CClientSound* pSound = m_pSoundManager->PlaySound2D ( strSound, bIsURL, bLoop, bThrottle );
     if ( pSound ) pSound->SetParent ( pResource->GetResourceDynamicEntity() );
     return pSound;
 }
 
 
-CClientSound* CStaticFunctionDefinitions::PlaySound3D ( CResource* pResource, const SString& strSound, bool bIsURL, const CVector& vecPosition, bool bLoop )
+CClientSound* CStaticFunctionDefinitions::PlaySound3D ( CResource* pResource, const SString& strSound, bool bIsURL, const CVector& vecPosition, bool bLoop, bool bThrottle )
 {
-    CClientSound* pSound = m_pSoundManager->PlaySound3D ( strSound, bIsURL, vecPosition, bLoop );
+    CClientSound* pSound = m_pSoundManager->PlaySound3D ( strSound, bIsURL, vecPosition, bLoop, bThrottle );
     if ( pSound ) pSound->SetParent ( pResource->GetResourceDynamicEntity() );
     return pSound;
 }
diff --git a/MTA10/mods/deathmatch/logic/CStaticFunctionDefinitions.h b/MTA10/mods/deathmatch/logic/CStaticFunctionDefinitions.h
@@ -632,8 +632,8 @@ class CStaticFunctionDefinitions
     static CClientEffect*               CreateEffect                        ( CResource& Resource, const SString& strFxName, const CVector& vecPosition );
 
     // Sound funcs
-    static CClientSound*                PlaySound                           ( CResource* pResource, const SString& strSound, bool bIsURL, bool bLoop );
-    static CClientSound*                PlaySound3D                         ( CResource* pResource, const SString& strSound, bool bIsURL, const CVector& vecPosition, bool bLoop );
+    static CClientSound*                PlaySound                           ( CResource* pResource, const SString& strSound, bool bIsURL, bool bLoop, bool bThrottle );
+    static CClientSound*                PlaySound3D                         ( CResource* pResource, const SString& strSound, bool bIsURL, const CVector& vecPosition, bool bLoop, bool bThrottle );
     static bool                         StopSound                           ( CClientSound& Sound );
     static bool                         SetSoundPosition                    ( CClientSound& Sound, double dPosition );
     static bool                         GetSoundPosition                    ( CClientSound& Sound, double& dPosition );
diff --git a/MTA10/mods/shared_logic/CBassAudio.cpp b/MTA10/mods/shared_logic/CBassAudio.cpp
@@ -68,10 +68,11 @@ namespace
 }
 
 
-CBassAudio::CBassAudio ( bool bStream, const SString& strPath, bool bLoop, bool b3D )
+CBassAudio::CBassAudio ( bool bStream, const SString& strPath, bool bLoop, bool bThrottle, bool b3D )
     : m_bStream ( bStream )
     , m_strPath ( strPath )
     , m_bLoop ( bLoop )
+    , m_bThrottle ( bThrottle )
     , m_b3D ( b3D )
 {
     m_fVolume = 1.0f;
@@ -85,7 +86,7 @@ CBassAudio::CBassAudio ( bool bStream, const SString& strPath, bool bLoop, bool
 }
 
 
-CBassAudio::CBassAudio ( void* pBuffer, unsigned int uiBufferLength, bool bLoop, bool b3D ) : m_bStream ( false ), m_pBuffer ( pBuffer ), m_uiBufferLength ( uiBufferLength ), m_bLoop ( bLoop ), m_b3D ( b3D )
+CBassAudio::CBassAudio ( void* pBuffer, unsigned int uiBufferLength, bool bLoop, bool b3D ) : m_bStream ( false ), m_pBuffer ( pBuffer ), m_uiBufferLength ( uiBufferLength ), m_bLoop ( bLoop ), m_bThrottle( false), m_b3D ( b3D )
 {
     m_fVolume = 1.0f;
     m_fDefaultFrequency = 44100.0f;
@@ -150,6 +151,9 @@ bool CBassAudio::BeginLoadingMedia ( void )
     if ( m_bLoop )
         lFlags |= BASS_SAMPLE_LOOP;
 
+    if ( m_bThrottle )
+        lFlags |= BASS_STREAM_RESTRATE;
+
     if ( m_bStream )
     {
         //
diff --git a/MTA10/mods/shared_logic/CBassAudio.h b/MTA10/mods/shared_logic/CBassAudio.h
@@ -48,7 +48,7 @@ class CBassAudio
 {
 public:
     ZERO_ON_NEW
-                            CBassAudio              ( bool bStream, const SString& strPath, bool bLoop, bool b3D );
+                            CBassAudio              ( bool bStream, const SString& strPath, bool bLoop, bool bThrottle, bool b3D );
                             CBassAudio              ( void* pBuffer, unsigned int uiBufferLength, bool bLoop, bool b3D );
                             ~CBassAudio             ( void );
     void                    Destroy                 ( void );
@@ -107,6 +107,7 @@ class CBassAudio
     const SString           m_strPath;
     const bool              m_b3D;
     const bool              m_bLoop;
+    const bool              m_bThrottle;
     void*                   m_pBuffer;
     unsigned int            m_uiBufferLength;
 
diff --git a/MTA10/mods/shared_logic/CClientSound.cpp b/MTA10/mods/shared_logic/CClientSound.cpp
@@ -113,7 +113,7 @@ bool CClientSound::Create ( void )
 
     // Initial state
     if ( !m_pBuffer )
-        m_pAudio = new CBassAudio ( m_bStream, m_strPath, m_bLoop, m_b3D );
+        m_pAudio = new CBassAudio ( m_bStream, m_strPath, m_bLoop, m_bThrottle, m_b3D );
     else
         m_pAudio = new CBassAudio ( m_pBuffer, m_uiBufferLength, m_bLoop, m_b3D );
         
@@ -286,14 +286,15 @@ bool CClientSound::Play3D ( void* pMemory, unsigned int uiLength, bool bLoop )
 }
 
 
-void CClientSound::PlayStream ( const SString& strURL, bool bLoop, bool b3D )
+void CClientSound::PlayStream ( const SString& strURL, bool bLoop, bool bThrottle, bool b3D )
 {
     assert ( m_strPath.empty () );
 
     m_bStream = true;
     m_b3D = b3D;
     m_strPath = strURL;
     m_bLoop = bLoop;
+    m_bThrottle = bThrottle;
 
     // Instant distance-stream in if not 3D
     if ( !m_b3D )
diff --git a/MTA10/mods/shared_logic/CClientSound.h b/MTA10/mods/shared_logic/CClientSound.h
@@ -38,7 +38,7 @@ class CClientSound : public CClientEntity
     bool                    Play                    ( void* pMemory, unsigned int uiLength, bool bLoop );
     bool                    Play3D                  ( const SString& strPath, bool bLoop );
     bool                    Play3D                  ( void* pMemory, unsigned int uiLength, bool bLoop );
-    void                    PlayStream              ( const SString& strURL, bool bLoop, bool b3D = false );
+    void                    PlayStream              ( const SString& strURL, bool bLoop, bool bThrottle, bool b3D = false );
 
     void                    SetPaused               ( bool bPaused  );
     bool                    IsPaused                ( void );
@@ -111,6 +111,7 @@ class CClientSound : public CClientEntity
     bool        m_b3D;
     SString     m_strPath;
     bool        m_bLoop;
+    bool        m_bThrottle;
     void*       m_pBuffer;
     unsigned int m_uiBufferLength;
 
diff --git a/MTA10/mods/shared_logic/CClientSoundManager.cpp b/MTA10/mods/shared_logic/CClientSoundManager.cpp
@@ -127,12 +127,12 @@ void CClientSoundManager::SetDimension ( unsigned short usDimension )
     m_usDimension = usDimension;
 }
 
-CClientSound* CClientSoundManager::PlaySound2D ( const SString& strSound, bool bIsURL, bool bLoop )
+CClientSound* CClientSoundManager::PlaySound2D ( const SString& strSound, bool bIsURL, bool bLoop, bool bThrottle )
 {
     CClientSound* pSound = new CClientSound ( m_pClientManager, INVALID_ELEMENT_ID );
     if ( bIsURL )
     {
-        pSound->PlayStream ( strSound, bLoop );
+        pSound->PlayStream ( strSound, bLoop, bThrottle );
         return pSound;
     }
     else
@@ -154,13 +154,13 @@ CClientSound* CClientSoundManager::PlaySound2D ( void* pMemory, unsigned int uiL
     return NULL;
 }
 
-CClientSound* CClientSoundManager::PlaySound3D ( const SString& strSound, bool bIsURL, const CVector& vecPosition, bool bLoop )
+CClientSound* CClientSoundManager::PlaySound3D ( const SString& strSound, bool bIsURL, const CVector& vecPosition, bool bLoop, bool bThrottle )
 {
     CClientSound* pSound = new CClientSound ( m_pClientManager, INVALID_ELEMENT_ID );
 
     if ( bIsURL )
     {
-        pSound->PlayStream ( strSound, bLoop, true );
+        pSound->PlayStream ( strSound, bLoop, bThrottle, true );
         pSound->SetPosition ( vecPosition );
         return pSound;
     }
diff --git a/MTA10/mods/shared_logic/CClientSoundManager.h b/MTA10/mods/shared_logic/CClientSoundManager.h
@@ -31,9 +31,9 @@ class CClientSoundManager
 
     void                    SetDimension                ( unsigned short usDimension );
 
-    CClientSound*           PlaySound2D                 ( const SString& strSound, bool bIsURL, bool bLoop );
+    CClientSound*           PlaySound2D                 ( const SString& strSound, bool bIsURL, bool bLoop, bool bThrottle );
     CClientSound*           PlaySound2D                 ( void* pMemory, unsigned int uiLength, bool bLoop );
-    CClientSound*           PlaySound3D                 ( const SString& strSound, bool bIsURL, const CVector& vecPosition, bool bLoop );
+    CClientSound*           PlaySound3D                 ( const SString& strSound, bool bIsURL, const CVector& vecPosition, bool bLoop, bool bThrottle );
     CClientSound*           PlaySound3D                 ( void* pMemory, unsigned int uiLength, const CVector& vecPosition, bool bLoop );
 
     CClientSound*           PlayGTASFX                  ( eAudioLookupIndex containerIndex, int iBankIndex, int iAudioIndex, bool bLoop = false );
diff --git a/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Audio.cpp b/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Audio.cpp
@@ -23,9 +23,11 @@ int CLuaFunctionDefs::PlaySound ( lua_State* luaVM )
 {
     SString strSound = "";
     bool bLoop = false;
+    bool bThrottle = true;
     CScriptArgReader argStream ( luaVM );
     argStream.ReadString ( strSound );
     argStream.ReadBool ( bLoop, false );
+    argStream.ReadBool ( bThrottle, true );
 
     if ( !argStream.HasErrors() )
     {
@@ -46,7 +48,7 @@ int CLuaFunctionDefs::PlaySound ( lua_State* luaVM )
                 // Fixes #6507 - Caz
                 if ( pResource )
                 {
-                    CClientSound* pSound = CStaticFunctionDefinitions::PlaySound ( pResource, strSound, bIsURL, bLoop );
+                    CClientSound* pSound = CStaticFunctionDefinitions::PlaySound ( pResource, strSound, bIsURL, bLoop, bThrottle );
                     if ( pSound )
                     {
                         // call onClientSoundStarted
@@ -74,10 +76,12 @@ int CLuaFunctionDefs::PlaySound3D ( lua_State* luaVM )
     SString strSound = "";
     CVector vecPosition;
     bool bLoop = false;
+    bool bThrottle = false;
     CScriptArgReader argStream ( luaVM );
     argStream.ReadString ( strSound );
     argStream.ReadVector3D ( vecPosition );
     argStream.ReadBool ( bLoop, false );
+    argStream.ReadBool ( bThrottle, true );
 
     if ( !argStream.HasErrors() )
     {
@@ -98,7 +102,7 @@ int CLuaFunctionDefs::PlaySound3D ( lua_State* luaVM )
                 // Fixes #6507 - Caz
                 if ( pResource )
                 {
-                    CClientSound* pSound = CStaticFunctionDefinitions::PlaySound3D ( pResource, strSound, bIsURL, vecPosition, bLoop );
+                    CClientSound* pSound = CStaticFunctionDefinitions::PlaySound3D ( pResource, strSound, bIsURL, vecPosition, bLoop, bThrottle );
                     if ( pSound )
                     {
                         // call onClientSoundStarted

Original file line number	Diff line number	Diff line change
`@@ -7282,17 +7282,17 @@ CClientEffect* CStaticFunctionDefinitions::CreateEffect(CResource& Resource, con`
`7282`	`7282`	`}`
`7283`	`7283`
`7284`	`7284`
`7285`		`-CClientSound* CStaticFunctionDefinitions::PlaySound ( CResource* pResource, const SString& strSound, bool bIsURL, bool bLoop )`
	`7285`	`+CClientSound* CStaticFunctionDefinitions::PlaySound ( CResource* pResource, const SString& strSound, bool bIsURL, bool bLoop, bool bThrottle )`
`7286`	`7286`	`{`
`7287`		`- CClientSound* pSound = m_pSoundManager->PlaySound2D ( strSound, bIsURL, bLoop );`
	`7287`	`+ CClientSound* pSound = m_pSoundManager->PlaySound2D ( strSound, bIsURL, bLoop, bThrottle );`
`7288`	`7288`	`if ( pSound ) pSound->SetParent ( pResource->GetResourceDynamicEntity() );`
`7289`	`7289`	`return pSound;`
`7290`	`7290`	`}`
`7291`	`7291`
`7292`	`7292`
`7293`		`-CClientSound* CStaticFunctionDefinitions::PlaySound3D ( CResource* pResource, const SString& strSound, bool bIsURL, const CVector& vecPosition, bool bLoop )`
	`7293`	`+CClientSound* CStaticFunctionDefinitions::PlaySound3D ( CResource* pResource, const SString& strSound, bool bIsURL, const CVector& vecPosition, bool bLoop, bool bThrottle )`
`7294`	`7294`	`{`
`7295`		`- CClientSound* pSound = m_pSoundManager->PlaySound3D ( strSound, bIsURL, vecPosition, bLoop );`
	`7295`	`+ CClientSound* pSound = m_pSoundManager->PlaySound3D ( strSound, bIsURL, vecPosition, bLoop, bThrottle );`
`7296`	`7296`	`if ( pSound ) pSound->SetParent ( pResource->GetResourceDynamicEntity() );`
`7297`	`7297`	`return pSound;`
`7298`	`7298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,11 @@ namespace`
`68`	`68`	`}`
`69`	`69`
`70`	`70`
`71`		`-CBassAudio::CBassAudio ( bool bStream, const SString& strPath, bool bLoop, bool b3D )`
	`71`	`+CBassAudio::CBassAudio ( bool bStream, const SString& strPath, bool bLoop, bool bThrottle, bool b3D )`
`72`	`72`	`: m_bStream ( bStream )`
`73`	`73`	`, m_strPath ( strPath )`
`74`	`74`	`, m_bLoop ( bLoop )`
	`75`	`+ , m_bThrottle ( bThrottle )`
`75`	`76`	`, m_b3D ( b3D )`
`76`	`77`	`{`
`77`	`78`	`m_fVolume = 1.0f;`
`@@ -85,7 +86,7 @@ CBassAudio::CBassAudio ( bool bStream, const SString& strPath, bool bLoop, bool`
`85`	`86`	`}`
`86`	`87`
`87`	`88`
`88`		`-CBassAudio::CBassAudio ( void* pBuffer, unsigned int uiBufferLength, bool bLoop, bool b3D ) : m_bStream ( false ), m_pBuffer ( pBuffer ), m_uiBufferLength ( uiBufferLength ), m_bLoop ( bLoop ), m_b3D ( b3D )`
	`89`	`+CBassAudio::CBassAudio ( void* pBuffer, unsigned int uiBufferLength, bool bLoop, bool b3D ) : m_bStream ( false ), m_pBuffer ( pBuffer ), m_uiBufferLength ( uiBufferLength ), m_bLoop ( bLoop ), m_bThrottle( false), m_b3D ( b3D )`
`89`	`90`	`{`
`90`	`91`	`m_fVolume = 1.0f;`
`91`	`92`	`m_fDefaultFrequency = 44100.0f;`
`@@ -150,6 +151,9 @@ bool CBassAudio::BeginLoadingMedia ( void )`
`150`	`151`	`if ( m_bLoop )`
`151`	`152`	`lFlags \|= BASS_SAMPLE_LOOP;`
`152`	`153`
	`154`	`+ if ( m_bThrottle )`
	`155`	`+ lFlags \|= BASS_STREAM_RESTRATE;`
	`156`	`+`
`153`	`157`	`if ( m_bStream )`
`154`	`158`	`{`
`155`	`159`	`//`
Original file line number	Diff line number	Diff line change
`@@ -127,12 +127,12 @@ void CClientSoundManager::SetDimension ( unsigned short usDimension )`
`127`	`127`	`m_usDimension = usDimension;`
`128`	`128`	`}`
`129`	`129`
`130`		`-CClientSound* CClientSoundManager::PlaySound2D ( const SString& strSound, bool bIsURL, bool bLoop )`
	`130`	`+CClientSound* CClientSoundManager::PlaySound2D ( const SString& strSound, bool bIsURL, bool bLoop, bool bThrottle )`
`131`	`131`	`{`
`132`	`132`	`CClientSound* pSound = new CClientSound ( m_pClientManager, INVALID_ELEMENT_ID );`
`133`	`133`	`if ( bIsURL )`
`134`	`134`	`{`
`135`		`- pSound->PlayStream ( strSound, bLoop );`
	`135`	`+ pSound->PlayStream ( strSound, bLoop, bThrottle );`
`136`	`136`	`return pSound;`
`137`	`137`	`}`
`138`	`138`	`else`
`@@ -154,13 +154,13 @@ CClientSound* CClientSoundManager::PlaySound2D ( void* pMemory, unsigned int uiL`
`154`	`154`	`return NULL;`
`155`	`155`	`}`
`156`	`156`
`157`		`-CClientSound* CClientSoundManager::PlaySound3D ( const SString& strSound, bool bIsURL, const CVector& vecPosition, bool bLoop )`
	`157`	`+CClientSound* CClientSoundManager::PlaySound3D ( const SString& strSound, bool bIsURL, const CVector& vecPosition, bool bLoop, bool bThrottle )`
`158`	`158`	`{`
`159`	`159`	`CClientSound* pSound = new CClientSound ( m_pClientManager, INVALID_ELEMENT_ID );`
`160`	`160`
`161`	`161`	`if ( bIsURL )`
`162`	`162`	`{`
`163`		`- pSound->PlayStream ( strSound, bLoop, true );`
	`163`	`+ pSound->PlayStream ( strSound, bLoop, bThrottle, true );`
`164`	`164`	`pSound->SetPosition ( vecPosition );`
`165`	`165`	`return pSound;`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,11 @@ int CLuaFunctionDefs::PlaySound ( lua_State* luaVM )`
`23`	`23`	`{`
`24`	`24`	`SString strSound = "";`
`25`	`25`	`bool bLoop = false;`
	`26`	`+ bool bThrottle = true;`
`26`	`27`	`CScriptArgReader argStream ( luaVM );`
`27`	`28`	`argStream.ReadString ( strSound );`
`28`	`29`	`argStream.ReadBool ( bLoop, false );`
	`30`	`+ argStream.ReadBool ( bThrottle, true );`
`29`	`31`
`30`	`32`	`if ( !argStream.HasErrors() )`
`31`	`33`	`{`
`@@ -46,7 +48,7 @@ int CLuaFunctionDefs::PlaySound ( lua_State* luaVM )`
`46`	`48`	`// Fixes #6507 - Caz`
`47`	`49`	`if ( pResource )`
`48`	`50`	`{`
`49`		`- CClientSound* pSound = CStaticFunctionDefinitions::PlaySound ( pResource, strSound, bIsURL, bLoop );`
	`51`	`+ CClientSound* pSound = CStaticFunctionDefinitions::PlaySound ( pResource, strSound, bIsURL, bLoop, bThrottle );`
`50`	`52`	`if ( pSound )`
`51`	`53`	`{`
`52`	`54`	`// call onClientSoundStarted`
`@@ -74,10 +76,12 @@ int CLuaFunctionDefs::PlaySound3D ( lua_State* luaVM )`
`74`	`76`	`SString strSound = "";`
`75`	`77`	`CVector vecPosition;`
`76`	`78`	`bool bLoop = false;`
	`79`	`+ bool bThrottle = false;`
`77`	`80`	`CScriptArgReader argStream ( luaVM );`
`78`	`81`	`argStream.ReadString ( strSound );`
`79`	`82`	`argStream.ReadVector3D ( vecPosition );`
`80`	`83`	`argStream.ReadBool ( bLoop, false );`
	`84`	`+ argStream.ReadBool ( bThrottle, true );`
`81`	`85`
`82`	`86`	`if ( !argStream.HasErrors() )`
`83`	`87`	`{`
`@@ -98,7 +102,7 @@ int CLuaFunctionDefs::PlaySound3D ( lua_State* luaVM )`
`98`	`102`	`// Fixes #6507 - Caz`
`99`	`103`	`if ( pResource )`
`100`	`104`	`{`
`101`		`- CClientSound* pSound = CStaticFunctionDefinitions::PlaySound3D ( pResource, strSound, bIsURL, vecPosition, bLoop );`
	`105`	`+ CClientSound* pSound = CStaticFunctionDefinitions::PlaySound3D ( pResource, strSound, bIsURL, vecPosition, bLoop, bThrottle );`
`102`	`106`	`if ( pSound )`
`103`	`107`	`{`
`104`	`108`	`// call onClientSoundStarted`