Merge branch 'release-1.0.1' into DeltaEpsilon7787-patch-1

Author: uvcat7

.github/dependabot.yml

@@ -0,0 +1,14 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  # Enable version updates for GitHub Actions
+  - package-ecosystem: "github-actions"
+    # Look for GitHub Actions workflows in the `root` directory
+    directory: "/"
+    # Check the for updates once a week
+    schedule:
+      interval: "weekly"

.github/workflows/windows.yml

@@ -1,8 +1,10 @@
-name: Windows Build
+name: Build & Latest Beta
 
 on:
   push:
-    branches: ["main"]
+  pull_request:
+    paths-ignore:
+      - '**.md'
 
 jobs:
   windows:
@@ -11,6 +13,8 @@ jobs:
     defaults:
       run:
         working-directory: ${{github.workspace}}/main
+    permissions:
+      contents: read
     steps:
       - name: Get AV
         uses: actions/checkout@v3
@@ -24,7 +28,8 @@ 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
+        if: github.ref_name == 'beta'
         run: |
           mkdir AV
           cd AV
@@ -35,3 +40,10 @@ jobs:
           cp ../oggenc2.exe .
           cd ..
           7z.exe a -tzip av.zip AV
+      - name: Upload artifact
+        if: github.ref_name == 'beta'
+        uses: actions/upload-artifact@v4
+        with:
+          name: AV
+          path: main/AV/
+          if-no-files-found: error

CREDITS

@@ -27,24 +27,27 @@ status of the original code as provided to them.
 
 Code from the following projects is included in this repository:
 
- 1. freetype, using the FreeType License, which is compatible with GPLv3
-    See lib/freetype/ for more info.
+ 1. freetype , using the FreeType License, which is compatible with GPLv3
+    See lib/freetype/ or https://freetype.org/license.html for more info.
 
  2. libogg & libvorbis, using its BSD-style license, which is compatible with
-    GPLv3. See lib/libvorbis/license for more info.
+    GPLv3. See lib/libvorbis/license or https://gitlab.xiph.org/xiph for more info.
 
  3. libmad, using the GPL license (libmad allows for GPLv2 or any later version)
-    See lib/freetype/ for more info.
+    See lib/freetype/ or https://www.underbit.com/products/mad/ for more info.
 
  4. lua, using its GPLv3-compatible permissive license
-    See lib/lua/ for more info.
+    See lib/lua/ or https://www.lua.org/license.html for more info.
 
  5. Code from liir.c by Exstrom Labratories, which is GPL, is present in
     src/Editor/Butterworth.cpp
+    https://www.exstrom.com/journal/sigproc/dsigproc.html
 
  6. Code from Takuya OOURA's General Purpose FFT Package, which is released
     freely, is present in src/Editor/FFT.cpp
+    https://www.kurims.kyoto-u.ac.jp/~ooura/fft.html
 
  7. Code from the aubio library, which is also GPLv3, is present in
     src/Editor/Aubio.h and src/Editor/FindOnsets.cpp
+    https://github.com/aubio/aubio
 

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/View.cpp

@@ -95,14 +95,14 @@ void loadSettings(XmrNode& settings)
 		view->get("useReverseScroll", &myUseReverseScroll);
 		view->get("useChartPreview" , &myUseChartPreview);
 		view->get("customSnap", &myCustomSnap);
+		view->get("zoomLevel", &myZoomLevel);
+		view->get("scaleLevel", &myScaleLevel);
+		view->get("receptorX", &myReceptorX);
+		view->get("receptorY", &myReceptorY);
 
 		myCustomSnap = min(max(myCustomSnap, 1), 192);
-
-		// if myUseReverseScroll is set, the receptor Y position must be inverted.
-		if (myUseReverseScroll)
-		{
-			myReceptorY = rect_.h - myReceptorY;
-		}
+		myZoomLevel = min(max(myZoomLevel, -2.0), 16.0);
+		myScaleLevel = min(max(myScaleLevel, 1.0), 10.0);
 	}
 
 	updateScrollValues();
@@ -115,9 +115,13 @@ void saveSettings(XmrNode& settings)
 	if(!view) view = settings.addChild("view");
 
 	view->addAttrib("useTimeBasedView", myUseTimeBasedView);
-	view->addAttrib("customSnap", (long)myCustomSnap);
 	view->addAttrib("useReverseScroll", myUseReverseScroll);
 	view->addAttrib("useChartPreview", myUseChartPreview);
+	view->addAttrib("customSnap", (long)myCustomSnap);
+	view->addAttrib("zoomLevel", (long)myZoomLevel);
+	view->addAttrib("scaleLevel", (long)myScaleLevel);
+	view->addAttrib("receptorX", (long)myReceptorX);
+	view->addAttrib("receptorY", (long)myReceptorY);
 }
 
 // ================================================================================================

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;