X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Frotatescreen.cpp;h=631fbae5f829f3c14c2587767d871194a85f374d;hb=405a983fa5d81d4ea5efdf13fa43dbe14a6d8a87;hp=a8c9d6f83723f653180b289101ea25e89b26c4ac;hpb=be31a75be370526c5124b881da7603e2de346082;p=ccbs

diff --git a/bigscreen/rotatescreen.cpp b/bigscreen/rotatescreen.cpp
index a8c9d6f..631fbae 100644
--- a/bigscreen/rotatescreen.cpp
+++ b/bigscreen/rotatescreen.cpp
@@ -12,6 +12,10 @@ RotateScreen::RotateScreen()
 RotateScreen::~RotateScreen()
 {
 	delete[] fadefrom_buf;
+	for (unsigned i = 0; i < subscreens.size(); ++i) {
+		delete[] subscreens[i].redbuf;
+		delete[] subscreens[i].buf;
+	}
 }
 
 bool RotateScreen::check_invalidated()
@@ -40,6 +44,9 @@ void RotateScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 		fadefrom_buf = new unsigned char[width * height * 4];
 	}
 	for (std::vector<Subscreen>::iterator i = subscreens.begin(); i != subscreens.end(); ++i) {
+		if (i->redbuf == NULL) {
+			i->redbuf = new unsigned char[width * height * 4];
+		}
 		if (i->buf == NULL) {
 			i->buf = new unsigned char[width * height * 4];
 			i->screen->draw(i->buf, width, height);
@@ -71,46 +78,33 @@ void RotateScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 		if (elapsed_fade > 5.5 || (!fade_to_new_info && elapsed_fade > 0.5)) {
 			in_fade = false;
 
-			// ugly hack here? :-)
-			subscreens[current_screen].screen->draw(subscreens[current_screen].buf, width, height);
-			
 			memcpy(buf, subscreens[current_screen].buf, width * height * 4);
 		} else {
-			// find the fade f
+			unsigned char *sptr1, *sptr2;
+			unsigned char *dptr = buf;
 			int f;
 			if (fade_to_new_info) {
 				if (elapsed_fade < 0.5) {
+					sptr1 = fadefrom_buf;
+					sptr2 = subscreens[current_screen].redbuf;
 					f = unsigned(elapsed_fade/0.5 * 256.0);
 				} else {
+					sptr1 = subscreens[current_screen].redbuf;
+					sptr2 = subscreens[current_screen].buf;
 					f = unsigned((elapsed_fade-0.5)/5.0 * 256.0);
 				}
 			} else {
+				sptr1 = fadefrom_buf;
+				sptr2 = subscreens[current_screen].buf;
 				f = unsigned(elapsed_fade/0.5 * 256.0);
 			}
 
-			unsigned char *sptr1 = fadefrom_buf;
-			unsigned char *sptr2 = subscreens[current_screen].buf;
-			unsigned char *dptr = buf;
-
-			if (fade_to_new_info && elapsed_fade >= 0.5) {
-				// fade G&B to be = R
-				for (unsigned i = 0; i < width * height; ++i) {
-					dptr[0] = sptr2[0] + (((int(sptr2[2]) - int(sptr2[0])) * f) >> 8);
-					dptr[1] = dptr[0];
-					dptr[2] = sptr2[2];
-					dptr[3] = sptr2[3];
-
-					sptr1 += 4, sptr2 += 4, dptr += 4;
-				}
-			} else {
-				for (unsigned i = 0; i < width * height; ++i) {
-					dptr[0] = sptr1[0] + (((int(sptr2[0]) - int(sptr1[0])) * f) >> 8);
-					dptr[1] = dptr[0];
-					dptr[2] = dptr[0];
-					dptr[3] = dptr[0];
+			for (unsigned i = 0; i < width * height; ++i) {
+				dptr[0] = sptr1[0] + (((int(sptr2[0]) - int(sptr1[0])) * f) >> 8);
+				dptr[1] = sptr1[1] + (((int(sptr2[1]) - int(sptr1[1])) * f) >> 8);
+				dptr[2] = sptr1[2] + (((int(sptr2[2]) - int(sptr1[2])) * f) >> 8);
 
-					sptr1 += 4, sptr2 += 4, dptr += 4;
-				}
+				sptr1 += 4, sptr2 += 4, dptr += 4;
 			}
 		}
 	} else {
@@ -143,6 +137,9 @@ void RotateScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 			memcpy(fadefrom_buf, subscreens[old_current_screen].buf, width * height * 4);
 
 			if (subscreens[current_screen].screen->check_invalidated()) {
+				if (fade_to_new_info) {
+					subscreens[current_screen].screen->draw(subscreens[current_screen].redbuf, width, height);
+				}
 				subscreens[current_screen].screen->draw(subscreens[current_screen].buf, width, height);
 			}
 		}
@@ -192,6 +189,7 @@ bool RotateScreen::can_update()
 void RotateScreen::add_screen(GenericScreen *screen)
 {
 	Subscreen ss;
+	ss.redbuf = NULL;
 	ss.buf = NULL;
 	ss.screen = screen;