* Electra One

  * Fixed: The first page (mixer) was not selected on startup, which means that if a different one was selected it did not work.
  * Fixed: The 'Behaviour on Pause' setting was completely ignored.
* Native Instruments Kontrol Mk3
  * Fixed: Names in different mix modes are reduced to 1 line to fix overflow of the graphics.

Author: git-moss

DrivenByMoss-Manual.pdf

@@ -4,16 +4,17 @@
 
 package de.mossgrabers.controller.electra.one.mode;
 
+import java.util.Optional;
+
 import de.mossgrabers.controller.electra.one.ElectraOneConfiguration;
 import de.mossgrabers.controller.electra.one.controller.ElectraOneColorManager;
 import de.mossgrabers.controller.electra.one.controller.ElectraOneControlSurface;
+import de.mossgrabers.framework.command.trigger.transport.PlayCommand;
 import de.mossgrabers.framework.controller.ButtonID;
 import de.mossgrabers.framework.daw.IModel;
 import de.mossgrabers.framework.daw.data.ICursorDevice;
 import de.mossgrabers.framework.mode.track.DefaultTrackMode;
 
-import java.util.Optional;
-
 
 /**
  * Abstract base mode for all Electra One modes.
@@ -22,7 +23,8 @@
  */
 public abstract class AbstractElectraOneMode extends DefaultTrackMode<ElectraOneControlSurface, ElectraOneConfiguration>
 {
-    protected final PageCache pageCache;
+    protected final PlayCommand<ElectraOneControlSurface, ElectraOneConfiguration> playCommand;
+    protected final PageCache                                                      pageCache;
 
 
     /**
@@ -37,6 +39,7 @@ protected AbstractElectraOneMode (final int pageIndex, final String name, final
     {
         super (name, surface, model, false, ElectraOneControlSurface.KNOB_IDS);
 
+        this.playCommand = new PlayCommand<> (model, surface);
         this.pageCache = new PageCache (pageIndex, surface);
     }
 

src/main/java/de/mossgrabers/controller/electra/one/mode/AbstractElectraOneMode.java

@@ -120,7 +120,7 @@ public void onButton (final int row, final int column, final ButtonEvent event)
                         this.model.getTransport ().startRecording ();
                         break;
                     case 5:
-                        this.model.getTransport ().play ();
+                        this.playCommand.execute (ButtonEvent.UP, 127);
                         break;
                     default:
                         // Not used

src/main/java/de/mossgrabers/controller/electra/one/mode/DeviceMode.java

@@ -4,6 +4,8 @@
 
 package de.mossgrabers.controller.electra.one.mode;
 
+import java.util.Optional;
+
 import de.mossgrabers.controller.electra.one.controller.ElectraOneColorManager;
 import de.mossgrabers.controller.electra.one.controller.ElectraOneControlSurface;
 import de.mossgrabers.framework.daw.IModel;
@@ -23,8 +25,6 @@
 import de.mossgrabers.framework.utils.ButtonEvent;
 import de.mossgrabers.framework.utils.StringUtils;
 
-import java.util.Optional;
-
 
 /**
  * The equalizer mode.
@@ -104,7 +104,7 @@ public void onButton (final int row, final int column, final ButtonEvent event)
                     break;
                 // Play
                 case 5:
-                    this.transport.play ();
+                    this.playCommand.execute (ButtonEvent.UP, 127);
                     break;
 
                 default:

src/main/java/de/mossgrabers/controller/electra/one/mode/EqualizerMode.java

@@ -87,7 +87,7 @@ public void onButton (final int row, final int column, final ButtonEvent event)
                     break;
                 // Play
                 case 5:
-                    this.transport.play ();
+                    this.playCommand.execute (ButtonEvent.UP, 127);
                     break;
 
                 default:

src/main/java/de/mossgrabers/controller/electra/one/mode/MixerMode.java

@@ -95,7 +95,7 @@ public void onButton (final int row, final int column, final ButtonEvent event)
 
             case 5:
                 if (column == 5)
-                    this.transport.play ();
+                    this.playCommand.execute (ButtonEvent.UP, 127);
                 break;
 
             default:

src/main/java/de/mossgrabers/controller/electra/one/mode/ProjectTrackMode.java

@@ -91,7 +91,7 @@ public void onButton (final int row, final int index, final ButtonEvent event)
                 break;
             // Play
             case 5:
-                this.transport.play ();
+                this.playCommand.execute (ButtonEvent.UP, 127);
                 break;
 
             default:

src/main/java/de/mossgrabers/controller/electra/one/mode/SendsMode.java

@@ -143,7 +143,7 @@ public void onButton (final int row, final int index, final ButtonEvent event)
                     break;
                 // Play
                 case 5:
-                    this.transport.play ();
+                    this.playCommand.execute (ButtonEvent.UP, 127);
                     break;
 
                 default:

src/main/java/de/mossgrabers/controller/electra/one/mode/SessionMode.java

@@ -197,7 +197,7 @@ else if (column < 5)
                         this.launchMarkers = !this.launchMarkers;
                         break;
                     case 5:
-                        this.transport.play ();
+                        this.playCommand.execute (ButtonEvent.UP, 127);
                         break;
                     default:
                         // Not used

src/main/java/de/mossgrabers/controller/electra/one/mode/TransportMode.java

@@ -103,7 +103,6 @@ public class KontrolProtocolControllerSetup extends AbstractControllerSetup<Kont
 
     private ModeMultiSelectCommand<KontrolProtocolControlSurface, KontrolProtocolConfiguration> switcher;
     private final int                                                                           version;
-    private String                                                                              kompleteInstance      = "";
     private long                                                                                lastTriggerTime       = -1;
 
 
@@ -143,19 +142,9 @@ public void init ()
     @Override
     public void flush ()
     {
-        final KontrolProtocolControlSurface surface = this.getSurface ();
-
         // Do not flush until handshake has finished
-        if (!surface.isConnectedToNIHIA ())
-            return;
-
-        final String kompleteInstanceNew = this.getKompleteInstance ();
-        if (!this.kompleteInstance.equals (kompleteInstanceNew))
-        {
-            this.kompleteInstance = kompleteInstanceNew;
-            surface.sendKontrolSysEx (KontrolProtocolControlSurface.SYSEX_TRACK_INSTANCE, 0, 0, kompleteInstanceNew);
-        }
-        super.flush ();
+        if (this.getSurface ().isConnectedToNIHIA ())
+            super.flush ();
     }
 
 
@@ -572,19 +561,6 @@ public void startup ()
     }
 
 
-    /**
-     * Get the name of an Komplete Kontrol instance on the current track.
-     *
-     * @return The instance name, which is the actual label of the first parameter (e.g. NIKB01). An
-     *         empty string if none is present
-     */
-    private String getKompleteInstance ()
-    {
-        final ISpecificDevice kkDevice = this.model.getSpecificDevice (DeviceID.NI_KOMPLETE);
-        return kkDevice.doesExist () ? kkDevice.getID () : "";
-    }
-
-
     // This is encoder left/right
     private void moveTrack (final ButtonEvent event, final boolean isLeft)
     {