Fixed: Processing: Sample reduction did not always work and improved logging.

Author: git-moss

documentation/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 16.5.1
+
+* Fixed: Processing: Sample reduction did not always work and improved logging.
+
 ## 16.5.0
 
 * Added support for discoDSP Bliss.

pom.xml

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

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

@@ -349,7 +349,7 @@ private void processSamples (final IMultisampleSource multisampleSource)
         {
             final List<IGroup> groups = multisampleSource.getNonEmptyGroups (false);
 
-            /////////////////////////////////////////////////////////////////////////////////////////////////////////
+            ////////////////////////////////////////////////////////////////////////////////////////////////
             // Combine split-mono samples to stereo samples if necessary for further processing
 
             final boolean hasMaximumNumberOfSamples = this.detectionSettings.maxNumberOfSamples > 0;
@@ -359,14 +359,14 @@ private void processSamples (final IMultisampleSource multisampleSource)
                 final Optional<IGroup> stereoGroup = ZoneChannels.combineSplitStereo (groups);
                 if (stereoGroup.isPresent ())
                 {
-                    this.notifier.log ("IDS_NOTIFY_COMBINED_TO_STEREO");
                     groups.clear ();
                     groups.add (stereoGroup.get ());
                 }
-                this.notifier.logError ("IDS_NOTIFY_NOT_COMBINED_TO_STEREO");
+                else
+                    this.notifier.logError ("IDS_NOTIFY_NOT_COMBINED_TO_STEREO");
             }
 
-            /////////////////////////////////////////////////////////////////////////////////////////////////////////
+            ////////////////////////////////////////////////////////////////////////////////////////////////
             // Reduce the number of samples if necessary
 
             if (hasMaximumNumberOfSamples && MultiSampleReducer.reduce (groups, this.detectionSettings.maxNumberOfSamples) > 0)
@@ -376,38 +376,26 @@ private void processSamples (final IMultisampleSource multisampleSource)
                 for (final IGroup group: groups)
                     if (!group.getSampleZones ().isEmpty ())
                         finalGroups.add (group);
-                this.notifier.logError ("IDS_NOTIFY_REDUCED_TO_NUM_SAMPLES", Integer.toString (this.detectionSettings.maxNumberOfSamples));
+                groups.clear ();
+                groups.addAll (finalGroups);
+                this.notifier.log ("IDS_NOTIFY_REDUCED_TO_NUM_SAMPLES", Integer.toString (this.detectionSettings.maxNumberOfSamples));
             }
+            multisampleSource.setGroups (groups);
 
             final List<ISampleZone> sampleZones = new ArrayList<> ();
             for (final IGroup group: groups)
                 sampleZones.addAll (group.getSampleZones ());
 
             if (this.detectionSettings.enableMakeMono)
-            {
-                this.notifier.logText (" ");
                 this.notifier.log ("IDS_PROCESSING_MAKE_MONO");
-            }
             if (this.detectionSettings.enableTrimSample)
-            {
-                this.notifier.logText (" ");
                 this.notifier.log ("IDS_PROCESSING_TRIM");
-            }
             if (this.detectionSettings.reduceBitDepth > 0)
-            {
-                this.notifier.logText (" ");
                 this.notifier.log ("IDS_PROCESSING_REDUCE_BIT_DEPTH_TO", Integer.toString (this.detectionSettings.reduceBitDepth));
-            }
             if (this.detectionSettings.reduceFrequency > 0)
-            {
-                this.notifier.logText (" ");
                 this.notifier.log ("IDS_PROCESSING_REDUCE_FREQUENCY_TO", Integer.toString (this.detectionSettings.reduceFrequency));
-            }
             if (this.detectionSettings.enableNormalize)
-            {
-                this.notifier.logText (" ");
                 this.notifier.log ("IDS_PROCESSING_NORMALIZING");
-            }
             this.notifier.log ("IDS_NOTIFY_LINE_FEED");
             AudioSampleReducer.reduceSamples (sampleZones, this.detectionSettings.enableMakeMono, this.detectionSettings.enableTrimSample, this.detectionSettings.reduceBitDepth, this.detectionSettings.reduceFrequency, this.detectionSettings.enableNormalize);
         }

src/main/resources/Strings.properties

@@ -1,4 +1,4 @@
-TITLE=ConvertWithMoss 16.5.0
+TITLE=ConvertWithMoss 16.5.1
 
 ##################################################################################
 #
@@ -100,7 +100,7 @@ IDS_NOTIFY_ERR_WRONG_CHUNK_ID=Mismatch of chunk ID: %1 vs. %2.\n
 IDS_NOTIFY_COMBINED_TO_STEREO=Split stereo files were converted to stereo files.\n
 IDS_NOTIFY_NOT_COMBINED_TO_STEREO=Split stereo files could not be converted to stereo files.\n
 IDS_NOTIFY_OK=OK.\n
-IDS_NOTIFY_REDUCED_TO_NUM_SAMPLES=Reduced to %1 samples.\n
+IDS_NOTIFY_REDUCED_TO_NUM_SAMPLES=Reduced to %1 samples. 
 IDS_NOTIFY_COULD_NOT_RESAMPLE=Could not resample: %1\n
 
 IDS_ERR_COULD_NOT_STORE_CONFIG=Could not store configuration.
@@ -120,14 +120,14 @@ IDS_ERR_LIMITED_INSTRUMENTS=Limited to %1 instruments (from %2).\n
 IDS_ERR_SAMPLE_FILE_DOES_NOT_EXIST=The sample file does not exist or cannot be accessed: %1.
 IDS_ERR_SOURCE_CONTAINS_LAYERS=The source multi-sample contains layered samples which is not supported by the destination format.\n
 
-IDS_PROCESSING_PROCESS=Processing:
-IDS_PROCESSING_COMBINE_TO_STEREO= Combine Stereo...
-IDS_PROCESSING_REDUCE_SAMPLES= Reduce Samples to %1... 
-IDS_PROCESSING_NORMALIZING= Normalize... 
-IDS_PROCESSING_MAKE_MONO= Make Mono...
-IDS_PROCESSING_TRIM= Trim...
-IDS_PROCESSING_REDUCE_BIT_DEPTH_TO= Reduce Bit-Depth to %1...
-IDS_PROCESSING_REDUCE_FREQUENCY_TO= Reduce Frequency to %1...
+IDS_PROCESSING_PROCESS=Processing: 
+IDS_PROCESSING_COMBINE_TO_STEREO=Combine Stereo... 
+IDS_PROCESSING_REDUCE_SAMPLES=Reduce Samples to %1... 
+IDS_PROCESSING_NORMALIZING=Normalize... 
+IDS_PROCESSING_MAKE_MONO=Make Mono... 
+IDS_PROCESSING_TRIM=Trim... 
+IDS_PROCESSING_REDUCE_BIT_DEPTH_TO=Reduce Bit-Depth to %1... 
+IDS_PROCESSING_REDUCE_FREQUENCY_TO=Reduce Frequency to %1... 
 IDS_PROCESSING_REDUCE_BITE_DEPTH_NOT_SUPPORTED=The selected processing bit-depth (%1 bit) is not supported by the selected destination format (only %2).
 
 IDS_CLI_UNKNOWN_SOURCE_FORMAT=Invalid value for source format: %1\nAllowed values are: %2\n