Fixed #8803 (Remove BASS Error message for players) Patch from ruun

Author: ccw808

MTA10/mods/deathmatch/logic/CClientGame.cpp

@@ -2861,13 +2861,13 @@ void CClientGame::AddBuiltInEvents ( void )
     m_Events.AddEvent ( "onClientExplosion", "x, y, z, type", NULL, false );
 
     // Projectile events
-    m_Events.AddEvent ( "onClientProjectileCreation", "creator", NULL, false );
-
-    // Sound events
-    m_Events.AddEvent ( "onClientSoundStream", "success, length, streamName", NULL, false );
-    m_Events.AddEvent ( "onClientSoundFinishedDownload", "length", NULL, false );
-    m_Events.AddEvent ( "onClientSoundChangedMeta", "streamTitle", NULL, false );
-    m_Events.AddEvent ( "onClientSoundStarted", "reason", NULL, false );
+    m_Events.AddEvent ( "onClientProjectileCreation", "creator", NULL, false );
+
+    // Sound events
+    m_Events.AddEvent ( "onClientSoundStream", "success, length, streamName, error", NULL, false );
+    m_Events.AddEvent ( "onClientSoundFinishedDownload", "length", NULL, false );
+    m_Events.AddEvent ( "onClientSoundChangedMeta", "streamTitle", NULL, false );
+    m_Events.AddEvent ( "onClientSoundStarted", "reason", NULL, false );
     m_Events.AddEvent ( "onClientSoundStopped", "reason", NULL, false );
     m_Events.AddEvent ( "onClientSoundBeat", "time", NULL, false );
 

MTA10/mods/shared_logic/CBassAudio.cpp

@@ -380,7 +380,8 @@ void CBassAudio::PlayStreamIntern ( void* arguments )
 //
 void CBassAudio::CompleteStreamConnect ( HSTREAM pSound )
 {
-    if ( pSound )
+    SString strError;
+    if (pSound)
     {
         m_pSound = pSound;
 
@@ -395,11 +396,11 @@ void CBassAudio::CompleteStreamConnect ( HSTREAM pSound )
 
         if ( BASS_FX_BPM_CallbackSet ( pSound, (BPMPROC*)&BPMCallback, 1, 0, 0, m_uiCallbackId ) == false )
         {
-            g_pCore->GetConsole()->Print ( "BASS ERROR in BASS_FX_BPM_CallbackSet" );
+            strError = "BASS ERROR in BASS_FX_BPM_CallbackSet";
         }
         if ( BASS_FX_BPM_BeatCallbackSet ( pSound, (BPMBEATPROC*)&BeatCallback, m_uiCallbackId ) == false )
         {
-            g_pCore->GetConsole()->Print ( "BASS ERROR in BASS_FX_BPM_BeatCallbackSet" );
+            strError = "BASS ERROR in BASS_FX_BPM_BeatCallbackSet";
         }
         // get the broadcast name
         const char* szIcy;
@@ -439,11 +440,11 @@ void CBassAudio::CompleteStreamConnect ( HSTREAM pSound )
         //g_pCore->GetConsole()->Printf ( "BASS ERROR %d in BASS_SYNC_WMA_CHANGE", BASS_ErrorGetCode() );
     }
     else
-        g_pCore->GetConsole()->Printf ( "BASS ERROR %d in PlayStream  b3D = %s  path = %s", BASS_ErrorGetCode(), m_b3D ? "true" : "false", m_strPath.c_str() );
+        strError = SString( "BASS ERROR %d in PlayStream  b3D = %s  path = %s", BASS_ErrorGetCode(), m_b3D ? "true" : "false", m_strPath.c_str() );
 
     OutputDebugLine ( "[Bass]        stream connect complete" );
 
-    AddQueuedEvent ( SOUND_EVENT_STREAM_RESULT, m_strStreamName, GetLength (), pSound ? true : false );
+    AddQueuedEvent ( SOUND_EVENT_STREAM_RESULT, m_strStreamName, GetLength (), pSound ? true : false, strError );
 }
 
 
@@ -1025,13 +1026,14 @@ void CBassAudio::ParseShoutcastMeta ( const SString& strMeta )
 //
 // Add queued event from
 //
-void CBassAudio::AddQueuedEvent ( eSoundEventType type, const SString& strString, double dNumber, bool bBool )
+void CBassAudio::AddQueuedEvent ( eSoundEventType type, const SString& strString, double dNumber, bool bBool, const SString& strError )
 {
     SSoundEventInfo info;
     info.type = type;
     info.strString = strString;
     info.dNumber = dNumber;
     info.bBool = bBool;
+    info.strError = strError;
     m_EventQueue.push_back ( info );
 }
 

MTA10/mods/shared_logic/CBassAudio.h

@@ -26,6 +26,7 @@ struct SSoundEventInfo
     SString         strString;
     double          dNumber;
     bool            bBool;
+    SString         strError;
 };
 
 struct SSoundThreadVariables
@@ -77,7 +78,7 @@ class CBassAudio
     void                    SetPan                  ( float fPan );
 
     void                    DoPulse                 ( const CVector& vecPlayerPosition, const CVector& vecCameraPosition, const CVector& vecLookAt );
-    void                    AddQueuedEvent          ( eSoundEventType type, const SString& strString, double dNumber = 0.0, bool bBool = false );
+    void                    AddQueuedEvent          ( eSoundEventType type, const SString& strString, double dNumber = 0.0, bool bBool = false, const SString& strError = "" );
     bool                    GetQueuedEvent          ( SSoundEventInfo& info );
     void                    ParseShoutcastMeta      ( const SString& strMeta );
     float*                  GetFFTData              ( int iLength );

MTA10/mods/shared_logic/CClientSound.cpp

@@ -682,10 +682,10 @@ void CClientSound::Process3D ( const CVector& vecPlayerPosition, const CVector&
             CLuaArguments Arguments;
             Arguments.PushBoolean ( eventInfo.bBool );
             Arguments.PushNumber ( eventInfo.dNumber );
-            if ( !eventInfo.strString.empty () )
-                Arguments.PushString ( eventInfo.strString );
+            Arguments.PushString( eventInfo.strString );
+            Arguments.PushString( eventInfo.strError );
             CallEvent ( "onClientSoundStream", Arguments, true );
-            OutputDebugLine ( SString ( "[ClientSound] onClientSoundStream %d %f %s", eventInfo.bBool, eventInfo.dNumber, *eventInfo.strString ) );
+            OutputDebugLine ( SString ( "[ClientSound] onClientSoundStream %d %f %s %s", eventInfo.bBool, eventInfo.dNumber, *eventInfo.strString, *eventInfo.strError ) );
         }
         else
         if ( eventInfo.type == SOUND_EVENT_BEAT )