Merge branch 'custom-snap-bounds' of https://github.com/uvcat7/ArrowVortex into custom-snap-bounds

Author: uvcat7

.github/workflows/windows.yml

@@ -28,7 +28,7 @@ jobs:
           unzip oggenc.zip -d .
       - name: Build AV
         run: msbuild build\VisualStudio\ArrowVortex.vcxproj /p:Configuration=Release /p:Platform=x64         
-      - name: Collect into a zip
+      - name: Collect into a directory
         run: |
           mkdir AV
           cd AV
@@ -37,12 +37,9 @@ jobs:
           cp -r ../bin/settings .
           cp ../bin/ArrowVortex.exe .
           cp ../oggenc2.exe .
-          cd ..
-          7z.exe a -tzip av.zip AV
-      - name: Upload to Delta VPS
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.DROPLET_SSH }}" > ~/.ssh/arrow_vortex
-          chmod 400 ~/.ssh/arrow_vortex
-          echo "arrowvortex@167.71.33.176:~/av/ArrowVortex-$(date +'%Y-%m-%d %H-%M-%S').zip" > DROPLET_PATH
-          scp -o StrictHostKeyChecking=no -o PasswordAuthentication=no -i ~/.ssh/arrow_vortex av.zip $(cat DROPLET_PATH)
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: AV
+          path: main/AV/
+          if-no-files-found: error

src/Editor/LoadMp3.cpp

@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <memory>
 
 #include <System/File.h>
 
@@ -431,19 +432,18 @@ int MP3Loader::readFrames(int frames, short* buffer)
 
 SoundSource* LoadMP3(FileReader* file, String& title, String& artist)
 {
-	MP3Loader* loader = new MP3Loader;
+	std::unique_ptr<MP3Loader> loader = std::make_unique<MP3Loader>();
 	loader->file = file;
 
 	// Decode and synth the first frame to check if the file is valid.
 	if(!loader->decodeFirstFrame())
 	{
 		loader->file = nullptr;
-		delete loader;
 		return nullptr;
 	}
 
 	// The file is valid, return the MP3 loader.
-	return loader;
+	return loader.release();
 }
 
 }; // namespace Vortex

src/Editor/LoadWav.cpp

@@ -14,17 +14,17 @@ namespace {
 #pragma pack(1)
 struct WaveHeader
 {
-	uint8_t chunkId[4];
+	uint8_t chunkId[4];         // "RIFF"
 	uint32_t chunkSize;
-	uint8_t format[4];
-	uint8_t subChunkId[4];
-	uint32_t subChunkSize;
+	uint8_t format[4];          // "WAVE"
+	uint8_t subchunk1Id[4];     // "fmt "
+	uint32_t subchunk1Size;
 	uint16_t audioFormat;
 	uint16_t numChannels;
 	uint32_t sampleRate;
 	uint32_t byteRate;
 	uint16_t blockAlign;
-	uint16_t bps;
+	uint16_t bitsPerSample;
 };
 struct WaveData
 {
@@ -72,32 +72,38 @@ SoundSource* LoadWav(FileReader* file, String& title, String& artist)
 	if(file->read(&header, sizeof(WaveHeader), 1) == 0
 		|| memcmp(header.chunkId, "RIFF", 4) != 0
 		|| memcmp(header.format, "WAVE", 4) != 0
-		|| memcmp(header.subChunkId, "fmt ", 4) != 0
+		|| memcmp(header.subchunk1Id, "fmt ", 4) != 0
 		|| header.audioFormat != 1
 		|| header.sampleRate == 0
 		|| header.numChannels == 0
-		|| (header.bps != 8 && header.bps != 16 && header.bps != 24))
+		|| (header.bitsPerSample != 8 && header.bitsPerSample != 16 && header.bitsPerSample != 24))
 	{
 		return nullptr;
 	}
 
 	// Skip over additional parameters at the end of the format chunk.
-	file->skip(header.subChunkSize - 16);
+	if (header.subchunk1Size > 16)
+	{
+		size_t extraBytes = static_cast<size_t>(header.subchunk1Size) - 16;
+		file->skip(extraBytes);
+	}
 
 	// Read the start of the data chunk.
 	WaveData data;
-	if(file->read(&data, sizeof(WaveData), 1) == 0
-		|| memcmp(data.chunkId, "data", 4) != 0)
-	{
-		return nullptr;
+	while (true) {
+		if (file->read(&data, sizeof(WaveData), 1) == 0)
+			return nullptr;
+		if (memcmp(data.chunkId, "data", 4) == 0)
+			break;
+		file->skip(data.chunkSize);
 	}
 
 	// Create a wav loader that will read the contents of the data chunk.
 	WavLoader* loader = new WavLoader;
 
 	loader->frequency = header.sampleRate;
 	loader->numChannels = header.numChannels;
-	loader->bytesPerSample = header.bps / 8;
+	loader->bytesPerSample = header.bitsPerSample / 8;
 	loader->numFrames = data.chunkSize / (loader->bytesPerSample * loader->numChannels);
 	loader->numFramesLeft = loader->numFrames;
 	loader->file = file;

src/Editor/Waveform.cpp

@@ -457,6 +457,12 @@ void sampleEdges(WaveEdge* edges, int w, int h, int channel, int blockId, bool f
 		return;
 	}
 
+	// A crash can occur if another thread is loading the audio. Just do nothing if it is.
+	if (!music.isAllocated())
+	{
+		return;
+	}
+
 	double sampleSkip = max(0.001, (samplesPerPixel / 200.0));
 	int wh = w / 2 - 1;