YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

engine: client: voice: fixed hanging voice status

Browse Source
This commit is contained in:
SNMetamorph 2022-08-18 13:17:35 +04:00 committed by Alibek Omarov
parent 2f5f5ef0a6
commit 74707551ae
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/client/cl_main.c
View File

@ -1503,6 +1503,7 @@ void CL_Disconnect( void )
cls.connect_time = 0; cls.connect_time = 0;
cls.changedemo = false; cls.changedemo = false;
cls.max_fragment_size = FRAGMENT_MAX_SIZE; // reset fragment size cls.max_fragment_size = FRAGMENT_MAX_SIZE; // reset fragment size
Voice_Disconnect();
CL_Stop_f(); CL_Stop_f();
// send a disconnect message to the server // send a disconnect message to the server
@ -1514,7 +1515,6 @@ void CL_Disconnect( void )
// clear the network channel, too. // clear the network channel, too.
Netchan_Clear( &cls.netchan ); Netchan_Clear( &cls.netchan );
Voice_RecordStop();
IN_LockInputDevices( false ); // unlock input devices IN_LockInputDevices( false ); // unlock input devices

11
engine/client/voice.c
View File

@ -323,6 +323,16 @@ void Voice_RecordStart( void )
Voice_Status( -1, true ); Voice_Status( -1, true );
} }
void Voice_Disconnect( void )
{
int i;
Voice_RecordStop();
for( i = 0; i <= 32; i++ ) {
Voice_Status( i, false );
}
}
void Voice_AddIncomingData( int ent, const byte *data, uint size, uint frames ) void Voice_AddIncomingData( int ent, const byte *data, uint size, uint frames )
{ {
int samples = opus_decode( voice.decoder, data, size, (short *)voice.decompress_buffer, voice.frame_size / voice.width * frames, false ); int samples = opus_decode( voice.decoder, data, size, (short *)voice.decompress_buffer, voice.frame_size / voice.width * frames, false );
@ -380,6 +390,5 @@ void Voice_PlayerTalkingAck(int playerIndex)
void Voice_StartChannel( uint samples, byte *data, int entnum ) void Voice_StartChannel( uint samples, byte *data, int entnum )
{ {
SND_ForceInitMouth( entnum ); SND_ForceInitMouth( entnum );
Voice_Status( entnum, true );
S_RawEntSamples( entnum, samples, voice.samplerate, voice.width, voice.channels, data, 255 ); S_RawEntSamples( entnum, samples, voice.samplerate, voice.width, voice.channels, data, 255 );
} }

1
engine/client/voice.h
View File

@ -77,6 +77,7 @@ void Voice_Idle( float frametime );
qboolean Voice_IsRecording( void ); qboolean Voice_IsRecording( void );
void Voice_RecordStop( void ); void Voice_RecordStop( void );
void Voice_RecordStart( void ); void Voice_RecordStart( void );
void Voice_Disconnect( void );
void Voice_AddIncomingData( int ent, const byte *data, uint size, uint frames ); void Voice_AddIncomingData( int ent, const byte *data, uint size, uint frames );
qboolean Voice_GetLoopback( void ); qboolean Voice_GetLoopback( void );
void Voice_LocalPlayerTalkingAck( void ); void Voice_LocalPlayerTalkingAck( void );