Skip to content

Commit 50c70d5

Browse files
git-mossgit-moss
committed
Release of 24.5.1.
1 parent 93089a1 commit 50c70d5

File tree

33 files changed

+219
-59
lines changed

33 files changed

+219
-59
lines changed

‎DrivenByMoss-Manual.pdf‎

2.11 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>24.5.0</version>
7+
<version>24.5.1</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>24.5.0</version>
9+
<version>24.5.1</version>
1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
</properties>

‎src/main/java/de/mossgrabers/bitwig/framework/daw/ModelImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ public ModelImpl (final ModelSetup modelSetup, final DataSetup dataSetup, final
187187
final DeviceMatcher vst2DeviceMatcher = controllerHost.createVST2DeviceMatcher (KompleteDevice.VST2_KOMPLETE_ID);
188188
final DeviceMatcher vst3DeviceMatcher = controllerHost.createVST3DeviceMatcher (KompleteDevice.VST3_KOMPLETE_ID);
189189
final DeviceMatcher vst3Kontakt7DeviceMatcher = controllerHost.createVST3DeviceMatcher (KompleteDevice.VST3_KONTAKT_7_ID);
190-
final Device kompleteDevice = this.createDevice (controllerHost.createOrDeviceMatcher (vst2DeviceMatcher, vst3DeviceMatcher, vst3Kontakt7DeviceMatcher));
190+
final DeviceMatcher vst3Kontakt8DeviceMatcher = controllerHost.createVST3DeviceMatcher (KompleteDevice.VST3_KONTAKT_8_ID);
191+
final Device kompleteDevice = this.createDevice (controllerHost.createOrDeviceMatcher (vst2DeviceMatcher, vst3DeviceMatcher, vst3Kontakt7DeviceMatcher, vst3Kontakt8DeviceMatcher));
191192
specificDevice = new KompleteDevice (this.host, this.valueChanger, kompleteDevice);
192193
break;
193194

‎src/main/java/de/mossgrabers/bitwig/framework/daw/data/KompleteDevice.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,13 @@ public class KompleteDevice extends SpecificDeviceImpl
2525
public static final String VST3_KOMPLETE_ID = "5653544E694B4B6B6F6D706C65746520";
2626
/** The ID of the Konktakt 7 VST3 plugin. */
2727
public static final String VST3_KONTAKT_7_ID = "5653544E694B376B6F6E74616B742037";
28+
/** The ID of the Konktakt 8 VST3 plugin. */
29+
public static final String VST3_KONTAKT_8_ID = "5653544E694B386B6F6E74616B742038";
2830

2931
private final Parameter nikbVst2;
3032
private final Parameter nikbVst3;
3133
private final Parameter nikbVst3Kontakt7;
34+
private final Parameter nikbVst3Kontakt8;
3235

3336

3437
/**
@@ -56,6 +59,11 @@ public KompleteDevice (final IHost host, final IValueChanger valueChanger, final
5659
this.nikbVst3Kontakt7 = specificDevice.createParameter (2048);
5760
this.nikbVst3Kontakt7.exists ().markInterested ();
5861
this.nikbVst3Kontakt7.name ().markInterested ();
62+
63+
specificDevice = device.createSpecificVst3Device (VST3_KONTAKT_8_ID);
64+
this.nikbVst3Kontakt8 = specificDevice.createParameter (2048);
65+
this.nikbVst3Kontakt8.exists ().markInterested ();
66+
this.nikbVst3Kontakt8.name ().markInterested ();
5967
}
6068

6169

@@ -69,6 +77,8 @@ public String getID ()
6977
return this.nikbVst3.name ().get ();
7078
if (this.nikbVst3Kontakt7.exists ().get ())
7179
return this.nikbVst3Kontakt7.name ().get ();
80+
if (this.nikbVst3Kontakt8.exists ().get ())
81+
return this.nikbVst3Kontakt8.name ().get ();
7282
return "";
7383
}
7484
}

‎src/main/java/de/mossgrabers/bitwig/framework/daw/data/SlotImpl.java‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
package de.mossgrabers.bitwig.framework.daw.data;
66

7+
import com.bitwig.extension.controller.api.ClipLauncherSlot;
8+
import com.bitwig.extension.controller.api.ColorValue;
9+
710
import de.mossgrabers.framework.controller.color.ColorEx;
811
import de.mossgrabers.framework.daw.data.AbstractItemImpl;
912
import de.mossgrabers.framework.daw.data.ISlot;
1013
import de.mossgrabers.framework.daw.data.ITrack;
1114
import de.mossgrabers.framework.observer.IValueObserver;
1215

13-
import com.bitwig.extension.controller.api.ClipLauncherSlot;
14-
import com.bitwig.extension.controller.api.ColorValue;
15-
1616

1717
/**
1818
* Encapsulates the data of a slot.
@@ -129,6 +129,15 @@ public boolean hasContent ()
129129
}
130130

131131

132+
/** {@inheritDoc} */
133+
@Override
134+
public boolean isMuted ()
135+
{
136+
// Info not available via the API
137+
return false;
138+
}
139+
140+
132141
/** {@inheritDoc} */
133142
@Override
134143
public boolean isRecording ()

‎src/main/java/de/mossgrabers/controller/ableton/push/view/SessionView.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,16 @@ public SessionView (final PushControlSurface surface, final IModel model)
4545
final int white = isPush2 ? PushColorManager.PUSH2_COLOR2_WHITE : PushColorManager.PUSH1_COLOR2_WHITE;
4646
final int green = isPush2 ? PushColorManager.PUSH2_COLOR2_GREEN : PushColorManager.PUSH1_COLOR2_GREEN;
4747
final int amber = isPush2 ? PushColorManager.PUSH2_COLOR2_AMBER : PushColorManager.PUSH1_COLOR2_AMBER;
48+
final int grey = isPush2 ? PushColorManager.PUSH2_COLOR2_GREY_LO : PushColorManager.PUSH1_COLOR2_GREY_LO;
4849
final LightInfo isRecording = new LightInfo (redHi, redHi, false);
4950
final LightInfo isRecordingQueued = new LightInfo (redHi, black, true);
5051
final LightInfo isPlaying = new LightInfo (green, green, false);
5152
final LightInfo isPlayingQueued = new LightInfo (green, green, true);
5253
final LightInfo hasContent = new LightInfo (amber, white, false);
5354
final LightInfo noContent = new LightInfo (black, -1, false);
5455
final LightInfo recArmed = new LightInfo (redLo, -1, false);
55-
this.setColors (isRecording, isRecordingQueued, isPlaying, isPlayingQueued, hasContent, noContent, recArmed);
56+
final LightInfo isMuted = new LightInfo (grey, -1, false);
57+
this.setColors (isRecording, isRecordingQueued, isPlaying, isPlayingQueued, hasContent, noContent, recArmed, isMuted);
5658

5759
this.birdColorHasContent = new LightInfo (amber, -1, false);
5860
this.birdColorSelected = isPlaying;

‎src/main/java/de/mossgrabers/controller/akai/apc/view/SessionView.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ public SessionView (final APCControlSurface surface, final IModel model)
4646
final LightInfo hasContent = new LightInfo (APCColorManager.APC_MKII_COLOR_AMBER, APCColorManager.APC_MKII_COLOR_WHITE, false);
4747
final LightInfo noContent = new LightInfo (APCColorManager.APC_MKII_COLOR_BLACK, -1, false);
4848
final LightInfo recArmed = new LightInfo (APCColorManager.APC_MKII_COLOR_RED_LO, -1, false);
49-
this.setColors (isRecording, isRecordingQueued, isPlaying, isPlayingQueued, hasContent, noContent, recArmed);
49+
final LightInfo isMuted = new LightInfo (APCColorManager.APC_MKII_COLOR_GREY_LO, -1, false);
50+
this.setColors (isRecording, isRecordingQueued, isPlaying, isPlayingQueued, hasContent, noContent, recArmed, isMuted);
5051
}
5152
else
5253
{
@@ -57,7 +58,8 @@ public SessionView (final APCControlSurface surface, final IModel model)
5758
final LightInfo hasContent = new LightInfo (APCColorManager.APC_COLOR_YELLOW, APCColorManager.APC_COLOR_YELLOW_BLINK, false);
5859
final LightInfo noContent = new LightInfo (APCColorManager.APC_COLOR_BLACK, -1, false);
5960
final LightInfo recArmed = new LightInfo (APCColorManager.APC_COLOR_BLACK, -1, false);
60-
this.setColors (isRecording, isRecordingQueued, isPlaying, isPlayingQueued, hasContent, noContent, recArmed);
61+
final LightInfo isMuted = new LightInfo (APCColorManager.APC_COLOR_BLACK, -1, false);
62+
this.setColors (isRecording, isRecordingQueued, isPlaying, isPlayingQueued, hasContent, noContent, recArmed, isMuted);
6163
}
6264
}
6365

‎src/main/java/de/mossgrabers/controller/akai/apcmini/view/SessionView.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ public SessionView (final APCminiControlSurface surface, final IModel model, fin
5353
final LightInfo hasContent = new LightInfo (APCminiMk2ColorManager.ORANGE, APCminiMk2ColorManager.WHITE, false);
5454
final LightInfo noContent = new LightInfo (APCminiMk2ColorManager.BLACK, -1, false);
5555
final LightInfo recArmed = new LightInfo (APCminiMk2ColorManager.DARK_RED, -1, false);
56-
this.setColors (isRecording, isRecordingQueued, isPlaying, isPlayingQueued, hasContent, noContent, recArmed);
56+
final LightInfo isMuted = new LightInfo (APCminiMk2ColorManager.DARK_GRAY, -1, false);
57+
this.setColors (isRecording, isRecordingQueued, isPlaying, isPlayingQueued, hasContent, noContent, recArmed, isMuted);
5758
}
5859
else
5960
{
@@ -64,7 +65,8 @@ public SessionView (final APCminiControlSurface surface, final IModel model, fin
6465
final LightInfo hasContent = new LightInfo (APCminiMk1ColorManager.APC_COLOR_YELLOW, APCminiMk1ColorManager.APC_COLOR_YELLOW_BLINK, false);
6566
final LightInfo noContent = new LightInfo (APCminiMk1ColorManager.APC_COLOR_BLACK, -1, false);
6667
final LightInfo recArmed = new LightInfo (APCminiMk1ColorManager.APC_COLOR_BLACK, -1, false);
67-
this.setColors (isRecording, isRecordingQueued, isPlaying, isPlayingQueued, hasContent, noContent, recArmed);
68+
final LightInfo isMuted = new LightInfo (APCminiMk1ColorManager.APC_COLOR_BLACK, -1, false);
69+
this.setColors (isRecording, isRecordingQueued, isPlaying, isPlayingQueued, hasContent, noContent, recArmed, isMuted);
6870
}
6971
}
7072

‎src/main/java/de/mossgrabers/controller/akai/fire/view/SessionView.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public SessionView (final FireControlSurface surface, final IModel model)
4444
final LightInfo hasContent = new LightInfo (FireColorManager.FIRE_COLOR_ORANGE, FireColorManager.FIRE_COLOR_WHITE, false);
4545
final LightInfo noContent = new LightInfo (FireColorManager.FIRE_COLOR_BLACK, -1, false);
4646
final LightInfo recArmed = new LightInfo (FireColorManager.FIRE_COLOR_DARK_RED, -1, false);
47-
this.setColors (isRecording, isRecordingQueued, isPlaying, isPlayingQueued, hasContent, noContent, recArmed);
47+
final LightInfo isMuted = new LightInfo (FireColorManager.FIRE_COLOR_GRAY, -1, false);
48+
this.setColors (isRecording, isRecordingQueued, isPlaying, isPlayingQueued, hasContent, noContent, recArmed, isMuted);
4849

4950
this.birdColorHasContent = hasContent;
5051
this.birdColorSelected = isPlaying;

0 commit comments

Comments
 (0)