Merge pull request #3201 from wangyix/master

moved audio stats to own overlay; audio stats now reset when audiomixer is killed;

Philip Rosedale committed 12 years ago

Commit a5d6b222 parents 9a83be6 a36c9e814 files · +257 −167Browse files

Showing the changes to interface/src/ui/ApplicationOverlay.cpp (1 of 14 files). Show all

Unified · Split

@@ -1022,6 +1022,8 @@ void ApplicationOverlay::renderAudioMeter() { · 1021 unmodified lines
1022	1022
1023	1023	audio->renderScope(glWidget->width(), glWidget->height());
1024	1024
	1025	+ audio->renderStats(WHITE_TEXT, glWidget->width(), glWidget->height());
	1026	+
1025	1027	glBegin(GL_QUADS);
1026	1028	if (isClipping) {
1027	1029	glColor3f(1, 0, 0);