Fixed auto-resampling in AudioPlayer by removing additional Resample node from AudioPlayer patch and applying additional factor to already in place resampling for speed adjustment. adds to #7027

Author: joreg

VL.Audio.UI/deployment/VL.Audio.UI.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>VL.Audio.UI</id>
-    <version>1.9.6</version>
+    <version>1.9.7</version>
     <title>VL.Audio.UI</title>
     <authors>vvvv</authors>
     <owners>vvvv</owners>
@@ -11,8 +11,8 @@
     <description>Extension pack for VL.Audio that brings in UI's for driver configuration and more</description>
     <tags>VL</tags>
     <dependencies>
-	  <dependency id="VL.Audio" version="1.9.6" />
-	  <dependency id="VL.ImGui.Skia" version="2024.6.6" />
+	  <dependency id="VL.Audio" version="1.9.7" />
+	  <dependency id="VL.ImGui.Skia" version="2024.6.7" />
     </dependencies>
     <license type="expression">LGPL-3.0-only</license>
     <icon>icon\nugeticon.png</icon>

VL.Audio/VL.Audio.vl

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Document xmlns:p="property" xmlns:r="reflection" Id="HTX4axw4uH5NDghqAqpe1F" LanguageVersion="2025.7.0-0020-ge83b1ec3a8" Version="0.128">
+<Document xmlns:p="property" xmlns:r="reflection" Id="HTX4axw4uH5NDghqAqpe1F" LanguageVersion="2025.7.0-0026-g22d1636d06" Version="0.128">
   <Patch Id="Mj1seFpSbg5MtaCXVBGhJf">
     <Canvas Id="ClqUpgLjNRdQbB5ajAF1ry" DefaultCategory="Audio" CanvasType="FullCategory">
       <!--
@@ -1581,7 +1581,7 @@
                   </Node>
                 </Patch>
               </Node>
-              <ControlPoint Id="JW5cS1SLCz5NN17Jpn6J0l" Bounds="102,1093" />
+              <ControlPoint Id="JW5cS1SLCz5NN17Jpn6J0l" Bounds="40,387" />
               <ControlPoint Id="TmMsMZeT5uRPUFFzPHAjry" Bounds="699,848" />
               <ControlPoint Id="QP3Ht4UXZ0BLagt7qUMunL" Bounds="913,848" />
               <Node Bounds="414,461,65,19" Id="L22D78ZTIm7O64URZe8FVE">
@@ -1827,7 +1827,7 @@
                   </Node>
                 </Patch>
               </Node>
-              <Node Bounds="179,418,75,26" Id="F3JDIsuC2CrPQMByCBZruA">
+              <Node Bounds="177,288,75,26" Id="F3JDIsuC2CrPQMByCBZruA">
                 <p:NodeReference LastCategoryFullName="VL.Audio.FileStreamSignal" LastDependency="VL.Audio.dll">
                   <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
                   <Choice Kind="OperationCallFlag" Name="Dispose" />
@@ -1876,80 +1876,7 @@
                 <Pin Id="QCKJLHLeS1GNphyksBG6NR" Name="Value" Kind="InputPin" />
                 <Pin Id="SfRwB9zxKszLKtjpfM74Ry" Name="Output" Kind="StateOutputPin" />
               </Node>
-              <Pad Id="MSpHL0dTsGmNOqBJCmyFND" Comment="Destination Rate is Engine Rate" Bounds="238,900,35,35" ShowValueBox="true" isIOBox="true" Value="True">
-                <p:TypeAnnotation LastCategoryFullName="Primitive" LastDependency="VL.CoreLib.vl">
-                  <Choice Kind="TypeFlag" Name="Boolean" />
-                  <FullNameCategoryReference ID="Primitive" />
-                </p:TypeAnnotation>
-                <p:ValueBoxSettings>
-                  <p:buttonmode p:Assembly="VL.UI.Forms" p:Type="VL.HDE.PatchEditor.Editors.ButtonModeEnum">Toggle</p:buttonmode>
-                </p:ValueBoxSettings>
-              </Pad>
-              <ControlPoint Id="STkaqP9JkfQM3LMMEZJbfF" Bounds="162,852" />
-              <Node Bounds="-42,796,83,19" Id="RqSmYZICdOkQaeduhTOiCY">
-                <p:NodeReference LastCategoryFullName="Audio" LastDependency="VL.Audio.vl">
-                  <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
-                  <Choice Kind="ProcessAppFlag" Name="EngineSettings" />
-                </p:NodeReference>
-                <Pin Id="UBWaasjVLrnQMXFU3HiWmi" Name="Buffer Size" Kind="OutputPin" />
-                <Pin Id="H29AMMYDYAHNAYzRg7nprG" Name="Sample Rate" Kind="OutputPin" />
-                <Pin Id="HjAIPoDWgz1NKWKN2tSTI1" Name="Node Context" Kind="InputPin" IsHidden="true" />
-              </Node>
-              <Node Bounds="36,838,27,19" Id="D1D95ip8TcFMPvOAtnhWxe">
-                <p:NodeReference LastCategoryFullName="Math" LastDependency="VL.CoreLib.vl">
-                  <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
-                  <Choice Kind="OperationCallFlag" Name="!=" />
-                </p:NodeReference>
-                <Pin Id="P1UghQGsd8FNpDwdIshUrf" Name="Input" Kind="InputPin" />
-                <Pin Id="HYAVYOA8qToLh3NvmP6TIO" Name="Input 2" Kind="InputPin" />
-                <Pin Id="VXaq6M28amqLA4W2CqwZlG" Name="Result" Kind="OutputPin" />
-              </Node>
-              <Node Bounds="36,878,175,136" Id="M8WcEk65bKSOBu83dbV90q">
-                <p:NodeReference LastCategoryFullName="Primitive" LastDependency="Builtin">
-                  <Choice Kind="StatefulRegion" Name="Region (Stateful)" Fixed="true" />
-                  <CategoryReference Kind="Category" Name="Primitive" />
-                  <Choice Kind="ApplicationStatefulRegion" Name="If" />
-                </p:NodeReference>
-                <Pin Id="MnvOwA4JLo3MEN3FnGcwwc" Name="Condition" Kind="InputPin" />
-                <Patch Id="AsDa8WwHgsQNT64fFepRsf" ManuallySortedPins="true">
-                  <Patch Id="M2kOVnPq1WmPtVD8EMCdHy" Name="Create" ManuallySortedPins="true" />
-                  <Patch Id="MVUgJhqtDgrPiRgE1uXYWx" Name="Then" ManuallySortedPins="true" />
-                  <Node Bounds="88,901,111,86" Id="SI8zH5vk0vrOq2uNVWd9hu">
-                    <p:NodeReference LastCategoryFullName="Primitive" LastDependency="Builtin">
-                      <Choice Kind="StatefulRegion" Name="Region (Stateful)" Fixed="true" />
-                      <Choice Kind="ApplicationStatefulRegion" Name="ForEach" />
-                      <CategoryReference Kind="Category" Name="Primitive" />
-                    </p:NodeReference>
-                    <Pin Id="PeXDrnSqZLQNwgJxzBwNCa" Name="Break" Kind="OutputPin" />
-                    <ControlPoint Id="OFPI7Dj2SM3MCXKtoVyyG1" Bounds="102,907" Alignment="Top" />
-                    <ControlPoint Id="LcVm6OSipcRQGskWHYzlpi" Bounds="102,981" Alignment="Bottom" />
-                    <ControlPoint Id="StlF7H5ZCpwPLshR37Xlbn" Bounds="182,981" Alignment="Bottom" />
-                    <Patch Id="ATXNeC6geJ7MPuQfPoDrDO" ManuallySortedPins="true">
-                      <Patch Id="C3NIis8KJLPMSt9yf0ueV5" Name="Create" ManuallySortedPins="true" />
-                      <Patch Id="FVmLhu25fqONAih0TqbI8i" Name="Update" ManuallySortedPins="true" />
-                      <Patch Id="PcuF09LxWQBNgcDR5T0fh2" Name="Dispose" ManuallySortedPins="true" />
-                      <Node Bounds="100,944,85,19" Id="KI8YCymynCjOw9SdjzwTIs">
-                        <p:NodeReference LastCategoryFullName="Audio.Filter" LastDependency="VL.Audio.vl">
-                          <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
-                          <Choice Kind="ProcessAppFlag" Name="Resample" />
-                        </p:NodeReference>
-                        <p:HelpFocus p:Assembly="VL.Lang" p:Type="VL.Model.HelpPriority">High</p:HelpFocus>
-                        <Pin Id="AkwTP8AzwvDLUgcNhMzH1F" Name="Node Context" Kind="InputPin" IsHidden="true" />
-                        <Pin Id="AuoyrjILlhuL9TCFtzLxxw" Name="Input" Kind="InputPin" />
-                        <Pin Id="FNI0h4eBSQAPvIjel6dWo2" Name="Source Rate" Kind="InputPin" />
-                        <Pin Id="ACLhJyKFHqHPykX4Fhztb6" Name="Destination Rate" Kind="InputPin" />
-                        <Pin Id="DM3Pi8KZmNsM36AEOBQuOS" Name="Required Transition Band" Kind="InputPin" />
-                        <Pin Id="IFggN5UnO9jLn0eZkonobH" Name="Destination Rate is Engine Rate" Kind="InputPin" />
-                        <Pin Id="UP6JhjwyJqmMOclf34jeof" Name="Output" Kind="OutputPin" />
-                        <Pin Id="OnJcuQPTeIAPuFv2umzeGM" Name="Latency" Kind="OutputPin" />
-                      </Node>
-                    </Patch>
-                  </Node>
-                </Patch>
-                <ControlPoint Id="QKZWQ33Cjh8O6uXZzfbBLH" Bounds="102,884" Alignment="Top" />
-                <ControlPoint Id="MgNNdadELQILtWsYVn6maF" Bounds="102,1008" Alignment="Bottom" />
-              </Node>
-              <Node Bounds="101,1046,83,26" Id="AOc1QPdYWJRO5OQuHkVgCI">
+              <Node Bounds="39,340,83,26" Id="AOc1QPdYWJRO5OQuHkVgCI">
                 <p:NodeReference LastCategoryFullName="Collections.Spread" LastDependency="VL.CoreLib.vl">
                   <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
                   <CategoryReference Kind="4026531840" Name="Spread" NeedsToBeDirectParent="true" />
@@ -2106,25 +2033,10 @@
               <Pin Id="I3ArCv7YLMlNY71YQSRtwQ" Name="Channels" Kind="OutputPin" Bounds="943,698" />
               <Pin Id="DyDCOpfznUgP9yFqsiPUFF" Name="Sample Rate" Kind="OutputPin" Bounds="1051,702" />
               <Pin Id="VlZTTEaHq3fOePb1NDr7jc" Name="Original Format" Kind="OutputPin" Bounds="1151,694" />
-              <Pin Id="FvB0IIhDUYqM7z3LNzQiIJ" Name="Required Transition Band" Kind="InputPin" DefaultValue="3" Visibility="Optional" />
             </Patch>
             <Patch Id="TrVm0JxxUrePjFlJmhvCir" Name="Dispose" ParticipatingElements="F3JDIsuC2CrPQMByCBZruA" />
-            <Link Id="SmWk1M0IxDNM47yPgebN2t" Ids="MSpHL0dTsGmNOqBJCmyFND,IFggN5UnO9jLn0eZkonobH" />
-            <Link Id="ELKzwFBnTuiP2JpI1JAxxB" Ids="LEWRV6jlYN2NncrgkKyJXn,FNI0h4eBSQAPvIjel6dWo2" />
-            <Link Id="JzvvIpGQEMQLNOQ3PjWf53" Ids="STkaqP9JkfQM3LMMEZJbfF,DM3Pi8KZmNsM36AEOBQuOS" />
-            <Link Id="AXREcFSK0BLLQdahvo2NXT" Ids="FvB0IIhDUYqM7z3LNzQiIJ,STkaqP9JkfQM3LMMEZJbfF" IsHidden="true" />
-            <Link Id="HTsvA7jOFJtNDKZAKtxjuE" Ids="LEWRV6jlYN2NncrgkKyJXn,HYAVYOA8qToLh3NvmP6TIO" />
-            <Link Id="IXSbXXI91nMLDheqG1zI1Z" Ids="H29AMMYDYAHNAYzRg7nprG,P1UghQGsd8FNpDwdIshUrf" />
-            <Link Id="VSbiQMKLgtULa3wZVt99t8" Ids="UP6JhjwyJqmMOclf34jeof,LcVm6OSipcRQGskWHYzlpi" />
-            <Link Id="D7sf1XH435HQGzky56GRn3" Ids="OFPI7Dj2SM3MCXKtoVyyG1,AuoyrjILlhuL9TCFtzLxxw" />
-            <Link Id="J2bf85FcTAzLrc10saUJNn" Ids="OnJcuQPTeIAPuFv2umzeGM,StlF7H5ZCpwPLshR37Xlbn" />
-            <Link Id="PZlZG2emINLMKZB05IVfwK" Ids="VXaq6M28amqLA4W2CqwZlG,MnvOwA4JLo3MEN3FnGcwwc" />
-            <Link Id="BgcIv7swr92MMHpRRooRUV" Ids="QKZWQ33Cjh8O6uXZzfbBLH,MgNNdadELQILtWsYVn6maF" IsFeedback="true" />
-            <Link Id="PUba5zidnO2LScWHUXkHgF" Ids="GQ1eFVCbTZKM7p5IcaXXRz,QKZWQ33Cjh8O6uXZzfbBLH" />
-            <Link Id="SQp41L0P8bsNcbjotFlSDy" Ids="QKZWQ33Cjh8O6uXZzfbBLH,OFPI7Dj2SM3MCXKtoVyyG1" />
-            <Link Id="S9p3aRYgnNhPNLeLkh6jcF" Ids="LcVm6OSipcRQGskWHYzlpi,MgNNdadELQILtWsYVn6maF" />
-            <Link Id="EVPXun5oCT8LdbDsq1oNWI" Ids="MgNNdadELQILtWsYVn6maF,Pt3TVe0qNhfQIX2PCQr0dL" />
             <Link Id="McABdZ6DC18O29BgIwMLyE" Ids="FzfJoaHTEyCMxhXdC2mKPR,JW5cS1SLCz5NN17Jpn6J0l" />
+            <Link Id="VOFNUFjeir4POnUPsdJdBW" Ids="GQ1eFVCbTZKM7p5IcaXXRz,Pt3TVe0qNhfQIX2PCQr0dL" />
           </Patch>
         </Node>
         <!--
@@ -16636,7 +16548,7 @@
   <PlatformDependency Id="VuKJB0bRCwzOw8myrmblKI" Location="System.Runtime" />
   <PlatformDependency Id="Qp3HZOkgG5cQcuE59UUe1j" Location="System.IO" />
   <PlatformDependency Id="CCaadwXbjs6P0MKKXnqSCL" Location="System.IO.FileSystem" />
-  <NugetDependency Id="TDiqd3R8e2tOT8QIUqmyZg" Location="VL.CoreLib" Version="2025.7.0-0020-ge83b1ec3a8" />
+  <NugetDependency Id="TDiqd3R8e2tOT8QIUqmyZg" Location="VL.CoreLib" Version="2025.7.0-0026-g22d1636d06" />
   <NugetDependency Id="SFJUM3180QILdDPO5WTujk" Location="NAudio" Version="2.2.1" />
   <NugetDependency Id="AGQtLYjpCx7PhN4g8ZBcIN" Location="NAudio.Asio" Version="2.2.1" />
   <NugetDependency Id="OyQbpILJqvSQQ6uHg7eipM" Location="NAudio.Core" Version="2.2.1" />

VL.Audio/deployment/VL.Audio.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>VL.Audio</id>
-    <version>1.9.6</version>
+    <version>1.9.7</version>
     <title>VL.Audio</title>
     <authors>NAudio, vvvv</authors>
     <owners>vvvv</owners>

VL.Audio/help/Source/Reference AudioPlayer.vl

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Document xmlns:p="property" xmlns:r="reflection" Id="D7IBwO2zC8qQJwplUikxnZ" LanguageVersion="2025.7.0-0005-gfd21b8f14a" Version="0.128">
-  <NugetDependency Id="Hmr7kILdlvPMagkfyf51Iz" Location="VL.CoreLib" Version="2025.7.0-0005-gfd21b8f14a" />
+<Document xmlns:p="property" xmlns:r="reflection" Id="D7IBwO2zC8qQJwplUikxnZ" LanguageVersion="2025.7.0-0026-g22d1636d06" Version="0.128">
+  <NugetDependency Id="Hmr7kILdlvPMagkfyf51Iz" Location="VL.CoreLib" Version="2025.7.0-0026-g22d1636d06" />
   <Patch Id="HaulhrPXkyCPeLW2mKcS3k">
     <Canvas Id="KNuoeWiZ9dzNZrycJV80K9" DefaultCategory="Main" BordersChecked="false" CanvasType="FullCategory" />
     <!--
@@ -55,7 +55,6 @@
             <Pin Id="BSfmocvz10COWnMG2v2UbT" Name="Channels" Kind="OutputPin" />
             <Pin Id="AJM47OGxetNLB58Huc07gJ" Name="Sample Rate" Kind="OutputPin" />
             <Pin Id="NSrhspMh9iDOMuQc9cwHWH" Name="Original Format" Kind="OutputPin" />
-            <Pin Id="AJjSICoE5mXO2FSbbuk3Tw" Name="Required Transition Band" Kind="InputPin" IsHidden="true" />
           </Node>
           <Pad Id="AFhtajWa9EyOHDJs1skNrf" Comment="Play" Bounds="346,381,35,35" ShowValueBox="true" isIOBox="true" Value="True">
             <p:TypeAnnotation LastCategoryFullName="Primitive" LastDependency="CoreLibBasics.vl">
@@ -117,24 +116,6 @@
               <p:stringtype p:Assembly="VL.Core" p:Type="VL.Core.StringType">Comment</p:stringtype>
             </p:ValueBoxSettings>
           </Pad>
-          <Pad Id="DJpKLpeOJAPOV7hum3C8tx" Bounds="594,351,189,19" ShowValueBox="true" isIOBox="true" Value="..\Utils\Reference Resample.vl">
-            <p:TypeAnnotation LastCategoryFullName="Primitive" LastDependency="VL.CoreLib.vl">
-              <Choice Kind="TypeFlag" Name="String" />
-            </p:TypeAnnotation>
-            <p:ValueBoxSettings>
-              <p:fontsize p:Type="Int32">9</p:fontsize>
-              <p:stringtype p:Assembly="VL.Core" p:Type="VL.Core.StringType">Link</p:stringtype>
-            </p:ValueBoxSettings>
-          </Pad>
-          <Pad Id="DoY7w5K5nnGPEaZJcGtMsF" Bounds="593,267,383,75" ShowValueBox="true" isIOBox="true" Value="In case the audio files sample rate does not match the engines current sample rate, automatic resampling is applied by the AudioPlayer node. In those cases the optional input &quot;Required Transition Band&quot; may be of interest, see:">
-            <p:TypeAnnotation LastCategoryFullName="Primitive" LastDependency="VL.CoreLib.vl">
-              <Choice Kind="TypeFlag" Name="String" />
-            </p:TypeAnnotation>
-            <p:ValueBoxSettings>
-              <p:fontsize p:Type="Int32">9</p:fontsize>
-              <p:stringtype p:Assembly="VL.Core" p:Type="VL.Core.StringType">Comment</p:stringtype>
-            </p:ValueBoxSettings>
-          </Pad>
         </Canvas>
         <Patch Id="H7AXqgMBO7VM7Hjz3LIVIi" Name="Create" />
         <Patch Id="SAUdaIhMZdzNMFreYk25vB" Name="Update" />
@@ -157,6 +138,6 @@
       </Patch>
     </Node>
   </Patch>
-  <NugetDependency Id="AOu5YShvTlxO1vA9BHtmEC" Location="VL.Skia" Version="2025.7.0-0005-gfd21b8f14a" />
+  <NugetDependency Id="AOu5YShvTlxO1vA9BHtmEC" Location="VL.Skia" Version="2025.7.0-0026-g22d1636d06" />
   <NugetDependency Id="RFGyRrGfUbfP2xiT2T539W" Location="VL.Audio" Version="0.0.0.0" />
 </Document>

VL.Audio/src/Signals/Sources/FileStreamSignal.cs

@@ -56,13 +56,14 @@ protected override void FillBuffers(float[][] buffer, int offset, int sampleCoun
             var channels = FAudioFile.WaveFormat.Channels;
             var blockAlign = FAudioFile.OriginalFileFormat.BlockAlign;
             int samplesToRead;
-            if (Speed == 1.0) 
+            var speed = Speed * FAudioFile.WaveFormat.SampleRate / AudioService.Engine.Settings.SampleRate;
+            if (speed == 1.0) 
             {
                 samplesToRead = sampleCount * channels;
             }
             else 
             {
-                var desiredSamples = sampleCount * channels * Speed;
+                var desiredSamples = sampleCount * channels * speed;
                 //ideal value
                 samplesToRead = (int)Math.Truncate(desiredSamples);
                 //can only read that much
@@ -102,18 +103,18 @@ protected override void FillBuffers(float[][] buffer, int offset, int sampleCoun
                     //first read samples remaining to loopEnd
                     var samplesToReadAtEndOfLoop = (int) Math.Min(samplesToRead, loopEndSample - currentSample);
                     samplesRead = FAudioFile.Read(FFileBuffer, offset * channels, samplesToReadAtEndOfLoop);
-                    WriteFileBufferToOutputBuffer(buffer, 0, channels, samplesToReadAtEndOfLoop, samplesRead / channels);
+                    WriteFileBufferToOutputBuffer(buffer, 0, channels, samplesToReadAtEndOfLoop, sampleCount, speed);
 
                     //then make another read at the beginning of the loop
                     var samplesToReadAtStartOfLoop = samplesToRead - samplesToReadAtEndOfLoop;
                     FAudioFile.CurrentTime = LoopStartTime;
                     samplesRead = FAudioFile.Read(FFileBuffer, offset * channels, samplesToReadAtStartOfLoop);
-                    WriteFileBufferToOutputBuffer(buffer, samplesToReadAtEndOfLoop, channels, samplesToReadAtEndOfLoop, samplesRead / channels);
+                    WriteFileBufferToOutputBuffer(buffer, samplesToReadAtEndOfLoop, channels, samplesToReadAtEndOfLoop, sampleCount, speed);
                 }
                 else
                 {
                     samplesRead = FAudioFile.Read(FFileBuffer, offset * channels, samplesToRead);
-                    WriteFileBufferToOutputBuffer(buffer, 0, channels, samplesToRead, sampleCount);
+                    WriteFileBufferToOutputBuffer(buffer, 0, channels, samplesToRead, sampleCount, speed);
                 }
             }
             else//silence
@@ -125,9 +126,9 @@ protected override void FillBuffers(float[][] buffer, int offset, int sampleCoun
             }
         }
 
-        private void WriteFileBufferToOutputBuffer(float[][] buffer, int outputOffset, int channels, int samplesToRead, int sampleCount)
+        private void WriteFileBufferToOutputBuffer(float[][] buffer, int outputOffset, int channels, int samplesToRead, int sampleCount, double speed)
         {
-            if (Speed == 1.0)
+            if (speed == 1.0)
             {
                 //copy to output buffers
                 for (int i = 0; i < channels; i++)