fixies + cleanup

Author: ACrazyTown

src/funkin/vis/audioclip/frontends/LimeAudioClip.hx

@@ -30,12 +30,13 @@ class LimeAudioClip implements funkin.vis.AudioClip
 
 		#if web
 		streamed = false;
+
 		var sampleRate:Float = limeBuffer.src._sounds[0]._node.context.sampleRate;
 		var length:Int = audioSource.length;
 		var bitsPerSample:Int = 32;
 		var channels:Int = 2;
 		#else
-		var sampleRate:Float = 0.0;
+		var sampleRate:Float = 0;
 		var length:Int = 0;
 		var bitsPerSample:Int = 0;
 		var channels:Int = 0;
@@ -45,7 +46,6 @@ class LimeAudioClip implements funkin.vis.AudioClip
 		@:privateAccess
 		if (limeBuffer.__srcVorbisFile != null)
 		{
-			trace("got vorbisfile");
 			streamed = true;
 
 			var vorbisFile = limeBuffer.__srcVorbisFile;

src/funkin/vis/dsp/SpectralAnalyzer.hx

@@ -211,30 +211,17 @@ class SpectralAnalyzer
         #if lime_vorbis
         if (audioClip.streamed)
         {
-            var length = endFrame - startFrame;
-            // trace(length);
-            // var buffer:Bytes = Bytes.alloc();
-            
-            // if (_vorbisBuffer == null || (_vorbisBuffer.length != length))
-            // {
-            //     _vorbisBuffer = null;
-            //     _vorbisBuffer = new UInt8Array(length);
-            // }
-
             @:privateAccess
             var vorbisFile = audioSource.buffer.__srcVorbisFile;
 
             // reading from VorbisFile will automatically move the position
             // which causes issues with playback, so we keep old time to go back to it
             var prevPos = vorbisFile.pcmTell();
- 
-            vorbisFile.pcmSeek(startFrame);
 
-            @:privateAccess
-            // _vorbisBuffer = audioSource.__backend.readVorbisFileBuffer(vorbisFile, length);
-            _vorbisBuffer = readVorbisBuffer(vorbisFile, 0, wantedLength);
+            vorbisFile.pcmSeek(Std.int(startFrame / (numOctets + audioClip.audioBuffer.channels)));
 
-            // trace('$startFrame - $endFrame');
+            @:privateAccess
+            _vorbisBuffer = readVorbisBuffer(vorbisFile, wantedLength);
 
             vorbisFile.pcmSeek(prevPos);
 
@@ -243,8 +230,6 @@ class SpectralAnalyzer
         else
         #end
         {
-            
-
             var segment:UInt8Array = audioSource.buffer.data.subarray(startFrame, endFrame);
             signal = getSignal(segment, audioClip.audioBuffer.bitsPerSample);
         }
@@ -333,7 +318,9 @@ class SpectralAnalyzer
     }
 
     #if lime_vorbis
-    function readVorbisBuffer(vorbisFile:VorbisFile, position:Int, length:Int):UInt8Array
+    // Pretty much copied from
+    // https://github.com/openfl/lime/blob/develop/src/lime/_internal/backend/native/NativeAudioSource.hx#L212
+    function readVorbisBuffer(vorbisFile:VorbisFile, length:Int):UInt8Array
     {
         var buffer:UInt8Array = new UInt8Array(length);