Răsfoiți Sursa

new class LaunchpadColor

Fabian Peter Hammerle 11 ani în urmă
părinte
comite
8c0be747b7
2 a modificat fișierele cu 22 adăugiri și 3 ștergeri
  1. 12 2
      Launchpad.cpp
  2. 10 1
      Launchpad.h

+ 12 - 2
Launchpad.cpp

@@ -1,6 +1,16 @@
 #include "Launchpad.h"
 #include "MidiMessage.h"
 
+LaunchpadColor::LaunchpadColor()
+	: red(0), green(0)
+{
+}
+
+LaunchpadColor::LaunchpadColor(unsigned char r, unsigned char g)
+	: red(r), green(g)
+{
+}
+
 Launchpad::Launchpad()
 	: midiin(), midiout(), keyPressedCallback(0), keyReleasedCallback(0)
 {
@@ -51,9 +61,9 @@ void Launchpad::midiMessageCallback(double timeStamp, MidiMessage &message, void
 	}
 }
 
-void Launchpad::setColor(unsigned char x, unsigned char y, unsigned char red, unsigned char green)
+void Launchpad::setColor(unsigned char x, unsigned char y, const LaunchpadColor& color)
 {
-	unsigned char velocity = (green << 4) + red;
+	unsigned char velocity = (color.green << 4) + color.red;
 
 	if(y == 8)
 	{

+ 10 - 1
Launchpad.h

@@ -2,6 +2,15 @@
 #include "Midi.h"
 #include <utility>
 
+class LaunchpadColor
+{
+public:
+	unsigned char red, green;
+
+	LaunchpadColor();
+	LaunchpadColor(unsigned char r, unsigned char g);
+};
+
 class Launchpad
 {
 public:
@@ -17,7 +26,7 @@ public:
 
 	Launchpad();
 
-	void setColor(unsigned char x, unsigned char y, unsigned char red, unsigned char green);
+	void setColor(unsigned char x, unsigned char y, const LaunchpadColor& color);
 
 protected:
 	void keyPressed(unsigned char x, unsigned char y);