Merge branch 'master' into synths/korg_triton

Author: christofmuc

.dockerignore

@@ -0,0 +1,19 @@
+.builds/
+.pytest_cache/
+.vscode/
+Builds/
+build/
+builds/
+node_modules/
+public/
+venv/
+venv*/
+
+*.aps
+*.dmg
+*.exe
+*.msi
+Screenshot*.png
+youtube-screenshot.PNG
+*.tar.gz
+*.zip

.github/workflows/builds-archlinux-docker.yml

@@ -0,0 +1,28 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+
+name: Arch Linux Docker Build
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build-archlinux-docker:
+    runs-on: ubuntu-24.04
+    timeout-minutes: 90
+    steps:
+    - name: Checkout repository with tags and submodules
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: Build Arch Linux Docker image
+      run: docker build --pull -f docker/archlinux/Dockerfile -t knobkraft-orm-arch .
+
+    - name: Verify executable can be copied from the image
+      run: |
+        container_id=$(docker create knobkraft-orm-arch)
+        docker cp "$container_id:/KnobKraft-orm/builds/The-Orm/KnobKraftOrm" ./KnobKraftOrm-arch
+        docker rm "$container_id"
+        test -s ./KnobKraftOrm-arch

.github/workflows/builds-windows.yml

@@ -97,7 +97,7 @@ jobs:
       - name: Prepare update key and generate code signature
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          builds\_deps\winsparkle-src\bin\sign_update.bat Builds/The-Orm/knobkraft_orm_setup_${{env.ORM_VERSION}}.exe ${{ steps.extract_pem.outputs.SECRET_FILE }} > update.sig
+          .\builds\_deps\winsparkle-src\bin\legacy_sign_update.bat Builds/The-Orm/knobkraft_orm_setup_${{env.ORM_VERSION}}.exe ${{ steps.extract_pem.outputs.SECRET_FILE }} > update.sig
           type update.sig
 
       - name: Update appcast.xml to add the new release

CMakeLists.txt

@@ -79,7 +79,7 @@ IF (WIN32)
     include(FetchContent REQUIRED)
 
     FetchContent_Declare(
-	  icu URL https://github.com/unicode-org/icu/releases/download/release-74-2/icu4c-74_2-Win64-MSVC2019.zip
+	  icu URL https://github.com/unicode-org/icu/releases/download/release-78.3/icu4c-78.3-Win64-MSVC2022.zip
 	)
 	FetchContent_MakeAvailable(icu)
 
@@ -110,7 +110,7 @@ IF (WIN32)
 
 	FetchContent_Declare(
         winsparkle
-        URL https://github.com/vslavik/winsparkle/releases/download/v0.7.0/WinSparkle-0.7.0.zip
+        URL https://github.com/vslavik/winsparkle/releases/download/v0.9.2/WinSparkle-0.9.2.zip
     )
     FetchContent_MakeAvailable(winsparkle)
     set(WINSPARKLE_INCLUDE "${CMAKE_CURRENT_BINARY_DIR}/_deps/winsparkle-src/include")
@@ -165,7 +165,73 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 set(MANUALLY_RAPID_JSON "${CMAKE_CURRENT_LIST_DIR}/third_party/rapidjson/include")
 
 # Setup pybind11
-set(PYTHON_EXECUTABLE "python3" CACHE STRING "Specify the Python executable location to be used. This must match the PYTHON_VERSION_TO_USE option. Default is just python3 expecting it on the path")
+# Try to find Python executable with fallback from python3 to python
+if(NOT PYTHON_EXECUTABLE)
+	# Try python3 first
+	find_program(PYTHON3_EXECUTABLE python3)
+	if(PYTHON3_EXECUTABLE)
+		execute_process(
+			COMMAND ${PYTHON3_EXECUTABLE} --version
+			RESULT_VARIABLE PYTHON3_CHECK_RESULT
+			OUTPUT_VARIABLE PYTHON3_VERSION_OUTPUT
+			ERROR_VARIABLE PYTHON3_VERSION_ERROR
+		)
+		if(NOT PYTHON3_CHECK_RESULT)
+			# Check if it's Python 3.12+
+			set(PYTHON3_VERSION_STRING "${PYTHON3_VERSION_OUTPUT}${PYTHON3_VERSION_ERROR}")
+			if(PYTHON3_VERSION_STRING MATCHES "Python ([0-9]+)\\.([0-9]+)")
+				set(PYTHON3_DETECTED_MAJOR ${CMAKE_MATCH_1})
+				set(PYTHON3_DETECTED_MINOR ${CMAKE_MATCH_2})
+				set(PYTHON3_DETECTED_VERSION "${PYTHON3_DETECTED_MAJOR}.${PYTHON3_DETECTED_MINOR}")
+				if(PYTHON3_DETECTED_MAJOR EQUAL 3 AND PYTHON3_DETECTED_VERSION VERSION_GREATER_EQUAL "3.12")
+					set(PYTHON_EXECUTABLE "${PYTHON3_EXECUTABLE}" CACHE STRING "Specify the Python executable location to be used. This must match the PYTHON_VERSION_TO_EMBED option.")
+				else()
+					message(WARNING "Found 'python3' but it is version ${PYTHON3_DETECTED_VERSION}, which is less than the required 3.12. Will try 'python' as fallback.")
+				endif()
+			else()
+				message(WARNING "Found 'python3' but could not determine its version. Will try 'python' as fallback.")
+			endif()
+		endif()
+		unset(PYTHON3_EXECUTABLE CACHE)
+	endif()
+	
+	# If python3 didn't work, try python (but verify it's Python 3, not Python 2)
+	if(NOT PYTHON_EXECUTABLE)
+		find_program(PYTHON_EXECUTABLE_CANDIDATE python)
+		if(PYTHON_EXECUTABLE_CANDIDATE)
+			execute_process(
+				COMMAND ${PYTHON_EXECUTABLE_CANDIDATE} --version
+				RESULT_VARIABLE PYTHON_CHECK_RESULT
+				OUTPUT_VARIABLE PYTHON_VERSION_OUTPUT
+				ERROR_VARIABLE PYTHON_VERSION_ERROR
+			)
+			if(NOT PYTHON_CHECK_RESULT)
+				# Check if it's Python 3.12+ (not Python 2 or older Python 3)
+				set(PYTHON_VERSION_STRING "${PYTHON_VERSION_OUTPUT}${PYTHON_VERSION_ERROR}")
+				if(PYTHON_VERSION_STRING MATCHES "Python ([0-9]+)\\.([0-9]+)")
+					set(PYTHON_DETECTED_MAJOR ${CMAKE_MATCH_1})
+					set(PYTHON_DETECTED_MINOR ${CMAKE_MATCH_2})
+					set(PYTHON_DETECTED_VERSION "${PYTHON_DETECTED_MAJOR}.${PYTHON_DETECTED_MINOR}")
+					if(PYTHON_DETECTED_MAJOR EQUAL 3 AND PYTHON_DETECTED_VERSION VERSION_GREATER_EQUAL "3.12")
+						set(PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_CANDIDATE}" CACHE STRING "Specify the Python executable location to be used. This must match the PYTHON_VERSION_TO_EMBED option. Fallback to python as python3 was not found.")
+					else()
+						# python points to Python 2 or Python 3 < 3.12, reject it
+						message(WARNING "Found 'python' but it is version ${PYTHON_DETECTED_VERSION}, which is less than the required 3.12. Please install Python 3.12 or later and ensure 'python3' is available.")
+					endif()
+				else()
+					# Could not parse version, reject it
+					message(WARNING "Found 'python' but could not determine its version. Please install Python 3.12 or later and ensure 'python3' is available.")
+				endif()
+			endif()
+			unset(PYTHON_EXECUTABLE_CANDIDATE CACHE)
+		endif()
+	endif()
+	
+	# If still not found, provide helpful error
+	if(NOT PYTHON_EXECUTABLE)
+		message(FATAL_ERROR "Could not find a working Python executable (tried python3 and python). Please install Python 3.12 or later and ensure it is in your PATH.")
+	endif()
+endif()
 IF(WIN32)
 	message("USING PYTHON ${PYTHON_EXECUTABLE}")		
 ELSE()
@@ -201,10 +267,10 @@ ENDIF()
 # CPack installer on macOS.
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/third_party/SQLiteCpp EXCLUDE_FROM_ALL)
 
-# Adding JUCE 6.0
+# Adding JUCE
 add_subdirectory("third_party/JUCE" EXCLUDE_FROM_ALL)
 
-# Adding JUCE modules
+# Adding more third party modules
 add_subdirectory("third_party/")
 
 # Build a static library from juce 
@@ -293,7 +359,13 @@ add_subdirectory(The-Orm)
 
 option(BUILD_PATCH_DATABASE_TESTS "Build the PatchDatabase doctest binary" OFF)
 if(BUILD_PATCH_DATABASE_TESTS)
-	add_executable(patch_database_migration_test tests/patch_database_migration_test.cpp)
+	add_executable(patch_database_migration_test
+		tests/patch_database_migration_test.cpp
+		tests/patch_list_fill_test.cpp
+		tests/patch_database_search_test.cpp
+		tests/user_bank_save_test.cpp
+		tests/test_helpers.h
+		The-Orm/UserBankFactory.cpp)
 	target_include_directories(patch_database_migration_test PRIVATE
 		${CMAKE_CURRENT_LIST_DIR}
 		${CMAKE_CURRENT_LIST_DIR}/MidiKraft
@@ -303,5 +375,3 @@ if(BUILD_PATCH_DATABASE_TESTS)
 		${CMAKE_CURRENT_LIST_DIR}/third_party/SQLiteCpp/include)
     target_link_libraries(patch_database_migration_test PRIVATE midikraft-database SQLiteCpp)
 endif()
-
-

MidiKraft

@@ -43,13 +43,15 @@ Questions and help with implementing new synths wanted! Or if you have found a b
 | Kawai | K1/K1m/K1r | beta | adaptation | |
 | Kawai | K3/K3m | works | native | |
 | Kawai | K4 | alpha | adaptation | |
+| Kawai | K5000 | beta | adaptation | Heroic effort by @markusschlosser! Most complex! |
 | Korg | 03R/W | works | adaptation | Thanks to Philippe! |
 | Korg | DW-6000 | works | adaptation | |
 | Korg | DW-8000/EX-8000 | works | adaptation | |
 | Korg | M1 | works | adaptation | Thanks to Jentusalentu at YT for giving the nudge |
 | Korg | microKORG S | works | adaptation | Thanks to @ilantz! |
 | Korg | Minilogue XD | works | adaptation | Thanks to @andy2no|
 | Korg | MS2000/microKORG | works | adaptation | Thanks to @windo|
+| Korg | R3 | alpha | adaptation | 100% AI generated |
 | Line 6 | POD Series | works | adaptation | Thanks to @milnak! |
 | Moog | Voyager | works | adaptation | Thanks to @troach242 for the nudge and test! |
 | Novation | AStation/KStation | beta | adaptation | Thanks to @thechildofroth |
@@ -66,11 +68,14 @@ Questions and help with implementing new synths wanted! Or if you have found a b
 | Roland | JX-8P | alpha | adaptation | |
 | Roland | Juno-DS | works | adaptation | contributed by @mslinn! Thank you! |
 | Roland | D-50 | works | adaptation | Shout out to @summersetter for testing! |
+| Roland | JD-Xi | alpha | adaptation | 100% AI generated |
 | Roland | JV-80/880/90/1000 | beta | adaptation | |
 | Roland | JV-1080/2080 | beta | adaptation | |
 | Roland | MKS-50 | alpha | native | |
 | Roland | MKS-70 (Vecoven) | beta | adaptation | Thanks to @markusschloesser!|
 | Roland | MKS-80 | works | native | |
+| Roland | SE-02 | beta | adaptation | Thanks to @MammaScan! |
+| Roland | U-20/U-220 | alpha | adaptation | 100% AI generated. Thanks to @Casuallynoted for testing! |
 | Roland | V-Drums TD-07 | alpha | adaptation | |
 | Roland | XV-3080/5080/5050 | works | adaptation | |
 | Sequential| Pro 3 | works | adaptation | |
@@ -174,7 +179,7 @@ This will produce the executable in the path `builds\The-Orm\Release`, namely a
 
 ## Building on Linux
 
-See the azure-pipelines.yml file for some hints how the Ubuntu server is doing it. Mainly, you need to install a long list of prerequisites and development libraries:
+See the GitHub Actions workflow files for some hints how the Ubuntu server is doing it. Mainly, you need to install a long list of prerequisites and development libraries:
 
     sudo apt-get -y update && sudo apt-get install -y libcurl4-openssl-dev pkg-config libtbb-dev libasound2-dev libboost-dev libgtk-3-dev libwebkit2gtk-4.0-dev libglew-dev libjack-dev libicu-dev libpython3-all-dev
 
@@ -187,6 +192,25 @@ This will produce a single executable `builds/The-Orm/KnobKraftOrm` that you can
 
 The LDFLAGS is required for a certain combination of gcc version/pybind11, else you will run into internal compiler errors. See issue #6 for a discussion.
 
+## Building on Arch Linux with Docker
+
+If you are running Arch Linux (or an Arch derivative) and the release binary fails due to library mismatches, you can build an Arch-linked binary in Docker using `docker/archlinux/Dockerfile`. This is based on the setup contributed in issue #319.
+
+Clone the repository with submodules and build the Docker image from the repository root:
+
+    git clone --recurse-submodules https://github.com/christofmuc/KnobKraft-orm
+    cd KnobKraft-orm
+    docker build -f docker/archlinux/Dockerfile -t knobkraft-orm-arch .
+
+The Docker build compiles KnobKraft Orm and runs the PatchDatabase doctest binary. The resulting `KnobKraftOrm` executable is linked against Arch Linux libraries and is expected to run on Arch or Arch-derivative hosts only; for Debian, Ubuntu, Fedora, or other distributions, use the native Linux build instructions above or create a matching distro-specific Docker build instead. To copy the compiled application out of the image:
+
+    container_id=$(docker create knobkraft-orm-arch)
+    docker cp "$container_id:/KnobKraft-orm/builds/The-Orm" ./The-Orm-arch
+    docker rm "$container_id"
+    ./The-Orm-arch/KnobKraftOrm
+
+The same Dockerfile is built by the `Arch Linux Docker Build` GitHub Action so the documented Arch build path is checked regularly.
+
 ## Building on macOS
 
 If you are inclined to build on Mac, you know what you're doing. I'd recommend to install the build requisites via homebrew like this

README.md

@@ -93,6 +93,7 @@ set(SOURCES
 	SimplePatchGrid.cpp SimplePatchGrid.h
 	SynthBankPanel.cpp SynthBankPanel.h
 	UIModel.cpp UIModel.h
+	UserBankFactory.cpp UserBankFactory.h
 	VerticalPatchButtonList.cpp VerticalPatchButtonList.h
 	win_resources.rc
 	version.cpp.in
@@ -246,7 +247,7 @@ IF(WIN32)
 	add_custom_command(
 			TARGET KnobKraftOrm POST_BUILD
 			COMMAND ${CMAKE_COMMAND} -E copy
-					"${icu_SOURCE_DIR}/bin64/icuuc74.dll" "${icu_SOURCE_DIR}/bin64/icudt74.dll"
+					"${icu_SOURCE_DIR}/bin64/icuuc78.dll" "${icu_SOURCE_DIR}/bin64/icudt78.dll"
 					${SENTRY_DISTRIBUTION_FILES} ${WINSPARKLE_DISTRIBUTION_FILES}
 					${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>)
 	add_custom_command(
@@ -269,6 +270,12 @@ add_custom_command(TARGET KnobKraftOrm POST_BUILD
 		-DNO_PYCACHE_DEST_DIR=$<TARGET_FILE_DIR:KnobKraftOrm>/roland
 		-P ${CMAKE_SOURCE_DIR}/cmake/copy_without_pycache.cmake
 		)
+add_custom_command(TARGET KnobKraftOrm POST_BUILD
+                COMMAND ${CMAKE_COMMAND}
+                -DNO_PYCACHE_SOURCE_DIR=${CMAKE_SOURCE_DIR}/adaptations/korg
+                -DNO_PYCACHE_DEST_DIR=$<TARGET_FILE_DIR:KnobKraftOrm>/korg
+                -P ${CMAKE_SOURCE_DIR}/cmake/copy_without_pycache.cmake
+                )
 add_custom_command(TARGET KnobKraftOrm POST_BUILD
 		COMMAND ${CMAKE_COMMAND}
 		-DNO_PYCACHE_SOURCE_DIR=${CMAKE_SOURCE_DIR}/adaptations/knobkraft

The-Orm/CMakeLists.txt

@@ -8,6 +8,7 @@
 
 #include "LayoutConstants.h"
 #include "SynthBank.h"
+#include "UserBankFactory.h"
 
 #include "Capability.h"
 #include "HasBanksCapability.h"
@@ -205,7 +206,7 @@ void CreateListDialog::notifyResult()
 		if (isBank_) {
 			int bankSelected = bankValue_.getValue();
 			bank_ = MidiBankNumber::fromZeroBase(bankSelected, midikraft::SynthBank::numberOfPatchesInBank(synth_, bankSelected));
-			list_ = std::make_shared<midikraft::SynthBank>(name.toStdString(), synth_, bank_);
+			list_ = knobkraft::createUserBank(synth_, bankSelected, name.toStdString());
 		}
 		else {
 			list_ = std::make_shared<midikraft::PatchList>(name.toStdString());

The-Orm/CreateListDialog.cpp

@@ -1110,7 +1110,7 @@ int MainComponent::findIndexOfTabWithNameEnding(TabbedComponent* mainTabs, Strin
 
 void MainComponent::aboutBox()
 {
-	String message = "This software is copyright 2020-2024 by Christof Ruch\n\n"
+	String message = "This software is copyright 2020-2026 by Christof Ruch\n\n"
 		"Released under dual license, by default under AGPL-3.0, but an MIT licensed version is available on request by the author\n"
 		"\n"
 		"The homepage of the project is https://github.com/christofmuc/KnobKraft-orm\n"

The-Orm/MainComponent.cpp

@@ -246,6 +246,36 @@ void PatchButtonPanel::setPatches(std::vector<midikraft::PatchHolder> const &pat
 	setupPageButtons();
 }
 
+bool PatchButtonPanel::updateVisiblePatch(midikraft::PatchHolder const& patch)
+{
+	for (size_t i = 0; i < patches_.size(); ++i) {
+		auto& visiblePatch = patches_[i];
+		bool sameMd5 = visiblePatch.md5() == patch.md5();
+		bool sameSynth = (!visiblePatch.synth() || !patch.synth() || visiblePatch.synth()->getName() == patch.synth()->getName());
+		if (sameMd5 && sameSynth) {
+			visiblePatch = patch;
+
+			if (i < patchButtons_->size() && visiblePatch.patch() && visiblePatch.synth()) {
+				auto displayMode = PatchHolderButton::getCurrentInfoForSynth(visiblePatch.synth()->getName());
+				if (UIModel::instance()->multiMode_.multiSynthMode()) {
+					displayMode = static_cast<PatchButtonInfo>(
+						static_cast<int>(PatchButtonInfo::SubtitleSynth) | (static_cast<int>(displayMode) & static_cast<int>(PatchButtonInfo::CenterMask))
+						);
+				}
+				patchButtons_->buttonWithIndex((int)i)->setPatchHolder(&visiblePatch, displayMode);
+				refreshThumbnail((int)i);
+			}
+			else {
+				// Fallback safety for incomplete data
+				refresh(false);
+			}
+			return true;
+		}
+	}
+
+	return false;
+}
+
 String PatchButtonPanel::createNameOfThubnailCacheFile(midikraft::PatchHolder const &patch) {
 	File thumbnailCache = UIModel::getThumbnailDirectory().getChildFile(patch.md5() + ".kkc");
 	return thumbnailCache.getFullPathName();