ChannelMessage::Channel type

Message.cpp

@@ -18,7 +18,7 @@ Message* Message::parse(std::vector<unsigned char> &messageBytes)
 	else
 	{
 		// channel message
-		unsigned char channel = messageBytes[0] & 0xF;
+        ChannelMessage::Channel channel = messageBytes[0] & 0xF;
 
 		switch(messageType)
 		{

Message.h

@@ -24,10 +24,12 @@ std::ostream& operator<<(std::ostream& stream, const Message& message);
 class ChannelMessage : public Message
 {
 public:
-	unsigned char channel;
-	static const unsigned char channelMaximum = (2 << 4) - 1;
+    typedef unsigned char Channel;
 
-	ChannelMessage(unsigned char channel)
+	Channel channel;
+	static const Channel channelMaximum = (2 << 4) - 1;
+
+	ChannelMessage(Channel channel)
 		: channel(channel)
 	{
 	}
@@ -41,7 +43,7 @@ public:
 	unsigned char velocity;
 	static const unsigned char velocityMaximum = (2 << 7) - 1;
 
-	NoteMessage(unsigned char channel, unsigned char pitch, unsigned char velocity)
+	NoteMessage(Channel channel, unsigned char pitch, unsigned char velocity)
 		: ChannelMessage(channel), pitch(pitch), velocity(velocity)
 	{
 	}
@@ -55,7 +57,7 @@ protected:
 	static const unsigned char messageType = 0x9;
 
 public:
-	NoteOnMessage(unsigned char channel, unsigned char pitch, unsigned char velocity)
+	NoteOnMessage(Channel channel, unsigned char pitch, unsigned char velocity)
 		: NoteMessage(channel, pitch, velocity)
 	{
 	}
@@ -72,7 +74,7 @@ protected:
 	static const unsigned char messageType = 0x8;
 
 public:
-	NoteOffMessage(unsigned char channel, unsigned char pitch, unsigned char velocity)
+	NoteOffMessage(Channel channel, unsigned char pitch, unsigned char velocity)
 		: NoteMessage(channel, pitch, velocity)
 	{
 	}
@@ -94,7 +96,7 @@ public:
 	unsigned char value;
 	static const unsigned char valueMaximum = (2 << 7) - 1;
 
-	ControlChangeMessage(unsigned char channel, unsigned char control, unsigned char value)
+	ControlChangeMessage(Channel channel, unsigned char control, unsigned char value)
 		: ChannelMessage(channel), control(control), value(value)
 	{
 	}
@@ -114,7 +116,7 @@ public:
 	unsigned char program;
 	static const unsigned char programMaximum = (2 << 7) - 1;
 
-	ProgramChangeMessage(unsigned char channel, unsigned char program)
+	ProgramChangeMessage(Channel channel, unsigned char program)
 		: ChannelMessage(channel), program(program)
 	{
 	}
@@ -135,7 +137,7 @@ public:
 	uint16_t value;
 	static const uint16_t valueMaximum = (2 << 14) - 1;
 
-	PitchBendChangeMessage(unsigned char channel, uint16_t value)
+	PitchBendChangeMessage(Channel channel, uint16_t value)
 		: ChannelMessage(channel), value(value)
 	{
 	}