Skip to content

Commit 270158a

Browse files
committed
* Push
* New: Support for the Push 3 encoder in Scene display mode. * New: Push 2/3: selected notes in clip note view are now drawn darker. * Fixed: The play position was not drawn correctly in sequencer mode. * Fixed: Push 2/3 - List elements (Scale and Browser mode) were using black text on black background.
1 parent bdd3088 commit 270158a

30 files changed

+178
-57
lines changed

DrivenByMoss-Manual.pdf

1.63 KB
Binary file not shown.

dependency-reduced-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>de.mossgrabers</groupId>
55
<artifactId>DrivenByMoss</artifactId>
66
<name>DrivenByMoss</name>
7-
<version>21.3.0</version>
7+
<version>21.4.0</version>
88
<licenses>
99
<license>
1010
<name>LGPL-2.1-or-later</name>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>DrivenByMoss</artifactId>
77
<packaging>jar</packaging>
88
<name>DrivenByMoss</name>
9-
<version>21.3.0</version>
9+
<version>21.4.0</version>
1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
</properties>

src/main/java/de/mossgrabers/bitwig/framework/daw/ClipLauncherNavigatorImpl.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
*/
2626
public class ClipLauncherNavigatorImpl implements IClipLauncherNavigator
2727
{
28+
private final ControllerHost host;
2829
private final IModel model;
2930
private final CursorTrack cursorTrack;
3031
private final ClipLauncherSlot theClip;
@@ -41,6 +42,7 @@ public class ClipLauncherNavigatorImpl implements IClipLauncherNavigator
4142
*/
4243
ClipLauncherNavigatorImpl (final ControllerHost host, final IModel model)
4344
{
45+
this.host = host;
4446
this.model = model;
4547

4648
this.singleTrackBank = host.createTrackBank (1, 0, 1);
@@ -57,9 +59,10 @@ public class ClipLauncherNavigatorImpl implements IClipLauncherNavigator
5759
final ISceneBank isceneBank = this.model.getSceneBank ();
5860
final int pageSize = isceneBank.getPageSize ();
5961
final int scrollPosition = isceneBank.getScrollPosition ();
60-
final int newPosition = (position / pageSize) * pageSize;
62+
final int newPosition = position / pageSize * pageSize;
6163
if (scrollPosition != newPosition)
6264
isceneBank.scrollTo (newPosition);
65+
isceneBank.getItem (position % pageSize).select ();
6366
});
6467

6568
this.sceneBank = this.singleTrackBank.sceneBank ();
@@ -72,20 +75,21 @@ public class ClipLauncherNavigatorImpl implements IClipLauncherNavigator
7275
@Override
7376
public void navigateScenes (final boolean isLeft)
7477
{
75-
if (isLeft)
76-
this.sceneBank.scrollBackwards ();
77-
else
78-
this.sceneBank.scrollForwards ();
79-
this.theClip.select ();
80-
this.theClip.showInEditor ();
78+
this.navigateClips (isLeft);
79+
this.host.scheduleTask ( () -> this.sceneBank.getItemAt (0).selectInEditor (), 100);
8180
}
8281

8382

8483
/** {@inheritDoc} */
8584
@Override
8685
public void navigateClips (final boolean isLeft)
8786
{
88-
this.navigateScenes (isLeft);
87+
if (isLeft)
88+
this.sceneBank.scrollBackwards ();
89+
else
90+
this.sceneBank.scrollForwards ();
91+
this.theClip.select ();
92+
this.theClip.showInEditor ();
8993
}
9094

9195

src/main/java/de/mossgrabers/bitwig/framework/daw/CursorClipImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ private NoteStep getNoteStep (final NotePosition notePosition)
12611261
*
12621262
* @return The clip
12631263
*/
1264-
private Clip getClip ()
1264+
public Clip getClip ()
12651265
{
12661266
return this.launcherClip;
12671267
}

src/main/java/de/mossgrabers/bitwig/framework/daw/StepInfoImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public void updateData (final NoteStep stepInfo)
6060
break;
6161
}
6262

63+
this.isSelected = stepInfo.isIsSelected ();
6364
this.isMuted = stepInfo.isMuted ();
6465
this.duration = stepInfo.duration ();
6566
this.velocity = stepInfo.velocity ();

src/main/java/de/mossgrabers/bitwig/framework/daw/TransportImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ public void changeLoopLength (final boolean increase, final boolean slow)
589589
@Override
590590
public double getLoopEnd ()
591591
{
592-
return getLoopStart () + this.transport.arrangerLoopDuration ().get ();
592+
return this.getLoopStart () + this.transport.arrangerLoopDuration ().get ();
593593
}
594594

595595

src/main/java/de/mossgrabers/controller/ableton/push/Push3ControllerDefinition.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public class Push3ControllerDefinition extends DefaultControllerDefinition
3131
/** Push 3 USB display endpoint. */
3232
private static final byte ENDPOINT_ADDRESS = (byte) 0x01;
3333

34+
3435
/**
3536
* Constructor.
3637
*/

src/main/java/de/mossgrabers/controller/ableton/push/PushConfiguration.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,7 +1309,7 @@ public int getPedal1 ()
13091309

13101310
/**
13111311
* Set use CV output or foot switch 1.
1312-
*
1312+
*
13131313
* @param pedal 0 = Footswitch, 1 = CV Out
13141314
*/
13151315
public void setPedal1 (final int pedal)
@@ -1342,7 +1342,7 @@ public int getPedal2 ()
13421342

13431343
/**
13441344
* Set use CV output or foot switch 1.
1345-
*
1345+
*
13461346
* @param pedal 0 = Footswitch, 1 = CV Out
13471347
*/
13481348
public void setPedal2 (final int pedal)
@@ -1477,7 +1477,7 @@ public int getPreamp2Gain ()
14771477

14781478
/**
14791479
* Set the gain for pre-amp 2.
1480-
*
1480+
*
14811481
* @param preampGain The gain
14821482
*/
14831483
public void setPreamp2Gain (final int preampGain)
@@ -1500,7 +1500,7 @@ public void changePreamp2Gain (final int control)
15001500

15011501
/**
15021502
* Get the index of the audio output configuration.
1503-
*
1503+
*
15041504
* @return The configuration index
15051505
*/
15061506
public int getAudioOutputs ()
@@ -1511,7 +1511,7 @@ public int getAudioOutputs ()
15111511

15121512
/**
15131513
* Set the output configuration.
1514-
*
1514+
*
15151515
* @param audioOutputs The index of the audio output configuration to set
15161516
*/
15171517
public void setAudioOutputs (final int audioOutputs)

src/main/java/de/mossgrabers/controller/ableton/push/controller/PushControlSurface.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ public PushControlSurface (final IHost host, final ColorManager colorManager, fi
490490

491491
this.notifyViewChange = false;
492492

493-
if (this.padGrid instanceof PushPadGrid pushPadGrid)
493+
if (this.padGrid instanceof final PushPadGrid pushPadGrid)
494494
pushPadGrid.setSurface (this);
495495

496496
for (int i = 0; i < this.colorPalette.length; i++)
@@ -553,9 +553,7 @@ protected void handleMidi (final int status, final int data1, final int data2)
553553
// Ignore MPE messages
554554
if (channel > 0)
555555
{
556-
if (code == MidiConstants.CMD_CC && data1 == 74)
557-
return;
558-
if (code == MidiConstants.CMD_PITCHBEND)
556+
if ((code == MidiConstants.CMD_CC && data1 == 74) || (code == MidiConstants.CMD_PITCHBEND))
559557
return;
560558
}
561559
}

0 commit comments

Comments
 (0)