created class Screen

PlaybackScreen.cpp

@@ -3,9 +3,8 @@
 #include "colors.h"
 #include <iostream>
 
-
 PlaybackScreen::PlaybackScreen(Sequencer& seq)
-    : beatDisplayOffset(0), sequencer(seq)
+    : parent(seq), beatDisplayOffset(0)
 {
 }
 
@@ -148,14 +147,3 @@ void PlaybackScreen::refresh(unsigned char x, unsigned char y)
         }
     }
 }
-
-void PlaybackScreen::refreshAll()
-{
-    for(unsigned char x = 0; x < midi::Launchpad::width; x++) {
-        for(unsigned char y = 0; y < midi::Launchpad::height; y++) {
-            if(x != 8 || y != 8) {
-                refresh(x, y);
-            }
-        }
-    }
-}

PlaybackScreen.h

@@ -1,13 +1,10 @@
 #pragma once
-#include "Sequencer.h"
+#include "Screen.h"
 #include "Player.h"
-#include "midi/LaunchpadScreen.h"
 
-class Sequencer;
-
-class PlaybackScreen : public midi::LaunchpadScreen
+class PlaybackScreen : public Screen
 {
-    typedef midi::LaunchpadScreen parent;
+    typedef Screen parent;
 
     Player::BeatIndex beatDisplayOffset;
 
@@ -15,8 +12,6 @@ public:
 
     midi::Launchpad::KeyCoordinate beatDisplayWidth = midi::Launchpad::width - 1;
 
-    Sequencer& sequencer;
-
     PlaybackScreen(Sequencer& seq);
     
     void enable();
@@ -29,8 +24,7 @@ protected:
 	virtual void keyPressed(unsigned char x, unsigned char y);
 	virtual void keyReleased(unsigned char x, unsigned char y);
 
-    void refresh(unsigned char x, unsigned char y);
-    void refreshAll();
+    virtual void refresh(unsigned char x, unsigned char y);
 
 };
 	

Screen.cpp

@@ -0,0 +1,18 @@
+#include "Sequencer.h"
+#include "Screen.h"
+
+Screen::Screen(Sequencer& seq)
+    : sequencer(seq)
+{
+}
+
+void Screen::refreshAll()
+{
+    for(unsigned char x = 0; x < midi::Launchpad::width; x++) {
+        for(unsigned char y = 0; y < midi::Launchpad::height; y++) {
+            if(x != 8 || y != 8) {
+                refresh(x, y);
+            }
+        }
+    }
+}

Screen.h

@@ -0,0 +1,23 @@
+#pragma once
+#include "Sequencer.h"
+#include "Player.h"
+#include "midi/LaunchpadScreen.h"
+
+class Sequencer;
+
+class Screen : public midi::LaunchpadScreen
+{
+    typedef midi::LaunchpadScreen parent;
+
+public:
+
+    Sequencer& sequencer;
+
+    Screen(Sequencer& seq);
+
+protected:
+
+    virtual void refresh(unsigned char x, unsigned char y) = 0;
+    void refreshAll();
+
+};