VolumeController のイベントのチャンネル番号が不正になる問題を修正。

VolumeController チャンネル番号 = (MIDI ポート番号 * 16) + MIDI チャンネル番号

Author: masaru-takano

dConnectDevicePlugin/dConnectDeviceMidi/plugin/src/main/java/org/deviceconnect/android/deviceplugin/midi/core/ControlChangeMessage.java

@@ -52,7 +52,7 @@ public int getControlValue() {
         return mControlValue;
     }
 
-    public class Builder extends ChannelVoiceMessage.Builder {
+    public static class Builder extends ChannelVoiceMessage.Builder {
 
         /**
          * コントロール番号.

dConnectDevicePlugin/dConnectDeviceMidi/plugin/src/main/java/org/deviceconnect/android/deviceplugin/midi/core/MidiMessage.java

@@ -7,6 +7,11 @@
  */
 public abstract class MidiMessage {
 
+    /**
+     * チャンネルの最大個数.
+     */
+    public static final int CHANNEL_MAX_COUNT = 16;
+
     public abstract void append(ByteBuffer buffer);
 
 }

dConnectDevicePlugin/dConnectDeviceMidi/plugin/src/main/java/org/deviceconnect/android/deviceplugin/midi/profiles/MidiSoundModuleProfile.java

@@ -4,6 +4,7 @@
 
 import org.deviceconnect.android.deviceplugin.midi.MidiMessageSender;
 import org.deviceconnect.android.deviceplugin.midi.NoteNameTable;
+import org.deviceconnect.android.deviceplugin.midi.core.MidiMessage;
 import org.deviceconnect.android.deviceplugin.midi.core.NoteOffMessage;
 import org.deviceconnect.android.deviceplugin.midi.core.NoteOnMessage;
 import org.deviceconnect.android.message.MessageUtils;
@@ -92,14 +93,14 @@ private int parseMidiPort(final Integer channelParam) {
         if (channelParam == null) {
             return 0;
         }
-        return channelParam / 16;
+        return channelParam / MidiMessage.CHANNEL_MAX_COUNT;
     }
 
     private int parseMidiChannel(final Integer channelParam) {
         if (channelParam == null) {
             return 0;
         }
-        return channelParam % 16;
+        return channelParam % MidiMessage.CHANNEL_MAX_COUNT;
     }
 
     @Override

dConnectDevicePlugin/dConnectDeviceMidi/plugin/src/main/java/org/deviceconnect/android/deviceplugin/midi/profiles/MidiVolumeControllerProfile.java

@@ -11,9 +11,14 @@
 import org.deviceconnect.android.profile.api.PutApi;
 
 import java.util.List;
+import java.util.logging.Logger;
+
+import static org.deviceconnect.android.deviceplugin.midi.BuildConfig.DEBUG;
 
 public class MidiVolumeControllerProfile extends BaseMidiOutputProfile {
 
+    private final Logger mLogger = Logger.getLogger("midi-plugin");
+
     public MidiVolumeControllerProfile() {
 
         // GET /gotapi/volumeController/onVolumeChange
@@ -65,7 +70,13 @@ public String getProfileName() {
     @Override
     void convertMessageToEvent(final int port, final @NonNull MidiMessage message, final long timestamp, final @NonNull List<MessageEvent> results) {
         if (message instanceof ControlChangeMessage) {
-            final int channel = port * ((ControlChangeMessage) message).getChannelNumber();
+            if (DEBUG) {
+                mLogger.info("convertMessageToEvent: ControlChange:"
+                        + "channel=" + ((ControlChangeMessage) message).getChannelNumber()
+                        + ", value=" + ((ControlChangeMessage) message).getControlValue());
+            }
+
+            final int channel = ((ControlChangeMessage) message).getChannelNumber() + port * MidiMessage.CHANNEL_MAX_COUNT;
             final int value = ((ControlChangeMessage) message).getControlValue();
             final double normalized = value / 127.0d;