From 181cf14f1581ddf26cb956ffa24642dcccba5f40 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Sun, 20 Feb 2005 19:09:44 +0000
Subject: [PATCH] Removed some debugging printf-s, converted some sprintf to
 std::sprintf.

---
 bigscreen/groupscreen.cpp  | 11 ++++-------
 bigscreen/rotatescreen.cpp |  4 ----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 96afeec..2b54120 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -49,9 +49,9 @@ void GroupScreen::draw(unsigned char *buf)
 	// main heading
 	char heading[64];
 	if (parallel == 0) {
-		sprintf(heading, "Round %u", round);
+		std::sprintf(heading, "Round %u", round);
 	} else {
-		sprintf(heading, "Round %u, Group %u", round, parallel);
+		std::sprintf(heading, "Round %u, Group %u", round, parallel);
 	}
 
 	{
@@ -115,7 +115,6 @@ void GroupScreen::draw(unsigned char *buf)
 		}
 
 		if (first_chosen_col != -1) {
-			printf("first_chosen_col=%u\n", first_chosen_col);
 			width[first_chosen_col] += 780 - sumwidth;
 		}
 	}
@@ -146,7 +145,7 @@ void GroupScreen::draw(unsigned char *buf)
 		for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
 			char text[16] = "";
 			if (j->score != -1) {
-				sprintf(text, "%u", j->score);
+				std::sprintf(text, "%u", j->score);
 			}
 	
 			unsigned this_width = my_draw_text(text, NULL, 22.0);
@@ -168,7 +167,7 @@ void GroupScreen::draw(unsigned char *buf)
 		// draw total
 		{
 			char text[16];
-			sprintf(text, "%u", i->total);
+			std::sprintf(text, "%u", i->total);
 			
 			unsigned this_width = my_draw_text(text, NULL, 22.0);
 			my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 1] / 2 - this_width / 2, y);
@@ -295,7 +294,6 @@ void GroupScreen::draw(unsigned char *buf)
 		unsigned j = (i + next_player->position - 1) % num_random_songs;
 		if (next_player->scores[j].score == -1) {
 			next_song = &(next_player->scores[j]);
-			printf("Selecting score %u\n", j);
 			break;
 		}
 	}
@@ -306,7 +304,6 @@ void GroupScreen::draw(unsigned char *buf)
 			unsigned j = (i + next_player->position) % num_scores;
 			if (next_player->scores[j].score == -1) {
 				next_song = &(next_player->scores[j]);
-				printf("Selecting score %u\n", j);
 				break;
 			}
 		}
diff --git a/bigscreen/rotatescreen.cpp b/bigscreen/rotatescreen.cpp
index 900bac3..54f0423 100644
--- a/bigscreen/rotatescreen.cpp
+++ b/bigscreen/rotatescreen.cpp
@@ -40,7 +40,6 @@ void RotateScreen::draw(unsigned char *buf)
 
 		double elapsed_fade = double(now.tv_sec - fade_started.tv_sec) +
 			double(now.tv_usec - fade_started.tv_usec) * 1.0e-6;
-		printf("fade: %f\n", elapsed_fade);
 		
 		if (elapsed_fade > 6.0 || (!same_fade && elapsed_fade > 1.0)) {
 			in_fade = false;
@@ -49,7 +48,6 @@ void RotateScreen::draw(unsigned char *buf)
 			subscreens[current_screen].screen->draw(subscreens[current_screen].buf);
 			
 			memcpy(buf, subscreens[current_screen].buf, 800 * 600 * 4);
-			printf("fade done\n");
 		} else {
 			// find the fade factors
 			int fr, fg, fb, fa;
@@ -62,7 +60,6 @@ void RotateScreen::draw(unsigned char *buf)
 			} else {
 				fr = fg = fb = fa = unsigned(elapsed_fade/1.0 * 256.0);
 			}
-			printf("%u %u %u %u\n", fr, fg, fb, fa);
 
 			unsigned char *sptr1 = fadefrom_buf;
 			unsigned char *sptr2 = subscreens[current_screen].buf;
@@ -113,7 +110,6 @@ void RotateScreen::draw(unsigned char *buf)
 			in_fade = true;
 			same_fade = (current_screen == old_current_screen);
 			gettimeofday(&fade_started, NULL);
-			printf("starting fade (same=%u)\n", same_fade);
 			
 			memcpy(fadefrom_buf, subscreens[old_current_screen].buf, 800 * 600 * 4);
 
-- 
2.39.2