* Added support for reading Akai MPC XPJ and XTY files.

* Akai AKP/AKM
  * New: Renamed "Akai S5000/S6000" to "Akai AKP/AKM"
  * New: Added reading support for Akai Z4/Z8/MPC4000 AKP/AKM format.
  * New: Added version information to the log file.
  * New: Improved conversion of filter resonance.
  * New: The root note is now modified instead re-pitching it via tuning parameter.
* Akai XPM
  * Fixed: Never read loops from WAV files.
* SFZ
  * Fixed: Prevent creation of filter type with poles not supported by SFZ (2 poles will be set in such a case).

Author: git-moss

documentation/CHANGELOG.md

@@ -1,8 +1,22 @@
 # Changes
 
+## 16.1.0
+
+* Added support for reading Akai MPC XPJ and XTY files.
+* Akai AKP/AKM
+  * New: Renamed "Akai S5000/S6000" to "Akai AKP/AKM"
+  * New: Added reading support for Akai Z4/Z8/MPC4000 AKP/AKM format.
+  * New: Added version information to the log file.
+  * New: Improved conversion of filter resonance.
+  * New: The root note is now modified instead re-pitching it via tuning parameter.
+* Akai XPM
+  * Fixed: Never read loops from WAV files.
+* SFZ
+  * Fixed: Prevent creation of filter type with poles not supported by SFZ (2 poles will be set in such a case).
+
 ## 16.0.0
 
-* Added reading support for S5000/S6000 AKP format.
+* Added reading support for Akai S5000/S6000 AKP/AKM format.
 * User Interface
   * Moved several setting to a specific Settings dialog.
   * Updated button icons.

documentation/README-FORMATS.md

@@ -34,8 +34,9 @@ The following multi-sample formats are supported:
 - [1010music bento](#1010music-bento)
 - [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)
+- [Akai MPC Keygroups/Drum](#akai-mpc-keygroups--drum)
+- [Akai MPC Project/Track](#akai-mpc-projecttrack)
+- [Akai AKP/AKM (S5000/S6000/Z4/Z8/MPC4000)](#akai-akpakm-s5000s6000z4z8mpc4000)
 - [Bitwig Multisample](#bitwig-multisample)
 - [CWITEC TX16Wx](#cwitec-tx16wx)
 - [DecentSampler](#decentsampler)
@@ -113,13 +114,22 @@ Restrictions are:
 
 ### 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.
+* Ignore Loops: There are XPM files which do not contain loops but the 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
+## Akai MPC Project/Track
+
+A track file (*.xty) is a MPC v3 specific file that saves all settings, samples, macros, FX and MIDI data associated with a track. A track consists of two elements; the track file itself and a trackData folder containing the samples used within the track (ending with '_\[TrackData\]'). If the track contains a keygroup it is extracted as a multi-sample source.
+A project file (*.xpj) contains all track and project settings. All tracks which contain a keygroup are extracted as a multi-sample source.
+
+### Source Options
+
+* Ignore Loops: There are XPM files which do not contain loops but the 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.
+
+## Akai AKP/AKM (S5000/S6000/Z4/Z8/MPC4000)
 
 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. 

documentation/SupportedFeaturesSampleFormats.ods

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.mossgrabers</groupId>
 	<artifactId>convertwithmoss</artifactId>
-	<version>16.0.0</version>
+	<version>16.1.0</version>
 	<packaging>jar</packaging>
 	<name>ConvertWithMoss</name>
 	<organization>

pom.xml

@@ -24,7 +24,8 @@
 import de.mossgrabers.convertwithmoss.format.ableton.AbletonDetector;
 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.akai.mpc.xty.XtyDetector;
+import de.mossgrabers.convertwithmoss.format.akai.s5000.AkpDetector;
 import de.mossgrabers.convertwithmoss.format.bitwig.BitwigMultisampleCreator;
 import de.mossgrabers.convertwithmoss.format.bitwig.BitwigMultisampleDetector;
 import de.mossgrabers.convertwithmoss.format.decentsampler.DecentSamplerCreator;
@@ -105,9 +106,9 @@ public ConverterBackend (final INotifier notifier)
             new BentoDetector (notifier),
             new Music1010Detector (notifier),
             new AbletonDetector (notifier),
+            new AkpDetector (notifier),
             new MPCKeygroupDetector (notifier),
-            // TODO new XtyDetector (notifier),
-            new S5000Detector (notifier),
+            new XtyDetector (notifier),
             new BitwigMultisampleDetector (notifier),
             new TX16WxDetector (notifier),
             new DecentSamplerDetector (notifier),

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

@@ -170,15 +170,15 @@ default Map<IGroup, Integer> getRoundRobinGroups ()
 
     /**
      * Get the lowest key covered by a sample in all of the groups.
-     * 
+     *
      * @return The lowest playing key (0-127)
      */
     int getLowestKey ();
 
 
     /**
      * Get the highest key covered by a sample in all of the groups.
-     * 
+     *
      * @return The highest playing key (0-127)
      */
     int getHighestKey ();

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

@@ -236,7 +236,7 @@ private void handlePerformanceFile (final File file)
             if (performances.isEmpty () || this.waitForDelivery ())
                 return;
 
-            for (IPerformanceSource performance: performances)
+            for (final IPerformanceSource performance: performances)
             {
                 if (this.waitForDelivery ())
                     break;
@@ -629,7 +629,7 @@ protected void createMetadata (final IMetadata metadata, final IFileBasedSampleD
      */
     protected void createMetadata (final IMetadata metadata, final IFileBasedSampleData sampleData, final String [] parts, final String category)
     {
-        if (this.settingsConfiguration instanceof MetadataSettingsUI metadataSettings)
+        if (this.settingsConfiguration instanceof final MetadataSettingsUI metadataSettings)
         {
             metadata.detectMetadata (metadataSettings, parts, category);
             if (sampleData != null)

src/main/java/de/mossgrabers/convertwithmoss/core/detector/AbstractDetector.java

@@ -110,7 +110,7 @@ public int getClipKeyHigh ()
 
     /** {@inheritDoc} */
     @Override
-    public void setClipKeyHigh (int clipKeyHigh)
+    public void setClipKeyHigh (final int clipKeyHigh)
     {
         this.clipKeyHigh = clipKeyHigh;
     }
@@ -129,8 +129,8 @@ public void clipKeyRange ()
             final List<ISampleZone> filteredZones = new ArrayList<> ();
             for (final ISampleZone zone: group.getSampleZones ())
             {
-                int keyLow = zone.getKeyLow ();
-                int keyHigh = zone.getKeyHigh ();
+                final int keyLow = zone.getKeyLow ();
+                final int keyHigh = zone.getKeyHigh ();
                 // Fully outside -> remove
                 if (keyLow > this.clipKeyHigh || keyHigh < this.clipKeyLow)
                     continue;

src/main/java/de/mossgrabers/convertwithmoss/core/detector/DefaultInstrumentSource.java

@@ -282,10 +282,8 @@ public int getLowestKey ()
         int lowestKey = 127;
         for (final IGroup group: this.groups)
             for (final ISampleZone zone: group.getSampleZones ())
-            {
                 if (zone.getKeyLow () < lowestKey)
                     lowestKey = zone.getKeyLow ();
-            }
         return lowestKey;
     }
 
@@ -297,10 +295,8 @@ public int getHighestKey ()
         int highestKey = 0;
         for (final IGroup group: this.groups)
             for (final ISampleZone zone: group.getSampleZones ())
-            {
                 if (zone.getKeyHigh () > highestKey)
                     highestKey = zone.getKeyHigh ();
-            }
         return highestKey;
     }
 }

src/main/java/de/mossgrabers/convertwithmoss/core/detector/DefaultMultisampleSource.java

@@ -395,7 +395,7 @@ public interface ISampleZone
      *
      * @return The modulator, never null
      */
-    IEnvelopeModulator getPitchModulator ();
+    IEnvelopeModulator getPitchEnvelopeModulator ();
 
 
     /**