From: havoc Date: Sat, 8 Mar 2008 22:41:35 +0000 (+0000) Subject: added showsound cvar which displays number of sounds actively being X-Git-Tag: xonotic-v0.1.0preview~2324 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=11c9b5a1a74ad105c0a2f2252428bbf0a1cd3ab4;p=xonotic%2Fdarkplaces.git added showsound cvar which displays number of sounds actively being mixed, and total sound sources, and latency git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8202 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/client.h b/client.h index 543c9b7b..d4ab3e05 100644 --- a/client.h +++ b/client.h @@ -485,6 +485,14 @@ typedef struct cl_downloadack_s } cl_downloadack_t; +typedef struct cl_soundstats_s +{ + int mixedsounds; + int totalsounds; + int latency_milliseconds; +} +cl_soundstats_t; + // // the client_static_t structure is persistent through an arbitrary number // of server connections @@ -526,6 +534,9 @@ typedef struct client_static_s // LordHavoc: pausedemo qboolean demopaused; + // sound mixer statistics for showsound display + cl_soundstats_t soundstats; + qboolean connect_trying; int connect_remainingtries; double connect_nextsendtime; diff --git a/sbar.c b/sbar.c index dd01f438..f760c90a 100644 --- a/sbar.c +++ b/sbar.c @@ -88,6 +88,7 @@ cachepic_t *sb_inter; cachepic_t *sb_finale; cvar_t showfps = {CVAR_SAVE, "showfps", "0", "shows your rendered fps (frames per second)"}; +cvar_t showsound = {CVAR_SAVE, "showsound", "0", "shows number of active sound sources, sound latency, and other statistics"}; cvar_t showspeed = {CVAR_SAVE, "showspeed", "0", "shows your current speed (qu per second); number selects unit: 1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots"}; cvar_t showtime = {CVAR_SAVE, "showtime", "0", "shows current time of day (useful on screenshots)"}; cvar_t showtime_format = {CVAR_SAVE, "showtime_format", "%H:%M:%S", "format string for time of day"}; @@ -371,6 +372,7 @@ void Sbar_Init (void) Cmd_AddCommand("+showscores", Sbar_ShowScores, "show scoreboard"); Cmd_AddCommand("-showscores", Sbar_DontShowScores, "hide scoreboard"); Cvar_RegisterVariable(&showfps); + Cvar_RegisterVariable(&showsound); Cvar_RegisterVariable(&showspeed); Cvar_RegisterVariable(&showtime); Cvar_RegisterVariable(&showtime_format); @@ -1032,11 +1034,13 @@ void Sbar_DrawFace (void) void Sbar_ShowFPS(void) { float fps_x, fps_y, fps_scalex, fps_scaley, fps_height; + char soundstring[32]; char fpsstring[32]; char timestring[32]; char datestring[32]; char speedstring[32]; qboolean red = false; + soundstring[0] = 0; fpsstring[0] = 0; timestring[0] = 0; datestring[0] = 0; @@ -1071,6 +1075,8 @@ void Sbar_ShowFPS(void) strlcpy(timestring, Sys_TimeString(showtime_format.string), sizeof(timestring)); if (showdate.integer) strlcpy(datestring, Sys_TimeString(showdate_format.string), sizeof(datestring)); + if (showsound.integer) + dpsnprintf(soundstring, sizeof(soundstring), "%4i/%4i at %3ims\n", cls.soundstats.mixedsounds, cls.soundstats.totalsounds, cls.soundstats.latency_milliseconds); if (showspeed.integer) { double speed, speedxy, f; @@ -1115,10 +1121,17 @@ void Sbar_ShowFPS(void) { fps_scalex = 12; fps_scaley = 12; - fps_height = fps_scaley * ((fpsstring[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0) + (speedstring[0] != 0)); + fps_height = fps_scaley * ((soundstring[0] != 0) + (fpsstring[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0) + (speedstring[0] != 0)); //fps_y = vid_conheight.integer - sb_lines; // yes this may draw over the sbar //fps_y = bound(0, fps_y, vid_conheight.integer - fps_height); fps_y = vid_conheight.integer - fps_height; + if (soundstring[0]) + { + fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(soundstring, 0, true, FONT_INFOBAR) * fps_scalex; + DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0); + DrawQ_String_Font(fps_x, fps_y, soundstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR); + fps_y += fps_scaley; + } if (fpsstring[0]) { fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(fpsstring, 0, true, FONT_INFOBAR) * fps_scalex; diff --git a/snd_main.c b/snd_main.c index 251a8590..9c5828d7 100644 --- a/snd_main.c +++ b/snd_main.c @@ -1483,9 +1483,13 @@ static void S_PaintAndSubmit (void) static int soundtimehack = -1; static int oldsoundtime = 0; + cls.soundstats.latency_milliseconds = -1; + if (snd_renderbuffer == NULL || nosound.integer) return; + cls.soundstats.latency_milliseconds = (snd_renderbuffer->endframe - snd_renderbuffer->startframe) * 1000 / snd_renderbuffer->format.speed; + // Update sound time snd_usethreadedmixing = false; usesoundtimehack = true; @@ -1627,7 +1631,7 @@ Called once each time through the main loop */ void S_Update(const matrix4x4_t *listenermatrix) { - unsigned int i, j, total; + unsigned int i, j, k; channel_t *ch, *combine; matrix4x4_t basematrix, rotatematrix; @@ -1665,11 +1669,14 @@ void S_Update(const matrix4x4_t *listenermatrix) combine = NULL; // update spatialization for static and dynamic sounds + cls.soundstats.totalsounds = 0; + cls.soundstats.mixedsounds = 0; ch = channels+NUM_AMBIENTS; for (i=NUM_AMBIENTS ; isfx) continue; + cls.soundstats.totalsounds++; // respatialize channel SND_Spatialize(ch, i >= MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS); @@ -1707,29 +1714,18 @@ void S_Update(const matrix4x4_t *listenermatrix) } } } + for (k = 0;k < SND_LISTENERS;k++) + if (ch->listener_volume[k]) + break; + if (k < SND_LISTENERS) + cls.soundstats.mixedsounds++; } sound_spatialized = true; // debugging output if (snd_show.integer) - { - total = 0; - ch = channels; - for (i=0 ; isfx) - { - for (j = 0;j < SND_LISTENERS;j++) - if (ch->listener_volume[j]) - break; - if (j < SND_LISTENERS) - total++; - } - } - - Con_Printf("----(%u)----\n", total); - } + Con_Printf("----(%u)----\n", cls.soundstats.mixedsounds); S_PaintAndSubmit(); }