Actually check in changes from last time...

[ccbs] / bigscreen / rotatescreen.h

diff --git a/bigscreen/rotatescreen.h b/bigscreen/rotatescreen.h
index 0883ca27cc4d24591b4e5d764d28e711820c91d8..d2c69f788d78c6c97bbc25ab65bcaee4e766be66 100644 (file)
--- a/bigscreen/rotatescreen.h
+++ b/bigscreen/rotatescreen.h
@@ -17,11 +17,13 @@ struct Subscreen {
 
 class RotateScreen : public GenericScreen {
 private:
+       unsigned char *fadefrom_buf;
        bool valid;
        std::vector<Subscreen> subscreens;
        unsigned current_screen;
 
-       struct timeval last_update;
+       struct timeval last_update, fade_started;
+       bool in_fade, same_fade;
 
        bool needs_update();