Merge branch 'api-17' into CI

Author: abique

.gitignore

@@ -15,11 +15,15 @@ hs_err_pid*
 
 bitwig-extensions.iml
 
-target/
-build/
+/target/
+/build/
 /.idea
 /.classpath
 /.project
 /${bitwig.extension.directory}/
 /${bitwig.extension.directory}/Bitwig.bwextension
 /.gradle/
+/out
+/bin/
+/.settings/
+.DS_Store

.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8

build.gradle

@@ -1,26 +1,39 @@
 plugins {
     id 'java'
+    id 'eclipse'
+    id 'idea'
 }
 
-repositories {
-    mavenLocal()
-    maven {
-        url = uri('https://maven.bitwig.com')
-    }
+var isBuildingBitwig = rootProject.getName().equals("bitwig")
 
-    maven {
-        url = uri('https://repo.maven.apache.org/maven2/')
+if (isBuildingBitwig)
+{
+    dependencies {
+        implementation project(':base-extensions-api')
     }
 }
+else
+{
+    repositories {
+        maven {
+            url = uri('https://maven.bitwig.com')
+        }
+    }
 
 dependencies {
     if (project.file('../is-building-bitwig.txt').exists())
-        implementation project(':base-extensions-api')
+        implementation 'com.bitwig:base-extensions-api:LOCAL'
     else
         implementation 'com.bitwig:base-extensions-api:13'
 }
 
 group = 'com.bitwig.extensions'
-version = '1-SNAPSHOT'
 description = 'Bitwig Studio Extensions (Github)'
-java.sourceCompatibility = JavaVersion.VERSION_13
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_16
+
+    jar {
+        archiveFileName = 'BitwigControllers.bwextension'
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

pom.xml

@@ -81,10 +81,9 @@
 				<dependency>
 					<groupId>com.bitwig</groupId>
 					<artifactId>extension-api</artifactId>
-					<version>[13,)</version>
+					<version>[15,)</version>
 				</dependency>
 			</dependencies>
 		</profile>
 	</profiles>
 </project>
-

settings.gradle

@@ -1,5 +1 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
-
 rootProject.name = 'bitwig-extensions'

src/main/java/com/bitwig/extensions/controllers/akai/apc40_mkii/APC40MKIIControllerExtension.java

@@ -44,7 +44,7 @@
 
 public class APC40MKIIControllerExtension extends ControllerExtension
 {
-   private static final boolean ENABLE_DEBUG_LAYER = true;
+   private static final boolean ENABLE_DEBUG_LAYER = false;
 
    private static final int CHANNEL_STRIP_NUM_PARAMS = 4;
 
@@ -215,8 +215,10 @@ public void init()
 
       mTrackBank = host.createTrackBank(8, 5, 5, false);
       mTrackBank.setSkipDisabledItems(true);
+      mTrackBank.setShouldShowClipLauncherFeedback(true);
 
       mSceneBank = mTrackBank.sceneBank();
+      mSceneBank.setIndication(true);
 
       mTrackBank.cursorIndex().markInterested();
 
@@ -239,8 +241,6 @@ public void init()
          sendBank.setSkipDisabledItems(true);
 
          final ClipLauncherSlotBank clipLauncher = track.clipLauncherSlotBank();
-         clipLauncher.setIndication(true);
-
          for (int j = 0; j < 5; ++j)
          {
             final ClipLauncherSlot slot = clipLauncher.getItemAt(j);
@@ -440,9 +440,18 @@ private void createShiftLayer()
          for (int j = 0; j < 5; ++j)
          {
             final ClipLauncherSlot slot = clipLauncherSlotBank.getItemAt(j);
-            mShiftLayer.bindPressed(mGridButtons[i + 8 * j], () -> slot.select());
+            final HardwareButton clipButton = mGridButtons[i + 8 * j];
+            mShiftLayer.bindPressed(clipButton, slot.launchWithOptionsAction("none", "continue_immediately"));
+            mShiftLayer.bindReleased(clipButton, track.launchLastClipWithOptionsAction("none", "continue_immediately"));
          }
       }
+
+      for (int i = 0; i < 5; ++i)
+      {
+         final Scene scene = mSceneBank.getScene(i);
+         mShiftLayer.bindPressed(mSceneButtons[i], scene.launchWithOptionsAction("none", "continue_immediately"));
+         mShiftLayer.bindReleased(mSceneButtons[i], scene.launchLastClipWithOptionsAction("none", "continue_immediately"));
+      }
    }
 
    private void setLaunchQuantizationFromTrackSelect(final int x)
@@ -519,7 +528,7 @@ private void createUserLayers()
       {
          mUserLayers[userIndex] = new Layer(mLayers, "User-" + userIndex);
          for (int i = 0; i < 8; ++i)
-            mUserLayers[userIndex].bind(mTopControlKnobs[i], mUserControls.getControl(i + mUserIndex * 8));
+            mUserLayers[userIndex].bind(mTopControlKnobs[i], mUserControls.getControl(i + userIndex * 8));
       }
    }
 
@@ -1560,23 +1569,27 @@ private void paintPads()
             /*
              * if (slot.isStopQueued().get()) { rgbLed.setBlinkType(RgbLed.BLINK_STOP_QUEUED);
              * rgbLed.setBlinkColor(RgbLed.COLOR_STOPPING); } else
-             */if (slot.isRecordingQueued().get())
+             */
+
+            if (slot.isRecordingQueued().get())
             {
                rgbLed.setBlinkType(RGBLedState.BLINK_RECORD_QUEUED);
                rgbLed.setBlinkColor(RGBLedState.COLOR_RECORDING);
             }
             else if (slot.isPlaybackQueued().get())
             {
                rgbLed.setBlinkType(RGBLedState.BLINK_PLAY_QUEUED);
-               rgbLed.setBlinkColor(RGBLedState.COLOR_PLAYING);
+               rgbLed.setBlinkColor(RGBLedState.COLOR_PLAYING_QUEUED);
             }
             else if (slot.isRecording().get())
             {
+               rgbLed.setColor(RGBLedState.COLOR_NONE);
                rgbLed.setBlinkType(RGBLedState.BLINK_ACTIVE);
                rgbLed.setBlinkColor(RGBLedState.COLOR_RECORDING);
             }
             else if (slot.isPlaying().get())
             {
+               rgbLed.setColor(RGBLedState.COLOR_NONE);
                rgbLed.setBlinkType(RGBLedState.BLINK_ACTIVE);
                rgbLed.setBlinkColor(RGBLedState.COLOR_PLAYING);
             }

src/main/java/com/bitwig/extensions/controllers/akai/apc40_mkii/APC40MKIIControllerExtensionDefinition.java

@@ -39,7 +39,7 @@ public UUID getId()
    @Override
    public int getRequiredAPIVersion()
    {
-      return 11;
+      return 17;
    }
 
    @Override

src/main/java/com/bitwig/extensions/controllers/akai/apc40_mkii/RGBLedState.java

@@ -23,19 +23,21 @@ class RGBLedState extends InternalHardwareLightState
 
    public static final int COLOR_PLAYING = COLOR_GREEN;
 
+   public static final int COLOR_PLAYING_QUEUED = COLOR_YELLOW;
+
    public static final int COLOR_STOPPING = COLOR_NONE;
 
    public static final int COLOR_SCENE = COLOR_YELLOW;
 
    public static final int BLINK_NONE = 0;
 
-   public static final int BLINK_PLAY_QUEUED = 12;
+   public static final int BLINK_PLAY_QUEUED = 14;
 
-   public static final int BLINK_ACTIVE = 9;
+   public static final int BLINK_ACTIVE = 10;
 
-   public static final int BLINK_RECORD_QUEUED = 12;
+   public static final int BLINK_RECORD_QUEUED = 13;
 
-   public static final int BLINK_STOP_QUEUED = 12;
+   public static final int BLINK_STOP_QUEUED = 13;
 
    private static final Map<Integer, Integer> RGB_TO_COLOR_VALUE_MAP = new HashMap<>();
 

src/main/java/com/bitwig/extensions/controllers/akai/mpk_mini_mk3/MpkMiniMk3ControllerExtension.java

@@ -23,6 +23,8 @@
 
 public class MpkMiniMk3ControllerExtension extends ControllerExtension
 {
+   static final boolean SHOW_KNOB_NAME = false;
+
    public MpkMiniMk3ControllerExtension(
       final MpkMiniMk3ControllerExtensionDefinition definition,
       final ControllerHost host)
@@ -67,11 +69,15 @@ public void init()
          parameter.setIndication(true);
          parameter.markInterested();
          parameter.exists().markInterested();
-         parameter.name().markInterested();
-         parameter.name().addValueObserver(newValue -> {
-            mShouldFlushSysex = true;
-            getHost().requestFlush();
-         });
+
+         if (SHOW_KNOB_NAME)
+         {
+            parameter.name().markInterested();
+            parameter.name().addValueObserver(newValue -> {
+               mShouldFlushSysex = true;
+               getHost().requestFlush();
+            });
+         }
 
          final String id = "K" + (i + 1);
 
@@ -132,7 +138,6 @@ private void initHardwareControlPositions()
       surface.hardwareElementWithId("pad6").setBounds(90.25, 10.75, 28.5, 28.25);
       surface.hardwareElementWithId("pad7").setBounds(125.25, 10.75, 28.5, 28.25);
       surface.hardwareElementWithId("pad8").setBounds(160.5, 10.75, 28.5, 28.25);
-
    }
 
    @Override
@@ -152,22 +157,29 @@ public void flush()
    void sendSysex()
    {
       String sysexBitwig2 = "F0 47 7F 49 64 01 76 00 50 47 4D 3A 42 49 54 57 " // pG.Id.v.PGM:MPC.
-         + "49 47 00 00 00 00 00 00 09 01 00 04 00 00 04 01 " // ................
+         + "49 47 00 00 00 00 00 00 09 01 00";
+
+      sysexBitwig2 += String.format(" %02X", mOctave);
+
+      sysexBitwig2 += " 00 00 04 01 " // ................
          + "00 00 03 00 78 00 00 00 00 02 01 01 24 00 10 25 " // ....x.......$..%
          + "01 11 26 02 12 27 03 13 28 04 14 29 05 15 2A 06 " // ..&..'..(..)..*.
          + "16 2B 07 17 2C 08 18 2D 09 19 2E 0A 1A 2F 0B 1B " // .+..,..-...../..
          + "30 0C 1C 31 0D 1D 32 0E 1E 33 0F 1F ";
 
       for (int i = 0; i < 8; ++i)
       {
-         String name = "none - " + (i + 1);
-         final RemoteControl parameter = mCursorRemoteControls.getParameter(i);
+         String name = "K" + (i + 1);
 
-         if (parameter.exists().get())
+         if (SHOW_KNOB_NAME)
          {
-            final String paramName = parameter.name().get();
-            if (!paramName.isBlank())
-               name = paramName;
+            final RemoteControl parameter = mCursorRemoteControls.getParameter(i);
+            if (parameter.exists().get())
+            {
+               final String paramName = parameter.name().get();
+               if (!paramName.isBlank())
+                  name = paramName;
+            }
          }
 
          sysexBitwig2 += configureKnob(70 + i, name);
@@ -209,4 +221,7 @@ String configureKnob(final int cc, final String name)
    private HardwareSurface mHardwareSurface;
 
    private boolean mShouldFlushSysex = true;
+
+   // TODO: find out how to do octave tracking
+   private int mOctave = 4;
 }