use correct per-MCU index when building fader, pot, ledring messages

git-svn-id: svn://localhost/ardour2/branches/3.0@11859 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/surfaces/mackie/controls.h

@@ -75,6 +75,10 @@ public:
 	/// the id of the control, but only guaranteed to be
 	/// unique within the control type.
 	int raw_id() const { return _id; }
+
+	/* this identifies a given control within its MCU "bank of 8"
+	 */
+	int control_id() const { return _id % 8; }
 	
 	/// The 1-based number of the control
 	int ordinal() const { return _ordinal; }

libs/surfaces/mackie/mackie_midi_builder.cc

@@ -74,13 +74,13 @@ MidiByteArray MackieMidiBuilder::build_led_ring (const LedRing & led_ring, const
 	// 0x30 + pot/ring number (0-7)
 	//, 0x30 + led_ring.ordinal() - 1
 	return MidiByteArray  (3
-		// the control type
-		, midi_pot_id
-		// the id
-		, 0x20 + led_ring.raw_id()
-		// the value
-		, calculate_pot_value (mode, state)
-	);
+			       // the control type
+			       , midi_pot_id
+			       // the id
+			       , 0x20 + led_ring.control_id()
+			       // the value
+			       , calculate_pot_value (mode, state)
+		);
 }
 
 MidiByteArray MackieMidiBuilder::build_led (const Button & button, LedState ls)
@@ -101,7 +101,7 @@ MidiByteArray MackieMidiBuilder::build_led (const Led & led, LedState ls)
 	
 	return MidiByteArray  (3
 		, midi_button_id
-		, led.raw_id()
+		, led.control_id()
 		, state
 	);
 }
@@ -111,12 +111,12 @@ MidiByteArray MackieMidiBuilder::build_fader (const Fader & fader, float pos)
 	int posi = int (0x3fff * pos);
 	
 	return MidiByteArray  (3
-		, midi_fader_id | fader.raw_id()
-		// lower-order bits
-		, posi & 0x7f
-		// higher-order bits
-		,  (posi >> 7)
-	);
+			       , midi_fader_id | fader.control_id()
+			       // lower-order bits
+			       , posi & 0x7f
+			       // higher-order bits
+			       ,  (posi >> 7)
+		);
 }
 
 MidiByteArray MackieMidiBuilder::zero_strip (SurfacePort & port, const Strip & strip)