Finished OXI One (at least for Bitwig).

git-moss · Jul 28, 2024 · 856a566 · 856a566
1 parent 77815ce
commit 856a566
Show file tree

Hide file tree

Showing 28 changed files with 653 additions and 358 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>de.mossgrabers</groupId>
   <artifactId>DrivenByMoss</artifactId>
   <name>DrivenByMoss</name>
-  <version>23.2.3</version>
+  <version>24.0.0</version>
   <licenses>
     <license>
       <name>LGPL-2.1-or-later</name>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>DrivenByMoss</artifactId>
 	<packaging>jar</packaging>
 	<name>DrivenByMoss</name>
-	<version>23.2.3</version>
+	<version>24.0.0</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>

diff --git a/src/main/java/de/mossgrabers/bitwig/framework/daw/BrowserImpl.java b/src/main/java/de/mossgrabers/bitwig/framework/daw/BrowserImpl.java
@@ -4,6 +4,14 @@
 
 package de.mossgrabers.bitwig.framework.daw;
 
+import com.bitwig.extension.controller.api.BrowserFilterColumn;
+import com.bitwig.extension.controller.api.BrowserResultsItemBank;
+import com.bitwig.extension.controller.api.CursorBrowserResultItem;
+import com.bitwig.extension.controller.api.CursorDevice;
+import com.bitwig.extension.controller.api.CursorTrack;
+import com.bitwig.extension.controller.api.InsertionPoint;
+import com.bitwig.extension.controller.api.PopupBrowser;
+
 import de.mossgrabers.bitwig.framework.daw.data.BrowserColumnImpl;
 import de.mossgrabers.bitwig.framework.daw.data.BrowserColumnItemImpl;
 import de.mossgrabers.bitwig.framework.daw.data.ChannelImpl;
@@ -18,14 +26,6 @@
 import de.mossgrabers.framework.daw.data.IChannel;
 import de.mossgrabers.framework.daw.data.IItem;
 
-import com.bitwig.extension.controller.api.BrowserFilterColumn;
-import com.bitwig.extension.controller.api.BrowserResultsItemBank;
-import com.bitwig.extension.controller.api.CursorBrowserResultItem;
-import com.bitwig.extension.controller.api.CursorDevice;
-import com.bitwig.extension.controller.api.CursorTrack;
-import com.bitwig.extension.controller.api.InsertionPoint;
-import com.bitwig.extension.controller.api.PopupBrowser;
-
 
 /**
  * Provides access to the device, preset, sample, ... browser.
@@ -71,7 +71,8 @@ public BrowserImpl (final IHost host, final PopupBrowser browser, final CursorTr
 
         this.filterColumns = new BrowserFilterColumn []
         {
-            // TODO Remove this for the time being until the browser API gets adapted to Bitwig 5
+            // TODO API extension required - Remove this for the time being until the browser API
+            // gets adapted to Bitwig 5
             // this.browser.smartCollectionColumn (),
             this.browser.locationColumn (),
             this.browser.fileTypeColumn (),
@@ -149,7 +150,8 @@ public void nextContentType ()
     public String getSelectedContentType ()
     {
         return "Result";
-        // TODO Currently not working in Bitwig 5, requires adaption to the new browser
+        // TODO API extension required - Currently not working in Bitwig 5, requires adaption to the
+        // new browser
         // return this.browser.selectedContentTypeName ().get ();
     }
 

diff --git a/src/main/java/de/mossgrabers/bitwig/framework/hardware/HwLightImpl.java b/src/main/java/de/mossgrabers/bitwig/framework/hardware/HwLightImpl.java
@@ -45,13 +45,6 @@ public HwLightImpl (final IHost host, final MultiStateHardwareLight hardwareLigh
         final ObjectHardwareProperty<InternalHardwareLightState> state = hardwareLight.state ();
         state.setValueSupplier (valueSupplier);
         state.onUpdateHardware (hardwareUpdater);
-
-        // TODO Test with next BW Update
-        // hardwareLight.setColorToStateFunction (color -> {
-        //
-        // return new EncodedColorLightState (-1, null);
-        //
-        // });
     }
 
 

diff --git a/src/main/java/de/mossgrabers/controller/oxi/one/OxiOneConfiguration.java b/src/main/java/de/mossgrabers/controller/oxi/one/OxiOneConfiguration.java
@@ -11,6 +11,7 @@
 import de.mossgrabers.framework.configuration.ISettingsUI;
 import de.mossgrabers.framework.controller.valuechanger.IValueChanger;
 import de.mossgrabers.framework.daw.IHost;
+import de.mossgrabers.framework.daw.constants.Capability;
 import de.mossgrabers.framework.daw.midi.ArpeggiatorMode;
 
 
@@ -72,13 +73,21 @@ public void init (final ISettingsUI globalSettings, final ISettingsUI documentSe
 
         this.activateBehaviourOnStopSetting (globalSettings);
         this.activateBehaviourOnPauseSetting (globalSettings);
+        this.activateRecordButtonSetting (globalSettings);
+        this.activateShiftedRecordButtonSetting (globalSettings);
 
         ///////////////////////////
         // Play and Sequence
 
         this.activateQuantizeAmountSetting (globalSettings);
         this.activateMidiEditChannelSetting (documentSettings);
 
+        ///////////////////////////
+        // Drum Sequencer
+
+        if (this.host.supports (Capability.HAS_DRUM_DEVICE))
+            this.activateTurnOffEmptyDrumPadsSetting (globalSettings);
+
         ///////////////////////////
         // Workflow
 

diff --git a/src/main/java/de/mossgrabers/controller/oxi/one/OxiOneControllerDefinition.java b/src/main/java/de/mossgrabers/controller/oxi/one/OxiOneControllerDefinition.java
@@ -21,6 +21,7 @@ public class OxiOneControllerDefinition extends DefaultControllerDefinition
 {
     private static final UUID EXTENSION_ID = UUID.fromString ("85593F1C-52FD-423F-BCAC-80D90EEB9ACA");
 
+
     /**
      * Constructor.
      */