|
@@ -1,6 +1,16 @@
|
|
#include "Launchpad.h"
|
|
#include "Launchpad.h"
|
|
#include "MidiMessage.h"
|
|
#include "MidiMessage.h"
|
|
|
|
|
|
|
|
+LaunchpadColor::LaunchpadColor()
|
|
|
|
+ : red(0), green(0)
|
|
|
|
+{
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+LaunchpadColor::LaunchpadColor(unsigned char r, unsigned char g)
|
|
|
|
+ : red(r), green(g)
|
|
|
|
+{
|
|
|
|
+}
|
|
|
|
+
|
|
Launchpad::Launchpad()
|
|
Launchpad::Launchpad()
|
|
: midiin(), midiout(), keyPressedCallback(0), keyReleasedCallback(0)
|
|
: 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)
|
|
if(y == 8)
|
|
{
|
|
{
|