[quake3-commits] r2381 - trunk/code/client
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Dec 14 02:32:08 EST 2012
Author: ztm
Date: 2012-12-14 02:32:07 -0500 (Fri, 14 Dec 2012)
New Revision: 2381
Modified:
trunk/code/client/cl_main.c
trunk/code/client/cl_parse.c
Log:
- Allow changing cl_voip without restarting.
- Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Modified: trunk/code/client/cl_main.c
===================================================================
--- trunk/code/client/cl_main.c 2012-12-13 23:54:58 UTC (rev 2380)
+++ trunk/code/client/cl_main.c 2012-12-14 07:32:07 UTC (rev 2381)
@@ -120,6 +120,8 @@
cvar_t *cl_consoleKeys;
+cvar_t *cl_rate;
+
clientActive_t cl;
clientConnection_t clc;
clientStatic_t cls;
@@ -411,6 +413,22 @@
return;
#endif
+ // If your data rate is too low, you'll get Connection Interrupted warnings
+ // when VoIP packets arrive, even if you have a broadband connection.
+ // This might work on rates lower than 25000, but for safety's sake, we'll
+ // just demand it. Who doesn't have at least a DSL line now, anyhow? If
+ // you don't, you don't need VoIP. :)
+ if (cl_voip->modified || cl_rate->modified) {
+ if ((cl_voip->integer) && (cl_rate->integer < 25000)) {
+ Com_Printf(S_COLOR_YELLOW "Your network rate is too slow for VoIP.\n");
+ Com_Printf("Set 'Data Rate' to 'LAN/Cable/xDSL' in 'Setup/System/Network'.\n");
+ Com_Printf("Until then, VoIP is disabled.\n");
+ Cvar_Set("cl_voip", "0");
+ }
+ cl_voip->modified = qfalse;
+ cl_rate->modified = qfalse;
+ }
+
if (!clc.speexInitialized)
return; // just in case this gets called at a bad time.
@@ -3508,7 +3526,7 @@
// userinfo
Cvar_Get ("name", "UnnamedPlayer", CVAR_USERINFO | CVAR_ARCHIVE );
- Cvar_Get ("rate", "25000", CVAR_USERINFO | CVAR_ARCHIVE );
+ cl_rate = Cvar_Get ("rate", "25000", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("snaps", "20", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("model", "sarge", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("headmodel", "sarge", CVAR_USERINFO | CVAR_ARCHIVE );
@@ -3541,20 +3559,8 @@
cl_voipShowMeter = Cvar_Get ("cl_voipShowMeter", "1", CVAR_ARCHIVE);
// This is a protocol version number.
- cl_voip = Cvar_Get ("cl_voip", "1", CVAR_USERINFO | CVAR_ARCHIVE | CVAR_LATCH);
+ cl_voip = Cvar_Get ("cl_voip", "1", CVAR_USERINFO | CVAR_ARCHIVE);
Cvar_CheckRange( cl_voip, 0, 1, qtrue );
-
- // If your data rate is too low, you'll get Connection Interrupted warnings
- // when VoIP packets arrive, even if you have a broadband connection.
- // This might work on rates lower than 25000, but for safety's sake, we'll
- // just demand it. Who doesn't have at least a DSL line now, anyhow? If
- // you don't, you don't need VoIP. :)
- if ((cl_voip->integer) && (Cvar_VariableIntegerValue("rate") < 25000)) {
- Com_Printf(S_COLOR_YELLOW "Your network rate is too slow for VoIP.\n");
- Com_Printf("Set 'Data Rate' to 'LAN/Cable/xDSL' in 'Setup/System/Network' and restart.\n");
- Com_Printf("Until then, VoIP is disabled.\n");
- Cvar_Set("cl_voip", "0");
- }
#endif
Modified: trunk/code/client/cl_parse.c
===================================================================
--- trunk/code/client/cl_parse.c 2012-12-13 23:54:58 UTC (rev 2380)
+++ trunk/code/client/cl_parse.c 2012-12-14 07:32:07 UTC (rev 2381)
@@ -769,7 +769,7 @@
// reset the bits just in case.
speex_bits_reset(&clc.speexDecoderBits[sender]);
seqdiff = 0;
- } else if (seqdiff > 100) { // more than 2 seconds of audio dropped?
+ } else if (seqdiff * clc.speexFrameSize * 2 >= sizeof (decoded)) { // dropped more than we can handle?
// just start over.
Com_DPrintf("VoIP: Dropped way too many (%d) frames from client #%d\n",
seqdiff, sender);
More information about the quake3-commits
mailing list