* 1010music format

  * New: Can be a destination format for Performances (see the manual for details).
  * New: Stereo-split samples are now combined (if possible) to stereo samples since the format does not support panning on a sample level.
* Kontakt
  * New: Kontakt 4.2-7: Pitchmodulation by Pitchbend and Amplitudemodulation by Velocity are now read.

Author: git-moss

documentation/CHANGELOG.md

@@ -1,12 +1,17 @@
 # Changes
 
-## 13.0.0 (unreleased)
+## 13.0.0
 
 * New: Rearranged the destination area of the user interface. There is now a new section which allows to switch between creating single patches, libraries containing multiple patches and performances which contain a certain configuration of patches (e.g. different MIDI channels). Output formats are filtered to the ones which support these options.
 * New: Improved maximum size of RIFF files that can be written.
 * Fixed: Envelope could be wrong if the input envelope uses the hold-time instead of decay-time and the output format does not support a hold-time.
+* Fixed: The logging does now always scroll fully to the end when the conversion or analysis process has finished.
+* 1010music format
+  * New: Can be a destination format for Performances (see the manual for details).
+  * New: Stereo-split samples are now combined (if possible) to stereo samples since the format does not support panning on a sample level.
 * Kontakt
-  * New: Kontakt can be an input format for Performances.
+  * New: Kontakt can be an input format for Performances (see the manual for details).
+  * New: Kontakt 4.2-7: Pitchmodulation by Pitchbend and Amplitudemodulation by Velocity are now read.
   * Fixed: Fixed crash with reading envelopes from NI-container.
 * Decent Sampler
   * New: Write: There are now templates for the UI and effect sections which can be modified as well as further resources can be added automatically. See the manual for more info.
@@ -20,8 +25,6 @@
   * New: The long name stored in the KMP is now set as the multi-samples name instead of the short filename.
 * SF2
   * New: Added support to write as library (adds all found source-multi-samples into 1 sf2 file).
-* Yamaha YSFC
-  * New: Can be a destination format for Performances.
 
 ## 12.2.2
 

documentation/README-FORMATS.md

@@ -66,6 +66,11 @@ If the format is selected as the source, there are two things to consider:
 * Option to set the *Interpolation Quality*. Setting it to *High* requires a bit more processing power on the 1010music devices.
 * Option to trim sample to range of zone start to end. Since the format does not support a sample start attribute for multi-sample, this fixes the issue.
 
+If 'Performance' is selected as the destination type, some workarounds are applied:
+
+* MIDI channel: There is no explicit OMNI setting. Instead, if MIDI channel 1 is selected on the device it acts as the OMNI channel, which means it is always sounding and renders MIDI channel 1 to be unusable. As a solution all MIDI channels are increased by 1 (channel 1 is 2, channel 2 is 3, ...) and channel 16 is set to Off. All instruments which have OMNI configured are set to channel 1.
+* Key ranges: The 1010music devices do not support key-ranges which means a multi-sample is always sounding across the full note range. As a workaround a silent sample (a totally empty one-shot sample is used) is applied to the lower and upper range which should not sound.
+
 ## Ableton Sampler
 
 Ableton uses a generic preset format (*.adv) for all of their devices. For combined rack presets another format (*.adg) is used. All their formats are XML documents which are compressed with the open GZIP algorithm.
@@ -155,7 +160,9 @@ A NKM file contains up to 64 instruments and is supported as well as a source.
 
 Encrypted files are not supported.
 
-If selected as a destination, a NKI file is written and all samples are placed in a sub-folder with the same name. 
+If selected as a destination, a NKI file is written and all samples are placed in a sub-folder with the same name.
+
+If selected as a source and 'Performance' is selected as the destination type, only NKM files are used as sources.
 
 ### Destination Options
 
@@ -320,11 +327,9 @@ Currently, the user and library formats of the Montage (not Montage M!) and MODX
 * A performance can contain up to 16 parts (e.g. to perform a song by muting, soloing parts via scenes)
 * A library contains several performances
 
-When creating presets or libraries as the destination type, each multi-sample source creates one performance with one active part. Each group of the the multi-sample source is assigned to 1 element for which 1 key-group is created as well which contains the samples. If there are more groups than elements, the remaining groups are all added to the last element. If there are no groups all samples will be assigned to key-group/element one.
-
-When creating (ConvertWithMoss) performances as the destination type, each performance source creates one (Yamaha) performance with one active part for each multi-sample (instrument) of the source. If there are more than 16 instruments in the source they are ignored. The rest of the mapping is identical to creating presets/libraries.
+**Destination Type: Preset or Library**
 
-Note: There are no checks that the created libraries stay in the boundaries of the workstation specifications (e.g. the number of the maximum allowed samples or the required memory size)!
+When creating presets or libraries as the destination type, each multi-sample source creates one performance with one active part. Each group of the the multi-sample source is assigned to 1 element for which 1 key-group is created as well which contains the samples. If there are more groups than elements, the remaining groups are all added to the last element. If there are no groups all samples will be assigned to key-group/element one.
 
 ### Source Options
 

documentation/SupportedFeaturesSampleFormats.ods

@@ -24,9 +24,29 @@ public interface IInstrumentSource extends ISource
      * Get the MIDI channel of the instrument.
      *
      * @return The MIDI channel in the range of [0..15], -1 and all other values are considered
-     *         omni/all
+     *         OMNI/all
      */
     int getMidiChannel ();
 
-    // TODO Do we need a key-range as well?
+
+    /**
+     * The lower note which should limit the key-range (this note should still sound).
+     * 
+     * @return The note [0..127]
+     */
+    int getClipKeyLow ();
+
+
+    /**
+     * The upper note which should limit the key-range (this note should still sound).
+     * 
+     * @return The note [0..127]
+     */
+    int getClipKeyHigh ();
+
+
+    /**
+     * Clip all samples (or remove them fully) if there are outside of the lower and upper key.
+     */
+    void clipKeyRange ();
 }

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

@@ -203,7 +203,7 @@ public static long calcCRC32 (final byte [] data)
 
 
     /**
-     * Converts a time in seconds into a normalized logarithmic value in the range [0..1].
+     * Converts a time in seconds into a normalized logarithmic value in the range [0..1000].
      *
      * @param value The value in seconds
      * @param maxValue The maximum for value
@@ -216,7 +216,7 @@ public static String normalizeTimeFormattedAsInt (final double value, final doub
 
 
     /**
-     * Converts a time in seconds into a normalized logarithmic value in the range [0..1],
+     * Converts a time in seconds into a normalized logarithmic value in the range [0..1000],
      * multiplies it with 1000 and converts it to an integer.
      *
      * @param value The value in seconds

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

@@ -16,6 +16,7 @@
 
 import de.mossgrabers.convertwithmoss.core.model.IAudioMetadata;
 import de.mossgrabers.convertwithmoss.core.model.IGroup;
+import de.mossgrabers.convertwithmoss.core.model.ISampleData;
 import de.mossgrabers.convertwithmoss.core.model.ISampleLoop;
 import de.mossgrabers.convertwithmoss.core.model.ISampleZone;
 import de.mossgrabers.convertwithmoss.core.model.implementation.DefaultGroup;
@@ -59,7 +60,10 @@ public static ZoneChannels detectChannelConfiguration (final List<IGroup> groups
         for (final IGroup group: groups)
             for (final ISampleZone sampleZone: group.getSampleZones ())
             {
-                final boolean isStereo = sampleZone.getSampleData ().getAudioMetadata ().getChannels () == 2;
+                final ISampleData sampleData = sampleZone.getSampleData ();
+                if (sampleData == null)
+                    continue;
+                final boolean isStereo = sampleData.getAudioMetadata ().getChannels () == 2;
                 if (stereo == null)
                 {
                     // First iteration, store if mono or stereo

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

@@ -15,6 +15,7 @@
 import java.nio.file.attribute.FileTime;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -37,6 +38,7 @@
 import de.mossgrabers.convertwithmoss.core.IMultisampleSource;
 import de.mossgrabers.convertwithmoss.core.INotifier;
 import de.mossgrabers.convertwithmoss.core.IPerformanceSource;
+import de.mossgrabers.convertwithmoss.core.ZoneChannels;
 import de.mossgrabers.convertwithmoss.core.model.IGroup;
 import de.mossgrabers.convertwithmoss.core.model.IMetadata;
 import de.mossgrabers.convertwithmoss.core.model.ISampleData;
@@ -590,6 +592,33 @@ protected List<File> writeSamples (final File sampleFolder, final IMultisampleSo
     }
 
 
+    /**
+     * Since panning is not working on the sample level, combine split stereo to stereo files If the
+     * combination fails, the file is created anyway but might contain wrong panning.
+     * 
+     * @param multisampleSource The multi-sample source
+     * @return The combined stereo group or the original groups if they could not be combined
+     * @throws IOException Could not combine the groups
+     */
+    protected List<IGroup> combineSplitStereo (final IMultisampleSource multisampleSource) throws IOException
+    {
+        final List<IGroup> groups = multisampleSource.getNonEmptyGroups (true);
+
+        if (ZoneChannels.detectChannelConfiguration (groups) != ZoneChannels.SPLIT_STEREO)
+            return groups;
+
+        final Optional<IGroup> stereoGroup = ZoneChannels.combineSplitStereo (groups);
+        if (stereoGroup.isPresent ())
+        {
+            this.notifier.log ("IDS_NOTIFY_COMBINED_TO_STEREO");
+            return Collections.singletonList (stereoGroup.get ());
+        }
+
+        this.notifier.logError ("IDS_NOTIFY_NOT_COMBINED_TO_STEREO");
+        return groups;
+    }
+
+
     /**
      * Create the name of the sample file.
      *

src/main/java/de/mossgrabers/convertwithmoss/core/creator/AbstractCreator.java

@@ -78,11 +78,11 @@ public void cancel ()
     protected void startDetection (final T detectorTask)
     {
         this.detectorTaskOptional = Optional.of (detectorTask);
-        detectorTask.setOnCancelled (event -> this.notifier.updateButtonStates (true));
-        detectorTask.setOnFailed (event -> this.notifier.updateButtonStates (true));
-        detectorTask.setOnSucceeded (event -> this.notifier.updateButtonStates (true));
-        detectorTask.setOnRunning (event -> this.notifier.updateButtonStates (false));
-        detectorTask.setOnScheduled (event -> this.notifier.updateButtonStates (false));
+        detectorTask.setOnCancelled (_ -> this.notifier.updateButtonStates (true));
+        detectorTask.setOnFailed (_ -> this.notifier.updateButtonStates (true));
+        detectorTask.setOnSucceeded (_ -> this.notifier.updateButtonStates (true));
+        detectorTask.setOnRunning (_ -> this.notifier.updateButtonStates (false));
+        detectorTask.setOnScheduled (_ -> this.notifier.updateButtonStates (false));
         this.executor.execute (detectorTask);
     }
 

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

@@ -298,7 +298,7 @@ protected void checkChildTags (final String tagName, final Set<String> supported
         {
             final String nodeName = childElement.getNodeName ();
             if (!supportedElements.contains (nodeName))
-                this.unsupportedElements.computeIfAbsent (tagName, tag -> new HashSet<> ()).add (nodeName);
+                this.unsupportedElements.computeIfAbsent (tagName, _ -> new HashSet<> ()).add (nodeName);
         }
     }
 
@@ -339,7 +339,7 @@ protected void checkAttributes (final String tagName, final NamedNodeMap attribu
         {
             final String nodeName = attributes.item (i).getNodeName ();
             if (!supportedAttributes.contains (nodeName))
-                this.unsupportedAttributes.computeIfAbsent (tagName, tag -> new HashSet<> ()).add (nodeName);
+                this.unsupportedAttributes.computeIfAbsent (tagName, _ -> new HashSet<> ()).add (nodeName);
         }
     }
 

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

@@ -4,8 +4,13 @@
 
 package de.mossgrabers.convertwithmoss.core.detector;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import de.mossgrabers.convertwithmoss.core.IInstrumentSource;
 import de.mossgrabers.convertwithmoss.core.IMultisampleSource;
+import de.mossgrabers.convertwithmoss.core.model.IGroup;
+import de.mossgrabers.convertwithmoss.core.model.ISampleZone;
 
 
 /**
@@ -15,8 +20,10 @@
  */
 public class DefaultInstrumentSource extends DefaultSource implements IInstrumentSource
 {
-    private final IMultisampleSource multisampleSource;
+    private IMultisampleSource multisampleSource;
     private int                midiChannel;
+    private int                clipKeyLow  = 0;
+    private int                clipKeyHigh = 127;
 
 
     /**
@@ -41,6 +48,17 @@ public IMultisampleSource getMultisampleSource ()
     }
 
 
+    /**
+     * Set the multi-sample source.
+     *
+     * @param multisampleSource The source
+     */
+    public void setMultisampleSource (final IMultisampleSource multisampleSource)
+    {
+        this.multisampleSource = multisampleSource;
+    }
+
+
     /** {@inheritDoc} */
     @Override
     public int getMidiChannel ()
@@ -59,4 +77,73 @@ public void setMidiChannel (final int midiChannel)
     {
         this.midiChannel = midiChannel;
     }
+
+
+    /** {@inheritDoc} */
+    @Override
+    public int getClipKeyLow ()
+    {
+        return this.clipKeyLow;
+    }
+
+
+    /**
+     * Set the lower note which should limit the key-range (this note should still sound).
+     * 
+     * @param clipKeyLow The note [0..127]
+     */
+    public void setClipKeyLow (final int clipKeyLow)
+    {
+        this.clipKeyLow = clipKeyLow;
+    }
+
+
+    /** {@inheritDoc} */
+    @Override
+    public int getClipKeyHigh ()
+    {
+        return this.clipKeyHigh;
+    }
+
+
+    /**
+     * Set the upper note which should limit the key-range (this note should still sound).
+     * 
+     * @param clipKeyHigh The note [0..127]
+     */
+    public void setClipKeyHigh (final int clipKeyHigh)
+    {
+        this.clipKeyHigh = clipKeyHigh;
+    }
+
+
+    /** {@inheritDoc} */
+    @Override
+    public void clipKeyRange ()
+    {
+        // Nothing to do?
+        if (this.clipKeyLow == 0 && this.clipKeyHigh == 127)
+            return;
+
+        for (final IGroup group: this.multisampleSource.getGroups ())
+        {
+            final List<ISampleZone> filteredZones = new ArrayList<> ();
+            for (final ISampleZone zone: group.getSampleZones ())
+            {
+                int keyLow = zone.getKeyLow ();
+                int keyHigh = zone.getKeyHigh ();
+                // Fully outside -> remove
+                if (keyLow > this.clipKeyHigh || keyHigh < this.clipKeyLow)
+                    continue;
+
+                // Clip lower and upper range
+                if (keyLow < this.clipKeyLow)
+                    zone.setKeyLow (this.clipKeyLow);
+                if (keyHigh > this.clipKeyHigh)
+                    zone.setKeyHigh (this.clipKeyHigh);
+                filteredZones.add (zone);
+            }
+            group.setSampleZones (filteredZones);
+        }
+    }
 }