* Added reading support for S5000/S6000 AKP format.

* User Interface
  * Moved several setting to a specific Settings dialog.
  * Updated button icons.
* Fixed: Tuning value was set for panning.
* Kontakt
  * Fixed: Tuning was not written correctly.
* MPC Keygroups
  * New: Added an option to ignore loops

Author: git-moss

documentation/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Changes
 
-## 15.5.2 (unreleased)
+## 16.0.0
 
+* Added reading support for S5000/S6000 AKP format.
+* User Interface
+  * Moved several setting to a specific Settings dialog.
+  * Updated button icons.
+* Fixed: Tuning value was set for panning.
+* Kontakt
+  * Fixed: Tuning was not written correctly.
 * MPC Keygroups
   * New: Added an option to ignore loops
 

documentation/README-FORMATS.md

@@ -35,6 +35,7 @@ The following multi-sample formats are supported:
 - [1010music blackbox, tangerine, bitbox](#1010music-blackbox-tangerine-bitbox)
 - [Ableton Sampler](#ableton-sampler)
 - [Akai MPC Keygroups / Drum](#akai-mpc-keygroups--drum)
+- [Akai S5000/S6000](#akai-s5000s6000)
 - [Bitwig Multisample](#bitwig-multisample)
 - [CWITEC TX16Wx](#cwitec-tx16wx)
 - [DecentSampler](#decentsampler)
@@ -110,10 +111,20 @@ Restrictions are:
 * A round robin keygroup can only contain up to 4/8 layers (groups). An error is displayed in this case but the file is converted anyway.
 * Only 128 keygroups are allowed. An error is displayed in this case but the file is written anyway but might not be loadable.
 
+### Source Options
+
+* Ignore Loops: There are XPM files which do not contain loops but there related WAV files do (seems to happen with the MPC Autosampler). ConvertWithMoss uses the loops from the WAV files in that case. This might not be what you intended if a multi-sample should be one-shot. Enable this option to ignore the loops.
+
 ### Destination Options
 
 * Limit layers to: MPC Firmware 3.4 increased the number of possible layers in a keygroup to 8. This option allows you to choose between 4 (for older firmware revisions) or 8.
 
+## Akai S5000/S6000
+
+This format uses a chunk based binary format with the ending AKP. It supports up to 99 key-groups. A key-group covers a note range with up to 4 velocity layers. AKM files are a multi configuration of up to 32 AKP preset files. The AKP files are only referenced from the AKM. Available parameters are the MIDI channel, panning, volume and key-range.
+AKP files are used if destination is Preset or Preset Library. AKM files are used if destination is Performance or Performance Library. 
+Only reading of the AKP/AKM formats is supported.
+
 ## Bitwig Multisample
 
 This open format is currently supported by the stock sampler in Bitwig Studio and Presonus Studio One. A multisample file is a zip archive which contains all samples in WAV format and a metadata file in XML format.

documentation/SupportedFeaturesSampleFormats.ods

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.mossgrabers</groupId>
 	<artifactId>convertwithmoss</artifactId>
-	<version>15.5.2</version>
+	<version>16.0.0</version>
 	<packaging>jar</packaging>
 	<name>ConvertWithMoss</name>
 	<organization>
@@ -31,11 +31,7 @@
 	</repositories>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.openjfx</groupId>
-			<artifactId>javafx-controls</artifactId>
-			<version>25.0.2</version>
-		</dependency>
+		<!-- Audio file support -->
 		<dependency>
 			<groupId>com.github.trilarion</groupId>
 			<artifactId>java-vorbis-support</artifactId>
@@ -45,17 +41,30 @@
 			<groupId>com.io7m.flannel</groupId>
 			<artifactId>com.io7m.flannel.core</artifactId>
 			<version>1.0.0</version>
-		</dependency>		
+		</dependency>
+		<!-- Command line support -->		
 		<dependency>
 			<groupId>info.picocli</groupId>
 			<artifactId>picocli</artifactId>
 			<version>4.7.7</version>
 		</dependency>
+		<!-- User interface support -->		
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-controls</artifactId>
+			<version>25.0.2</version>
+		</dependency>
 		<dependency>
 			<artifactId>uitools</artifactId>
 			<groupId>de.mossgrabers</groupId>
 			<version>2.0.1</version>
 		</dependency>
+		<!-- JSON support -->		
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.21.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>

icons/Analyse.pdn

@@ -22,8 +22,9 @@
 import de.mossgrabers.convertwithmoss.file.CSVRenameFile;
 import de.mossgrabers.convertwithmoss.format.ableton.AbletonCreator;
 import de.mossgrabers.convertwithmoss.format.ableton.AbletonDetector;
-import de.mossgrabers.convertwithmoss.format.akai.MPCKeygroupCreator;
-import de.mossgrabers.convertwithmoss.format.akai.MPCKeygroupDetector;
+import de.mossgrabers.convertwithmoss.format.akai.mpc.xpm.MPCKeygroupCreator;
+import de.mossgrabers.convertwithmoss.format.akai.mpc.xpm.MPCKeygroupDetector;
+import de.mossgrabers.convertwithmoss.format.akai.s5000.S5000Detector;
 import de.mossgrabers.convertwithmoss.format.bitwig.BitwigMultisampleCreator;
 import de.mossgrabers.convertwithmoss.format.bitwig.BitwigMultisampleDetector;
 import de.mossgrabers.convertwithmoss.format.decentsampler.DecentSamplerCreator;
@@ -105,6 +106,8 @@ public ConverterBackend (final INotifier notifier)
             new Music1010Detector (notifier),
             new AbletonDetector (notifier),
             new MPCKeygroupDetector (notifier),
+            // TODO new XtyDetector (notifier),
+            new S5000Detector (notifier),
             new BitwigMultisampleDetector (notifier),
             new TX16WxDetector (notifier),
             new DecentSamplerDetector (notifier),

icons/Analyse.png

@@ -36,14 +36,15 @@
 import de.mossgrabers.convertwithmoss.core.model.ISampleZone;
 import de.mossgrabers.convertwithmoss.core.settings.WavChunkSettingsUI;
 import de.mossgrabers.convertwithmoss.file.AudioFileUtils;
-import de.mossgrabers.convertwithmoss.file.riff.RiffID;
+import de.mossgrabers.convertwithmoss.file.riff.CommonRiffChunkId;
 import de.mossgrabers.convertwithmoss.file.wav.BroadcastAudioExtensionChunk;
 import de.mossgrabers.convertwithmoss.file.wav.DataChunk;
 import de.mossgrabers.convertwithmoss.file.wav.FormatChunk;
 import de.mossgrabers.convertwithmoss.file.wav.InstrumentChunk;
 import de.mossgrabers.convertwithmoss.file.wav.SampleChunk;
 import de.mossgrabers.convertwithmoss.file.wav.SampleChunk.SampleChunkLoop;
 import de.mossgrabers.convertwithmoss.file.wav.WaveFile;
+import de.mossgrabers.convertwithmoss.file.wav.WaveRiffChunkId;
 import de.mossgrabers.tools.XMLUtils;
 
 
@@ -283,7 +284,7 @@ private void rewriteFile (final IMetadata metadata, final ISampleZone zone, fina
         if (this.settingsConfiguration.isUpdateSampleChunk ())
             updateSampleChunk (zone, wavFile, unityNote);
         if (this.settingsConfiguration.isRemoveJunkChunks ())
-            wavFile.removeChunks (RiffID.JUNK_ID, RiffID.JUNK2_ID, RiffID.FILLER_ID, RiffID.MD5_ID);
+            wavFile.removeChunks (CommonRiffChunkId.JUNK_ID, CommonRiffChunkId.JUNK2_ID, WaveRiffChunkId.FILLER_ID, WaveRiffChunkId.MD5_ID);
 
         wavFile.write (outputStream);
     }

pom.xml

@@ -232,7 +232,7 @@ private void handlePerformanceFile (final File file)
     {
         try
         {
-            final List<IPerformanceSource> performances = this.readPerformanceFiles (file);
+            final List<IPerformanceSource> performances = this.readPerformanceFile (file);
             if (performances.isEmpty () || this.waitForDelivery ())
                 return;
 
@@ -268,7 +268,7 @@ private void handlePerformanceFile (final File file)
      * @param sourceFile The file to process
      * @return The parsed performance(s)
      */
-    protected List<IPerformanceSource> readPerformanceFiles (final File sourceFile)
+    protected List<IPerformanceSource> readPerformanceFile (final File sourceFile)
     {
         throw new RuntimeException (this.getClass ().getName () + " does not support Performance files.");
     }

src/main/java/de/mossgrabers/convertwithmoss/core/ConverterBackend.java

@@ -549,7 +549,7 @@ public void fillMetadata (final ISampleZone other)
         this.velocityCrossfadeLow = other.getVelocityCrossfadeLow ();
         this.velocityCrossfadeHigh = other.getVelocityCrossfadeHigh ();
         this.gain = other.getGain ();
-        this.panning = other.getTuning ();
+        this.panning = other.getPanning ();
         this.tune = other.getTuning ();
         this.keyTracking = other.getKeyTracking ();
         this.bendUp = other.getBendUp ();