Bring up to date with latest RC 588342d7

david-c14 · Nov 16, 2021 · 7080db8 · 7080db8
1 parent d123cd3
commit 7080db8
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 93 deletions.
diff --git a/.github/actions/build_linux/entrypoint.sh b/.github/actions/build_linux/entrypoint.sh
@@ -7,7 +7,7 @@ export RACK_USER_DIR=${GITHUB_WORKSPACE}
 
 git submodule update --init --recursive
 
-curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip
+curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}-lin.zip -o rack-sdk.zip
 unzip -o rack-sdk.zip
 rm rack-sdk.zip
 

diff --git a/.github/actions/build_osx/Dockerfile b/.github/actions/build_osx/Dockerfile
diff --git a/.github/actions/build_osx/entrypoint.sh b/.github/actions/build_osx/entrypoint.sh
diff --git a/.github/actions/build_win/entrypoint.sh b/.github/actions/build_win/entrypoint.sh
@@ -11,7 +11,7 @@ export STRIP=x86_64-w64-mingw32-strip
 
 git submodule update --init --recursive
 
-curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip
+curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}-win.zip -o rack-sdk.zip
 unzip -o rack-sdk.zip
 rm rack-sdk.zip
 

diff --git a/.github/actions/upload_zip/script.sh b/.github/actions/upload_zip/script.sh
diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml
@@ -5,12 +5,11 @@ name: Release
 env:
   RACK_DIR: ${GITHUB_WORKSPACE}/Rack-SDK
   RACK_USER_DIR: ${GITHUB_WORKSPACE}
+  RACK_SDK_VERSION: 2.git.588342d7
 jobs:
   buildLinux:
     name: Build Linux
     runs-on: ubuntu-latest
-    env:
-      RACK_SDK_VERSION: 2.git.219bbaf1-lin
     steps:
     - uses: actions/checkout@master
     - name: Build Linux
@@ -20,8 +19,6 @@ jobs:
   buildWindows:
     name: Build Windows
     runs-on: ubuntu-latest
-    env:
-      RACK_SDK_VERSION: 2.git.219bbaf1-win
     steps:
     - uses: actions/checkout@master
     - name: Build Windows
@@ -31,18 +28,18 @@ jobs:
   buildOsx:
     name: Build OSX
     runs-on: macos-10.15
-    env:
-      RACK_SDK_VERSION: 2.git.219bbaf1-mac
     steps:
     - uses: actions/checkout@master
     - name: install tools
       run: brew install automake
     - name: get Rack-SDK
-      run: curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip
+      run: curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}-mac.zip -o rack-sdk.zip
     - name: unzip SDK
       run: unzip -o rack-sdk.zip
     - name: clean up SDK
       run: rm rack-sdk.zip
+    - name: update submodules
+      run: git submodules update --init --recursive
     - name: make
       run: make dist
     - name: upload zip

diff --git a/.github/workflows/buildV2.yml b/.github/workflows/buildV2.yml
@@ -4,22 +4,16 @@ on:
     - v2q
 name: V2
 env:
-  RACK_SDK_VERSION: 2.git.219bbaf1-mac
+  RACK_SDK_VERSION: 2.git.588342d7
   RACK_DIR: ${GITHUB_WORKSPACE}/Rack-SDK
   RACK_USER_DIR: ${GITHUB_WORKSPACE}
 jobs:
-  buildOSX:
-    name: Build OSX
-    runs-on: macos-10.15
+  buildLinux:
+    name: Build Linux
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
-    - name: install tools
-      run: brew install automake
-    - name: get Rack-SDK
-      run: curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip
-    - name: unzip SDK
-      run: unzip -o rack-sdk.zip
-    - name: clean up SDK
-      run: rm rack-sdk.zip
-    - name: make
-      run: make dist
+    - name: Build Linux
+      uses: ./.github/actions/build_linux
+    - name: upload zip
+      run: sh ./.github/actions/upload_plugin_lin/script.sh ${{ secrets.GITHUB_TOKEN }}
diff --git a/src/LT1.cpp b/src/LT1.cpp
@@ -767,7 +767,10 @@ struct LT116 : SchemeModuleWidget {
 	}
 	void normaliseAll() {
 		bulkChangeWithHistory("LT116 normalise all columns", [=](float *params) {
-			__m128 a1, a2, a3, a4 = _mm_setzero_ps();
+			__m128 a1 = _mm_setzero_ps();
+			__m128 a2 = _mm_setzero_ps();
+			__m128 a3 = _mm_setzero_ps();
+			__m128 a4 = _mm_setzero_ps();
 			for (int i = 0; i < 256; i += 16) {
 				__m128 s = _mm_load_ps(params + i);
 				a1 = _mm_add_ps(a1, s);

diff --git a/src/WM1.cpp b/src/WM1.cpp
@@ -1,6 +1,4 @@
 //SubTag W10 WP AM
-#include <settings.hpp>
-#include <system.hpp>
 #include <osdialog.h>
 #include "SubmarineFree.hpp"
 
@@ -1184,8 +1182,8 @@ struct WM101 : SizeableModuleWidget, WM_Base {
 				lastCable = NULL;
 			highlightIsDirty = true;		
 		}
-		if (wirePanel->visible && APP->scene->rack->incompleteCable) {
-			colorCable(APP->scene->rack->incompleteCable,NULL);
+		if (wirePanel->visible && APP->scene->rack->getIncompleteCable()) {
+			colorCable(APP->scene->rack->getIncompleteCable(),NULL);
 		}
 		highlightWires();
 		SizeableModuleWidget::step();

diff --git a/src/shared/EventWidgets.cpp b/src/shared/EventWidgets.cpp
@@ -1,4 +1,3 @@
-#include <settings.hpp>
 #include "../SubmarineFree.hpp"
 
 void EventWidgetAction::undo() {

diff --git a/src/shared/SizeableModuleWidget.cpp b/src/shared/SizeableModuleWidget.cpp
@@ -1,4 +1,3 @@
-#include <settings.hpp>
 #include "../SubmarineFree.hpp"
 
 json_t *SizeableModule::dataToJson() {

diff --git a/src/shared/SubTooltip.cpp b/src/shared/SubTooltip.cpp
@@ -1,8 +1,6 @@
-#include <settings.hpp>
 #include "../SubmarineFree.hpp"
 
 void SubTooltip::step() {
 	if (stepLambda != NULL)
 		stepLambda();
-	//Tooltip::step();
 }