diff --git a/.gitignore b/.gitignore index 54dcf66..8396632 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ react/package-lock.json src/dbus/bluez_adaptor.h src/dbus/bluez_proxy.h + +CMakeFiles \ No newline at end of file diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index d7afa68..a0f3d56 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -5,13 +5,14 @@ "includePath": [ "${default}", "${workspaceFolder}", - "${workspaceFolder}/src", + "${workspaceFolder}/build/src/**", + "${workspaceFolder}/src/**", + "${workspaceFolder}/**", "/usr/include/lilv-0", "/usr/include/x86_64-linux-gnu", - "/usr/lib", - "~/src/vst3sdk" + "/usr/lib" ], - "compilerPath": "/usr/bin/gcc", + "compilerPath": "/usr/bin/gcc-12", "cStandard": "c17", "cppStandard": "c++20", "intelliSenseMode": "linux-gcc-arm64", diff --git a/.vscode/launch.json b/.vscode/launch.json index 6e6cf77..4b516f5 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -21,7 +21,9 @@ "request": "launch", // Resolved by CMake Tools: "program": "${command:cmake.launchTargetPath}", - "args": [ ], + "args": [ + "--no-sudo" + ], "stopAtEntry": false, "cwd": "${workspaceFolder}", "environment": [ @@ -138,7 +140,9 @@ //"[inverting_mutex_test]" // "[utf8_to_utf32]" //"[pipedal_alsa_test]" - "[wifi_channels_test]" + // "[wifi_channels_test]" + // "[locale]" + "[modFileTypes]" ], "stopAtEntry": false, @@ -266,6 +270,48 @@ } ] }, + { + "name": "(gdb) pipedalconfigX", + "type": "cppdbg", + "request": "launch", + // Resolved by CMake Tools: + "program": "/home/robin/src/pipedal/build/src/pipedalconfig", + "args": [ + "--nosudo", // run without sudo (which will fail because of perms, but allow us to debug deeper into install code.) + //"--get-current-port" + // "--uninstall" + //"--enable-p2p" , "CA", "PiPedalTest","12345678","14" + // "--alsa-devices" + "--prefix", "/usr", + "--install", "--port", "0" + ], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [ + { + "name": "PATH", + "value": "$PATH:${command:cmake.launchTargetDirectory}" + }, + { + "name": "ASAN_OPTIONS", + "value": "detect_leaks=0" + + }, + { + "name": "OTHER_VALUE", + "value": "Something something" + } + ], + "externalConsole": false, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + }, { @@ -312,46 +358,6 @@ } ] }, - { - "name": "(gdb) pipedalconfig", - "type": "cppdbg", - "request": "launch", - // Resolved by CMake Tools: - "program": "${command:cmake.launchTargetPath}", - "args": [ - "--nosudo", // run without sudo (which will fail because of perms, but allow us to debug deeper into install code.) - //"--get-current-port" - // "--uninstall" - //"--enable-p2p" , "CA", "PiPedalTest","12345678","14" - "--alsa-devices" - ], - "stopAtEntry": false, - "cwd": "${workspaceFolder}", - "environment": [ - { - "name": "PATH", - "value": "$PATH:${command:cmake.launchTargetDirectory}" - }, - { - "name": "ASAN_OPTIONS", - "value": "detect_leaks=0" - - }, - { - "name": "OTHER_VALUE", - "value": "Something something" - } - ], - "externalConsole": false, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - }, { "name": "(gdb) pipedal_alsa_check", "type": "cppdbg", diff --git a/.vscode/settings.json b/.vscode/settings.json index b305b9b..8e97e94 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -98,17 +98,41 @@ "p2p_i.h": "c", "p2p.h": "c", "hash_set": "cpp", - "barrier": "cpp" + "barrier": "cpp", + "format": "cpp", + "locale": "cpp", + "stdfloat": "cpp", + "text_encoding": "cpp" }, "cSpell.words": [ + "Alsa", + "flac", "Guitarix", "hostapd", + "Hotspot", + "invada", + "jmap", + "Lilv", + "midiclip", + "midisong", + "mlmodel", + "Pedalboard", "pipedal", "pipedal_0", "pipedalconfig", "pipedald", "pipedalshutdownd", "pipedaltest", - "ToobAmp" - ] + "pipedalui", + "rdfs", + "ToobAmp", + "urids", + "Writables", + "xruns" + ], + "C_Cpp.default.compilerPath": "/usr/bin/g++-13", + "cSpell.ignoreWords": [ + "nammodel" + ], + "cSpell.enabled": false } \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index e493246..7c637f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,39 +1,30 @@ cmake_minimum_required(VERSION 3.16.0) project(pipedal - VERSION 1.3.69 + VERSION 1.4.70 DESCRIPTION "PiPedal Guitar Effect Pedal For Raspberry Pi" HOMEPAGE_URL "https://rerdavies.github.io/pipedal" ) EXECUTE_PROCESS( COMMAND dpkg --print-architecture COMMAND tr -d '\n' OUTPUT_VARIABLE DEBIAN_ARCHITECTURE ) -set (DISPLAY_VERSION "PiPedal v1.3.69-Release") +set (DISPLAY_VERSION "PiPedal v1.4.70-Beta") set (PACKAGE_ARCHITECTURE ${DEBIAN_ARCHITECTURE}) set (CMAKE_INSTALL_PREFIX "/usr/") include(CTest) enable_testing() + #add_subdirectory("submodules/pipedal_p2pd") add_subdirectory("PiPedalCommon") -add_subdirectory("react") +add_subdirectory("vite") add_subdirectory("src") -# Replaced with hotspot. -#add_subdirectory("NetworkManagerP2P") -# install (TARGETS pipedal_p2pd DESTINATION ${CMAKE_INSTALL_PREFIX}/sbin -# ) - -# install (TARGETS pipedal_nm_p2pd DESTINATION ${CMAKE_INSTALL_PREFIX}/sbin -# ) - -# add_test(NAME Test COMMAND piddletest) - -set (REACT_BUILD_DIRECTORY ${PROJECT_SOURCE_DIR}/build/react/build/) +set (VITE_BUILD_DIRECTORY ${PROJECT_SOURCE_DIR}/vite/dist/) # install @@ -51,7 +42,7 @@ install ( FILES ${PROJECT_SOURCE_DIR}/src/polkit-1/rules/10-pipedal-networkmanager.rules DESTINATION /etc/polkit-1/rules.d/ ) install ( - DIRECTORY ${REACT_BUILD_DIRECTORY} DESTINATION /etc/pipedal/react + DIRECTORY ${VITE_BUILD_DIRECTORY} DESTINATION /etc/pipedal/react ) install (FILES ${PROJECT_SOURCE_DIR}/build/src/notices.txt DESTINATION /etc/pipedal/react/var/) @@ -98,7 +89,7 @@ endif() set(CPACK_GENERATOR "DEB") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Robin E. R. Davies") # required -set(CPACK_PACKAGE_VENDOR "Robin Davies") +set(CPACK_PACKAGE_VENDOR "Robin E. R. Davies") set(CPACK_PACKAGE_DESCRIPTION "IoT guitar effect pedal for Raspberry Pi, with phone-friendly web interface.") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IoT guitar effect pedal for Raspberry Pi") set(CPACK_DEBIAN_PACKAGE_SECTION sound) diff --git a/LICENSE.txt b/LICENSE.txt index 1125614..a0619cb 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright 2021-2024 Robin Davies +Copyright 2021-2024 Robin E. R. Davies Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/NetworkManagerP2P/src/main.cpp b/NetworkManagerP2P/src/main.cpp index c03d137..5ac848c 100644 --- a/NetworkManagerP2P/src/main.cpp +++ b/NetworkManagerP2P/src/main.cpp @@ -17,7 +17,7 @@ using namespace std; static void PrintHelp() { cout << "nm-pipedal-p2p - P2P Manager for NetworkManager network stack." << endl - << "Copyright (c) 2024 Robin Davies." << endl + << "Copyright (c) 2024 Robin E. R. Davies." << endl << endl << "Provides P2P connections on LINUX distributions that use NetworkManager." << endl << endl diff --git a/NetworkManagerP2P/src/ss.hpp b/NetworkManagerP2P/src/ss.hpp index 6b34c10..af6ce2e 100644 --- a/NetworkManagerP2P/src/ss.hpp +++ b/NetworkManagerP2P/src/ss.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Robin Davies +// Copyright (c) 2022 Robin E. R. Davies // // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/PiPedalCommon/src/CMakeLists.txt b/PiPedalCommon/src/CMakeLists.txt index 3926a61..9ab01b6 100644 --- a/PiPedalCommon/src/CMakeLists.txt +++ b/PiPedalCommon/src/CMakeLists.txt @@ -57,6 +57,7 @@ add_library(PiPedalCommon STATIC include/dbus/org.freedesktop.NetworkManager.Device.Wireless.hpp include/dbus/org.freedesktop.NetworkManager.DHCP4Config.hpp + Utf8Utils.cpp include/Utf8Utils.hpp NetworkManagerInterfaces.cpp include/NetworkManagerInterfaces.hpp Lv2Log.cpp include/Lv2Log.hpp diff --git a/PiPedalCommon/src/HtmlHelper.cpp b/PiPedalCommon/src/HtmlHelper.cpp index ac7c218..9944bd5 100644 --- a/PiPedalCommon/src/HtmlHelper.cpp +++ b/PiPedalCommon/src/HtmlHelper.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Robin Davies +// Copyright (c) 2022 Robin E. R. Davies // // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/PiPedalCommon/src/Lv2Log.cpp b/PiPedalCommon/src/Lv2Log.cpp index 7b43bec..686f1c4 100644 --- a/PiPedalCommon/src/Lv2Log.cpp +++ b/PiPedalCommon/src/Lv2Log.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Robin Davies +// Copyright (c) 2022 Robin E. R. Davies // // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/PiPedalCommon/src/NetLinkChannelInfo.cpp b/PiPedalCommon/src/NetLinkChannelInfo.cpp index 7d24513..a88d343 100644 --- a/PiPedalCommon/src/NetLinkChannelInfo.cpp +++ b/PiPedalCommon/src/NetLinkChannelInfo.cpp @@ -3,7 +3,7 @@ Copyright (c) 2007, 2008 Johannes Berg Copyright (c) 2007 Andy Lutomirski Copyright (c) 2007 Mike Kershaw Copyright (c) 2008 Luis R. Rodriguez -Copyright (c) 2024 Robin Davies +Copyright (c) 2024 Robin E. R. Davies All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/PiPedalCommon/src/NetLinkChannelInfo.cpp.bak b/PiPedalCommon/src/NetLinkChannelInfo.cpp.bak index 0012cd6..8d0a8af 100644 --- a/PiPedalCommon/src/NetLinkChannelInfo.cpp.bak +++ b/PiPedalCommon/src/NetLinkChannelInfo.cpp.bak @@ -3,7 +3,7 @@ Copyright (c) 2007, 2008 Johannes Berg Copyright (c) 2007 Andy Lutomirski Copyright (c) 2007 Mike Kershaw Copyright (c) 2008 Luis R. Rodriguez -Copyright (c) 2024 Robin Davies +Copyright (c) 2024 Robin E. R. Davies All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/PiPedalCommon/src/SysExec.cpp b/PiPedalCommon/src/SysExec.cpp index 8506b34..2244cf3 100644 --- a/PiPedalCommon/src/SysExec.cpp +++ b/PiPedalCommon/src/SysExec.cpp @@ -306,3 +306,37 @@ SysExecOutput pipedal::sysExecForOutput(const std::string &program, const std::s } } + + +int pipedal::SudoExec(int argc, char **argv) +{ + // re-execute with SUDO in order to prompt for SUDO credentials once only. + std::vector args; + std::string pkexec = "/usr/bin/sudo"; // staged because "ISO C++ forbids converting a string constant to std::vector::value_type"(!) + args.push_back((char *)(pkexec.c_str())); + + std::string sPath = getSelfExePath(); + args.push_back(const_cast(sPath.c_str())); + for (int arg = 1; arg < argc; ++arg) + { + args.push_back(const_cast(argv[arg])); + } + + args.push_back(nullptr); + + char **newArgs = &args[0]; + + int pbPid; + int returnValue = 0; + + if ((pbPid = fork()) == 0) + { + return execv(newArgs[0], newArgs); + } + else + { + waitpid(pbPid, &returnValue, 0); + int exitStatus = WEXITSTATUS(returnValue); + return exitStatus; + } +} diff --git a/PiPedalCommon/src/Utf8Utils.cpp b/PiPedalCommon/src/Utf8Utils.cpp new file mode 100644 index 0000000..f9f85b9 --- /dev/null +++ b/PiPedalCommon/src/Utf8Utils.cpp @@ -0,0 +1,340 @@ +// Copyright (c) 2023 Robin E. R. Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +#include "Utf8Utils.hpp" +#include "stdexcept" +#include + +using namespace std; +namespace pipedal +{ + + + static constexpr uint16_t UTF16_SURROGATE_TAG_MASK = 0xFC00; + static constexpr uint16_t UTF16_SURROGATE_1_BASE = 0xD800U; + static constexpr uint16_t UTF16_SURROGATE_2_BASE = 0xDC00U; + + + static constexpr uint32_t UTF8_ONE_BYTE_MASK = 0x80; + static constexpr uint32_t UTF8_ONE_BYTE_BITS = 0; + static constexpr uint32_t UTF8_TWO_BYTES_MASK = 0xE0; + static constexpr uint32_t UTF8_TWO_BYTES_BITS = 0xC0; + static constexpr uint32_t UTF8_THREE_BYTES_MASK = 0xF0; + static constexpr uint32_t UTF8_THREE_BYTES_BITS = 0xE0; + static constexpr uint32_t UTF8_FOUR_BYTES_MASK = 0xF8; + static constexpr uint32_t UTF8_FOUR_BYTES_BITS = 0xF0; + static constexpr uint32_t UTF8_CONTINUATION_MASK = 0xC0; + static constexpr uint32_t UTF8_CONTINUATION_BITS = 0x80; + static constexpr bool enforceValidUtf8Encoding = false; + + namespace implementation + { + void Utf8RangeError() + { + throw std::range_error("String index out of range."); + } + } + size_t Utf8Index(size_t size, const std::string &text) + { + size_t index = 0; + for (size_t i = 0; i < size; ++i) + { + index = Utf8Increment(index, text); + if (index >= text.size()) + break; + } + return index; + } + size_t Utf8Length(const std::string &text) + { + size_t index = 0; + size_t length = 0; + while (index < text.length()) + { + index = Utf8Increment(index, text); + ++length; + } + return length; + } + size_t Utf8Increment(size_t size, const std::string &text) + { + if (size >= text.length()) + { + implementation::Utf8RangeError(); + } + uint8_t uc = (uint8_t)text[size]; + if (uc < 0x80U) + { + return size + 1; + } + else + { + ++size; + while (size < text.size() && (((uint8_t)text[size]) & 0xC0) == 0x80) + { + ++size; + } + return size; + } + } + size_t Utf8Decrement(size_t size, const std::string &text) + { + if (size == 0) + { + implementation::Utf8RangeError(); + } + uint8_t c = text[size - 1]; + if (c < 0x80U) + { + return size - 1; + } + else + { + while ((uint8_t)(text[size - 1] & 0xC0) == 0x80) + { + --size; + } + if (size != 0 && (uint8_t)(text[size - 1]) > 0x80) + { + --size; + } + else + { + implementation::Utf8RangeError(); + } + + return size; + } + } + + std::string Utf8Erase(const std::string &text, size_t start, size_t end) + { + size_t uStart = Utf8Index(start, text); + size_t uEnd = Utf8Index(end, text); + std::string result; + result.reserve(uStart + text.size() - uEnd); + result.append(text.begin(), text.begin() + uStart); + result.append(text.begin() + uEnd, text.end()); + return result; + } + std::string Utf8Substring(const std::string &text, size_t start, size_t end) + { + size_t uStart = Utf8Index(start, text); + size_t uEnd; + if (end == (size_t)-1) + { + uEnd = text.length(); + } + else + { + uEnd = Utf8Index(end, text); + } + return text.substr(uStart, uEnd - uStart); + } + + static char32_t bits(int nBits, int shift, char32_t c) + { + return (c >> shift) & ((1 << nBits) - 1); + } + std::string Utf8FromUtf32(char32_t value) + { + std::stringstream ss; + if (value < 0x7F) + { + ss << (char)value; + } + else if (value <= 0x7FF) + { + ss << (char)(0xC0 + bits(5, 6, value)); + ss << (char)(0x80 + bits(6, 0, value)); + } + else if (value <= 0xFFFFul) + { + ss << (char)(0xE0 + bits(4, 12, value)); + ss << (char)(0x80 + bits(6, 6, value)); + ss << (char)(0x80 + bits(6, 0, value)); + } + else if (value <= 0x10FFFFul) + { + ss << (char)(0xF0 + bits(3, 18, value)); + ss << (char)(0x80 + bits(6, 12, value)); + ss << (char)(0x80 + bits(6, 6, value)); + ss << (char)(0x80 + bits(6, 0, value)); + } + else + { + throw std::runtime_error("Invalid unicode character."); + } + return ss.str(); + } + + std::string Utf16ToUtf8(const std::u16string_view&v) + { + std::stringstream ss; + for (auto i = v.begin(); i != v.end(); /**/) + { + char32_t value = *i++; + if ((value & UTF16_SURROGATE_TAG_MASK) == UTF16_SURROGATE_1_BASE) + { + if (i == v.end()) + { + throw std::runtime_error("Invalid UTF32 character sequence."); + } + char32_t value2 = *i++; + if ((value & UTF16_SURROGATE_TAG_MASK) != UTF16_SURROGATE_2_BASE) + { + throw std::runtime_error("Invalid UTF32 character sequence."); + } + value = (value << 10) + value2; + } + + if (value < 0x7F) + { + ss << (char)value; + } + else if (value <= 0x7FF) + { + ss << (char)(0xC0 + bits(5, 6, value)); + ss << (char)(0x80 + bits(6, 0, value)); + } + else if (value <= 0xFFFFul) + { + ss << (char)(0xE0 + bits(4, 12, value)); + ss << (char)(0x80 + bits(6, 6, value)); + ss << (char)(0x80 + bits(6, 0, value)); + } + else if (value <= 0x10FFFFul) + { + ss << (char)(0xF0 + bits(3, 18, value)); + ss << (char)(0x80 + bits(6, 12, value)); + ss << (char)(0x80 + bits(6, 6, value)); + ss << (char)(0x80 + bits(6, 0, value)); + } + else + { + throw std::runtime_error("Invalid unicode character."); + } + } + return ss.str(); + } + + + [[noreturn]] static void throw_encoding_error() + { + throw std::runtime_error("Invalid UTF8 character."); + } + + static uint32_t continuation_byte(std::string_view::iterator &p, std::string_view::const_iterator end) + { + if (p == end) + throw_encoding_error(); + uint8_t c = *p++; + if ((c & UTF8_CONTINUATION_MASK) != UTF8_CONTINUATION_BITS) + throw_encoding_error(); + return c & 0x3F; + } + + std::u16string Utf8ToUtf16(const std::string_view &v) + { + std::basic_stringstream os; + // convert to utf-32. + // convert utf-32 to normalized utf-16. + // write non-7-bit and unsafe characters as \uHHHH. + + auto p = v.begin(); + while (p != v.end()) + { + uint32_t uc; + uint8_t c = (uint8_t)*p++; + if ((c & UTF8_ONE_BYTE_MASK) == UTF8_ONE_BYTE_BITS) + { + uc = c; + } + else + { + uint32_t c2 = continuation_byte(p, v.end()); + + if ((c & UTF8_TWO_BYTES_MASK) == UTF8_TWO_BYTES_BITS) + { + uint32_t c1 = c & (uint32_t)(~UTF8_TWO_BYTES_MASK); + if (c1 <= 1 && enforceValidUtf8Encoding) + { + // overlong encoding. + throw_encoding_error(); + } + uc = (c1 << 6) | c2; + } + else + { + uint32_t c3 = continuation_byte(p, v.end()); + + if ((c & UTF8_THREE_BYTES_MASK) == UTF8_THREE_BYTES_BITS) + { + uint32_t c1 = c & (uint32_t)~UTF8_THREE_BYTES_MASK; + if (c1 == 0 && c2 < 0x20 && enforceValidUtf8Encoding) + { + // overlong encoding. + throw_encoding_error(); + } + + uc = (c1) << 12 | (c2 << 6) | c3; + } + else + { + uint32_t c4 = continuation_byte(p, v.end()); + if ((c & UTF8_FOUR_BYTES_MASK) == UTF8_FOUR_BYTES_BITS) + { + uint32_t c1 = c & (uint32_t)~UTF8_FOUR_BYTES_MASK; + if (c1 == 0 && c2 < 0x10 && enforceValidUtf8Encoding) + { + // overlong encoding. + throw_encoding_error(); + } + uc = (c1 << 18) | (c2 << 12) | (c3 << 6) | c4; + } + else + { + // outside legal UCS range. + throw_encoding_error(); + } + } + } + } + if (uc < 0x10000ul) + { + os << (char16_t)uc; + } + else + { + // write UTF-16 surrogate pair. + uc -= 0x10000; + + char16_t s1 = (char16_t)(UTF16_SURROGATE_1_BASE + ((uc >> 10) & 0x3FFu)); + char16_t s2 = (char16_t)(UTF16_SURROGATE_2_BASE + (uc & 0x03FFu)); + // surrogate pair. + os << s1; + os << s2; + } + } + return os.str(); + } + + + +} \ No newline at end of file diff --git a/PiPedalCommon/src/include/SysExec.hpp b/PiPedalCommon/src/include/SysExec.hpp index 031b90d..7b0a1d2 100644 --- a/PiPedalCommon/src/include/SysExec.hpp +++ b/PiPedalCommon/src/include/SysExec.hpp @@ -43,5 +43,9 @@ namespace pipedal void sysExecTerminate(ProcessId pid_, int termTimeoutMs = 1000, int killTimeoutMs = 500); // returns the process's exit status. int sysExecWait(ProcessId pid); + // re-execute the current program with current argument, but with sudo. + int SudoExec(int argc, char **argv); + + std::string getSelfExePath(); } \ No newline at end of file diff --git a/PiPedalCommon/src/include/Utf8Utils.hpp b/PiPedalCommon/src/include/Utf8Utils.hpp new file mode 100644 index 0000000..5b31af4 --- /dev/null +++ b/PiPedalCommon/src/include/Utf8Utils.hpp @@ -0,0 +1,50 @@ +// Copyright (c) 2023 Robin E. R. Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +#pragma once + + +#include +#include +#include + +namespace pipedal { + size_t Utf8Index(size_t size, const std::string &text); + size_t Utf8Decrement(size_t size, const std::string &text); + size_t Utf8Increment(size_t size, const std::string &text); + size_t Utf8Length(const std::string&text); + + std::string Utf8Erase(const std::string&text, size_t start, size_t end); + std::string Utf8Substring(const std::string&text, size_t start, size_t end); + inline std::string Utf8Substring(const std::string&text, size_t start) { + return Utf8Substring(text,start,(size_t)-1); + } + namespace implementation { + void Utf8RangeError(); + } + + std::string Utf8FromUtf32(char32_t value); + + + std::u16string Utf8ToUtf16(const std::string_view&s); + std::string Utf16ToUtf8(const std::u16string_view&s); + + +} + diff --git a/PiPedalCommon/src/include/json.hpp b/PiPedalCommon/src/include/json.hpp index 7b0860a..f47deba 100644 --- a/PiPedalCommon/src/include/json.hpp +++ b/PiPedalCommon/src/include/json.hpp @@ -34,6 +34,7 @@ #include #include #include +#include #define DECLARE_JSON_MAP(CLASSNAME) \ static pipedal::json_map::storage_type jmap @@ -592,6 +593,17 @@ namespace pipedal write(obj.get()); } } + template + void write(const std::optional &obj) + { + if (!obj) { + write_raw("null"); + } else { + write(obj.get()); + } + } + + template void write(const std::weak_ptr &obj) { @@ -883,6 +895,20 @@ namespace pipedal } } template + void read(std::optional *pOptional) + { + if (peek() == 'n') + { + consumeToken("null", "Expecting '{' or 'null'."); + *pOptional = std::optional(); + + } else { + T value; + read(&value); + *pOptional = std::move(value); + } + } + template void read(std::weak_ptr *pUniquePtr) { throw std::domain_error("Can't read std::weak_ptr"); diff --git a/PiPedalCommon/src/include/util.hpp b/PiPedalCommon/src/include/util.hpp index 405b6e2..793e187 100644 --- a/PiPedalCommon/src/include/util.hpp +++ b/PiPedalCommon/src/include/util.hpp @@ -20,67 +20,105 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#pragma once +#pragma once #include #include #include #include #include +#include -namespace pipedal { +namespace pipedal +{ - inline bool endsWith(const std::string& str, const std::string& suffix) + inline bool endsWith(const std::string &str, const std::string &suffix) { - return str.size() >= suffix.size() && 0 == str.compare(str.size()-suffix.size(), suffix.size(), suffix); + return str.size() >= suffix.size() && 0 == str.compare(str.size() - suffix.size(), suffix.size(), suffix); } void SetThreadName(const std::string &name); std::u32string ToUtf32(const std::string &s); - inline bool isPathSeperator(char c) { return c == '/' || c == std::filesystem::path::preferred_separator;} + inline bool isPathSeparator(char c) { return c == '/' || c == std::filesystem::path::preferred_separator; } std::string GetHostName(); std::vector split(const std::string &value, char delimiter); - inline void ReadBarrier() { + inline void ReadBarrier() + { std::atomic_thread_fence(std::memory_order::acquire); } - inline void WriteBarrier() { + inline void WriteBarrier() + { std::atomic_thread_fence(std::memory_order::release); - } template - inline bool contains(const std::vector&vector,const T&value) + inline bool contains(const std::vector &vector, const T &value) { for (auto i = vector.begin(); i != vector.end(); ++i) { - if ((*i) == value) { + if ((*i) == value) + { return true; } } return false; } - inline bool contains(const std::vector&vector,const char*value) + inline bool contains(const std::vector &vector, const char *value) { - return contains(vector,std::string(value)); + return contains(vector, std::string(value)); } - class NoCopy { + class NoCopy + { public: - NoCopy() { } - NoCopy(const NoCopy&) = delete; - NoCopy&operator=(const NoCopy&) = delete; + NoCopy() {} + NoCopy(const NoCopy &) = delete; + NoCopy &operator=(const NoCopy &) = delete; ~NoCopy() {} }; - class NoMove { + class NoMove + { public: - NoMove() { } - NoMove(NoMove&&) = delete; - NoMove&operator=(NoMove&&) = delete; - ~NoMove() { } - + NoMove() {} + NoMove(NoMove &&) = delete; + NoMove &operator=(NoMove &&) = delete; + ~NoMove() {} }; + bool IsChildDirectory(const std::filesystem::path &path, const std::filesystem::path&rootPath); + + template + std::set Intersect(const std::set &left, const std::set &right) + { + std::set result; + for (const T &v : left) + { + if (right.contains(v)) + { + result.insert(v); + } + } + return result; + } + template + bool IsSubset(const std::set &subset, const std::set &set) + { + std::set result; + for (const T &v : subset) + { + if (!set.contains(v)) return false; + } + return true; + } + + // C locale to lower. Only does 'A'-'Z'. + std::string ToLower(const std::string&value); + + std::filesystem::path MakeRelativePath(const std::filesystem::path &path, const std::filesystem::path&parentPath); + + bool IsSubdirectory(const std::filesystem::path &path, const std::filesystem::path &basePath); + } diff --git a/PiPedalCommon/src/json.cpp b/PiPedalCommon/src/json.cpp index 5b55fc6..c25f5ae 100644 --- a/PiPedalCommon/src/json.cpp +++ b/PiPedalCommon/src/json.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Robin Davies +// Copyright (c) 2022 Robin E. R. Davies // // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/PiPedalCommon/src/util.cpp b/PiPedalCommon/src/util.cpp index e01c179..08de1f2 100644 --- a/PiPedalCommon/src/util.cpp +++ b/PiPedalCommon/src/util.cpp @@ -21,6 +21,7 @@ * SOFTWARE. */ #include "util.hpp" +#include "ss.hpp" #include #include @@ -136,3 +137,82 @@ std::vector pipedal::split(const std::string &value, char delimiter } return result; } + + +bool pipedal::IsChildDirectory(const std::filesystem::path &path, const std::filesystem::path&rootPath) +{ + auto iter = path.begin(); + + for (auto i = rootPath.begin(); i != rootPath.end(); ++i) + { + if (iter == path.end() || *iter != *i) + { + return false; + } + ++iter; + } + return true; +} + + +std::string pipedal::ToLower(const std::string&value) +{ + std::string result; + result.resize(value.length()); + for (size_t i = 0; i < value.length(); ++i) + { + result[i] = (char)tolower(value[i]); + } + return result; +} + + +std::filesystem::path pipedal::MakeRelativePath(const std::filesystem::path &path, const std::filesystem::path&parentPath) +{ + if (path.is_relative()) return path; + + auto iter = path.begin(); + + for (auto i = parentPath.begin(); i != parentPath.end(); ++i) + { + if (iter == path.end() || *iter != *i) { + // not a child directory of parent directory. + throw std::runtime_error("Not a child directory."); + } + ++iter; + } + std::filesystem::path remander; + while (iter != path.end()) + { + remander /= *iter++; + } + return remander; + +} + +bool pipedal::IsSubdirectory(const std::filesystem::path &path, const std::filesystem::path &basePath) +{ + auto iPath = path.begin(); + for (auto i = basePath.begin(); i != basePath.end(); ++i) + { + if (iPath == path.end()) + { + return false; + } + + if ((*i) != (*iPath)) + { + return false; + } + ++iPath; + } + while (iPath != path.end()) + { + if (iPath->string() == "..") + { + return false; + } + ++iPath; + } + return true; +} diff --git a/README.md b/README.md index 558c9af..85d33da 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ -Download: v1.3.69 +Download: v1.4.70 Website: [https://rerdavies.github.io/pipedal](https://rerdavies.github.io/pipedal). Documentation: [https://rerdavies.github.io/pipedal/Documentation.html](https://rerdavies.github.io/pipedal/Documentation.html). @@ -15,7 +15,7 @@ Documentation: [https://rerdavies.github.io/pipedal/Documentation.html](htt #### Important notice: PiPedal has a submitted a request to support sharing of Pipedal presets at [PatchStorage.com](https:///patchstorage.com). We need your support! Please vote for PiPedal [here](https://patchstorage.com/requests/pipedal/). -#### NEW version 1.3.69 Release, providing [snapshots](https://rerdavies.github.io/pipedal/Snaphots.html), and a new Performance View. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details. +#### NEW version 1.4.70 Beta. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.   diff --git a/debian/copyright b/debian/copyright index 6efca97..45dd967 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,24 +1,24 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: pipedal -Upstream-Contact: Robin Davies +Upstream-Contact: Robin E. R. Davies Source: https://www.example.com/software/project Files: * -Copyright: 2021, Robin Davies +Copyright: 2021, Robin E. R. Davies License: Expat Files: src/* -Copyright: 2021, Robin Davies +Copyright: 2021, Robin E. R. Davies License: Expat Files: react/src -Copyright: 2020, Robin Davies. +Copyright: 2020, Robin E. R. Davies. License: Expat Files: src/Lv2EventBufferWriter.hpp Copyright: 2008-2014, David Robillard - 2021, Robin Davies + 2021, Robin E. R. Davies License: ISC and Expat Files: react/node_modules/@babel/* diff --git a/debian/fill.copyright.blanks.yml b/debian/fill.copyright.blanks.yml index 1760ec1..15f83f9 100644 --- a/debian/fill.copyright.blanks.yml +++ b/debian/fill.copyright.blanks.yml @@ -1,11 +1,11 @@ --- /: license: Expat - copyright: 2021, Robin Davies. + copyright: 2021, Robin E. R. Davies. src/react/: license: Expat - copyright: 2021, Robin Davies. + copyright: 2021, Robin E. R. Davies. react/node_modules/webpack/: license: Expat diff --git a/docs/BuildPrerequisites.md b/docs/BuildPrerequisites.md index c19beb8..40adbc5 100644 --- a/docs/BuildPrerequisites.md +++ b/docs/BuildPrerequisites.md @@ -4,7 +4,7 @@ Run the following commands to install build tools required by the PiPedal build. # install CMake sudo apt updatee - sudo apt install -y cmake ninja-build gcc git + sudo apt install -y cmake ninja-build build-essential g++ git The PiPedal build process also requires version 12 or later of `node.js`. Type `node --version` to see if you have a version of `node.js` installed already. Otherwise run the following commands as root to install the v14.x lts version of `node.js`: @@ -16,7 +16,7 @@ with # install NodeJS latest LTS release. curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash - - sudo apt-get install -y nodejs + sudo apt-get install -y nodejs npm Run the following commands to install dependent libraries required by the PiPedal build. diff --git a/docs/BuildingPiPedalFromSource.md b/docs/BuildingPiPedalFromSource.md index 5188c4f..07f9b7d 100644 --- a/docs/BuildingPiPedalFromSource.md +++ b/docs/BuildingPiPedalFromSource.md @@ -5,7 +5,7 @@ page_icon: img/Compiling.jpg {% include pageIcon.html %} -PiPedal has only been tested on Raspberry Pi OS, and Ubuntu, but should run with some modifications on most Linux distributions. Pull requests to correct problems with building PiPedal on other versions of Linux are welcome. However, getting build pre-requisites installed on non-Debian-derived Linux distrubutions (distros that don't use `apt`) will be challenging. +PiPedal has only been tested on Raspberry Pi OS, and Ubuntu 24.x, but should run with some modifications on most Linux distributions. Pull requests to correct problems with building PiPedal on other versions of Linux are welcome. However, getting build pre-requisites installed on non-Debian-derived Linux distrubutions (distros that don't use `apt`) will be challenging. To build and debug PiPedal using Visual Studio Code, you need 8GB of memory. You can build PiPedal with 2GB of memory. diff --git a/docs/Configuring.md b/docs/Configuring.md index 3ca6a49..2580a1a 100644 --- a/docs/Configuring.md +++ b/docs/Configuring.md @@ -3,6 +3,22 @@ page_icon: img/Setup.jpg icon_width: 320px icon_float: left --- +## Selecting a real-time kernel on Ubuntu. + +This step is unneccesary on Raspberry Pi OS, which installs an RT_PREEMPT kernel by default. + +By default, Ubuntu installs a PREEMT_DYNAMIC kernel, configured to run with volutary preemption. You will need to change this. You can do this by running the following command after you have installed PiPedal: + +``` + pipedal_kconfig +``` + +In order to support real-time audio processing, select Preempt=full. + +An RT_PREEMPT kernel provides slightly better realtime audio than a PREEMPT_DYNAMIC/preempt=full kernel, but the PREEMPT_DYNAMIC should be perfectly adequate. If you are having problems with audio dropouts, you may want to try an RT_PREEMPT kernel instead. Ubuntu provides a pre-built RT_PREEMPT kernel; but on our test systems, you can acheive stable low-latency audio using only the PREEMPT_DYNAMIC/preempt=full kernel. The pre-build Ubuntu RT_PREEMPT +kernel is only available if yo have an Ubuntu Pro subscription. But it is relatively easy to build the Ubuntu RT_PREEMPT kernel from source. That is, however, outside the scope of this document. We recommend using the PREEMPT_DYNAMIC/preempt=full Ubuntu kernel. + + ## Configuring PiPedal After Installation diff --git a/docs/Debugging.md b/docs/Debugging.md index e694d33..1786a5f 100644 --- a/docs/Debugging.md +++ b/docs/Debugging.md @@ -2,7 +2,7 @@ PipPedal consists of the following components: -* A web application build in React, found in the react subdirectory. +* A web application built using vite/React, found in the `vite` subdirectory. * `pipedald` @@ -40,7 +40,7 @@ same /etc/pipedal and /var/pipedal directories as an instance of `pipedal` runn under systemd. Note that when running under systemd, `pipedald` runs under an unprivileged `piedal_d` service account, and relies it's group (also 'pipedal_d`) in order to access its data files, and to communicate with the `pipedaladmin` service, which does run with root -priveleges when `pipedald` needs to perform operations that do required root privileges. +privileges when `pipedald` needs to perform operations that do required root privileges (e.g. shutdown/reboot and starting and stopping WiFi services). For what it's worth, `pipedaldmin` is virtually undebuggable, becuase it does require root privileges to run. If you really _must_ debug pipedaladmin, you can fire up a sudo isntance of Visual Studio Code @@ -53,8 +53,8 @@ audio and Wi-Fi configuration changes) may fail if the pipedaladmind service is with pipedaladmin via Unix docket that can only be opened by members of the pipedal_d group. So if you have added your own account to the `pipedal_d` group, debug instances of `pipedald` will in fact work properly. -In production, the pipedald web server serves the PiPedal web socket, as well as static HTML from the built -react components. But while debugging, it is much more convenient to use the React debug server for +In production, the pipedald web server serves the PiPedal web socket, as well as static HTML from the built +vite/React components. But while debugging, it is much more convenient to use the Vite debug server for React sources, and configure pipedald to serve only the websocket. Note that a debug instance of `pipedald` cannot bind to port 80, since that requires either root privileges or @@ -72,23 +72,26 @@ make the systemd instance of `pipedald` bind to port 8080 instead of port 80: (which will also restart the `pipedald` service). -To start the React debug server, from a shell, `cd` to the react directory, and run `./start`. The react debug -server will detect any changes to React sources, and rebuild them automatically (no build step required). -Actual debugging is performed using the Chrome debugger (which is remarkably well integrated with React). +To start the web app debug server, from a shell, `cd` to the `./vite` directory, and run `npm run dev`. The +Vite debug server will automatically detect any changes to web app sources, and rebuild them automatically (no build step required). Note that the `pipedald` service must be running in order for the web app to function properly, either +as a the `pipedald` service, or by running `pipedald` in a debugger. +Actual debugging is performed using the Chrome debugger (which is remarkably well integrated with Vite/React). You won't actually see changes to the version of the systemd version of the static web app until you do a full _Release_ or _RelWithDebInfo_ build of PiPedal, followed by running `./install.sh` which pushes the built react app in the location where the systemd version of `pipedald` serves static web content. By default, the debug React app will attempt to contact the pipedald server on ws:*:8080 -- the address on which the debug version of pipedald listens on. This can be reconfigured -in the file `react/src/public/var/config.json` if desired. If you connect to the the pipedald server port (port 80), pipedald intercepts requests for this file and points the react app at itself, so the file has no effect when running in production. +in the file `react/src/public/var/config.json` if desired. If you connect to the the pipedald server port (port 80), pipedald intercepts requests for `http://./var/config.json` and points the react app at itself, so the file has no effect when running in production. The React app will display the message "Error: Failed to connect to the server", until you start the pipedald websocket server in the VSCode debugger. However, it's quite reasonable to point the react debug app at a systemd instance of the pipedald server instead, if you don't intend to debug C++ code. react/public/var/config.json: { ... - "socket_server_port": 8080, # (PiPedald's port number) + # (PiPedald's port number. 80 for the production service, 8080 (by default) for + # pipedal running under a debugger. + "socket_server_port": 8080, "socket_server_address": "*", ... } diff --git a/docs/Installing.md b/docs/Installing.md index 05c7088..dfbd312 100644 --- a/docs/Installing.md +++ b/docs/Installing.md @@ -13,24 +13,25 @@ page_icon: img/Install4.jpg Download the most recent Debian (.deb) package for your platform: -- [Raspberry Pi OS bookworm (64-bit) v1.3.69](https://github.com/rerdavies/pipedal/releases/download/) -- [Ubuntu/Raspberry Pi OS bullseyeye (64-bit) v1.2.31](https://github.com/rerdavies/pipedal/releases/download/v1.1.31/pipedal_1.1.31_arm64.deb) +- [Raspberry Pi OS bookworm (aarch64) v1.4.70 Beta](https://github.com/rerdavies/pipedal/releases/download/) +- [Ubuntu 24.x (aarch64) v1.4.70 Alpha](https://github.com/rerdavies/pipedal/releases/download/) +- [Ubuntu 24.x (amd64) v1.4.70 Alpha](https://github.com/rerdavies/pipedal/releases/download/) -Version 1.3.69 has not yet been tested on Ubuntu or Raspberry Pi OS bullseye. On these platforms, we recommend that you use version 1.1.31. -Install the package by running +Version 1.4.70 has been tested on Raspberry Pi OS bookworm, Ubuntu 24.04 (amd64), and Ubuntu 24.10 (aarch64). Download the appropriate package for your platform, and install using the following proceduer: ``` sudo apt update cd ~/Downloads - sudo apt-get install pipedal_1.3.69_arm64.deb + sudo apt-get install pipedal_1.4.70_arm64.deb ``` -Adjust accordingly if you have downloaded v1.1.31. +Adjust accordingly depending which package you downloaded. On Raspberry Pi OS, if you have a graphical desktop installed, you can also install the package by double-clicking on the downloaded package in the File Manager. -After installing, follow the instructions in [Configuring PiPedal after Installation](Configuring.md). +After installing, follow the instructions in [Configuring PiPedal after Installation](Configuring.md). If +you are using Ubuntu, you will need to reconfigure Ubuntu to use a real-time kernel. -------- diff --git a/docs/LicensePiPedal.md b/docs/LicensePiPedal.md index 516449c..8911e36 100644 --- a/docs/LicensePiPedal.md +++ b/docs/LicensePiPedal.md @@ -1,4 +1,4 @@ -Copyright 2021-2024 Robin Davies +Copyright 2021-2024 Robin E. R. Davies Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/docs/LicenseToobAmp.md b/docs/LicenseToobAmp.md index 279f498..f55edb4 100644 --- a/docs/LicenseToobAmp.md +++ b/docs/LicenseToobAmp.md @@ -1,4 +1,4 @@ -Copyright 2021-2023 Robin Davies +Copyright 2021-2023 Robin E. R. Davies Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md index e68fbfc..620e52c 100644 --- a/docs/ReleaseNotes.md +++ b/docs/ReleaseNotes.md @@ -1,5 +1,18 @@ # Release Notes +## PiPedal 1.4.70 Beta + +- Ubuntu 24.x compatibility (arm64 and amd64) +- Ubuntu CPU Freq/governor/thermal status display. +- Support for WiFi on on Ubuntu +- TooB Plugin compatibility issues on x64/amd64 (handling of NaNs) +- Restart audio automatically after ALSA stalls. +- Improvements to File Upload UI for plugins that have complex file types (e.g. Ratatouille) +- Support for LV2 Trigger controls, and MIDI bindings to LV2 trigger controls (common in looper and recording/playback plugsin). +- MIDI bindings for LV2 trigger controls. +- Port Web app from CRA to Vite framework to avoid deprecated dependencies. +- ToobAmp 1.1.57: Correctly set file path of the default file property for Toob Convolution Reverb. + ## PiPedal 1.3.69 Bug fixes: diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index ee348ba..090570e 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -21,6 +21,10 @@ display: block; height: 24px; } + img-icon { + width: 24px; + height: + }
@@ -41,6 +45,12 @@   + + rerdavies.github.io + + +   diff --git a/docs/_includes/gallery.html b/docs/_includes/gallery.html index 1c11e94..6afca1b 100644 --- a/docs/_includes/gallery.html +++ b/docs/_includes/gallery.html @@ -3,11 +3,12 @@ { let galleryPath = "gallery/"; let images = [ - "thunder.png", - "rig.jpg", + "dark-sshot1.png", "jazz.png", "midi-bindings.png", - "hotspot.png" + "hotspot.png", + "rig.jpg", + "thunder.png" ]; let captions = [ "PiPedal Guitar Effects Pedal running on a Raspberry Pi.", diff --git a/docs/download.md b/docs/download.md index 71fc8fe..2b00157 100644 --- a/docs/download.md +++ b/docs/download.md @@ -4,7 +4,7 @@ Download the most recent Debian (.deb) package for your platform: -- Raspberry Pi OS Bookworm (64-bit) v1.3.69 +- Raspberry Pi OS Bookworm (64-bit) v1.4.70 Install the package by running @@ -12,7 +12,7 @@ Install the package by running ``` sudo apt update cd ~/Downloads - sudo apt-get install ./pipedal_1.3.69_arm64.deb + sudo apt-get install ./pipedal_1.4.70_arm64.deb ``` Follow the instructions in [_Configuring PiPedal After Installation_](https://rerdavies.github.io/pipedal/Configuring.html) to complete the installation. diff --git a/docs/gallery/dark-sshot1.png b/docs/gallery/dark-sshot1.png new file mode 100644 index 0000000..8933320 Binary files /dev/null and b/docs/gallery/dark-sshot1.png differ diff --git a/docs/img/rerdavies.png b/docs/img/rerdavies.png new file mode 100644 index 0000000..51baedf Binary files /dev/null and b/docs/img/rerdavies.png differ diff --git a/docs/index.md b/docs/index.md index d6a143b..ada4fd4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,16 +1,17 @@ - - -v1.3.69 +v1.4.70   To download PiPedal, click [here](download.md). To view PiPedal documentation, click [here](Documentation.md). -#### Important notice: PiPedal has a submitted a request to support sharing of Pipedal presets at [PatchStorage.com](https:///patchstorage.com). We urgently need your support! Please vote for PiPedal [here](https://patchstorage.com/requests/pipedal/). +#### Important notice: [PatchStorage.com](https:///patchstorage.com) has added support for PiPedal. We urgently need your support! I you could please upload patches [here](https://patchstorage.com/platform/pipedal/) I would +be enormously grateful. Note that media and model files are included in patch files, so you can share patches that +include model files or audio samples. If you make use of plugins that are not included in the PiPedal distribution, please include a link to the plugin in the patch description. -#### NEW version 1.3.69 Release. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details. +#### NEW version 1.4.70 Beta, plus alpha releases of +PiPedal for Ubuntu on aarch64 and amd64. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.   diff --git a/lv2/aarch64/ToobAmp.lv2/CabIR.ttl b/lv2/aarch64/ToobAmp.lv2/CabIR.ttl index 4566a8e..d5dd122 100644 --- a/lv2/aarch64/ToobAmp.lv2/CabIR.ttl +++ b/lv2/aarch64/ToobAmp.lv2/CabIR.ttl @@ -93,7 +93,7 @@ cabir:impulseFile3 doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; rdfs:comment """ TooB Cab IR is a convolution-based guitar cabinet impulse response simulator. diff --git a/lv2/aarch64/ToobAmp.lv2/CabSim.ttl b/lv2/aarch64/ToobAmp.lv2/CabSim.ttl index 2c1acf8..ecf7f81 100644 --- a/lv2/aarch64/ToobAmp.lv2/CabSim.ttl +++ b/lv2/aarch64/ToobAmp.lv2/CabSim.ttl @@ -49,7 +49,7 @@ toob:frequencyResponseVector doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; mod:brand "TooB"; mod:label "TooB CabSim"; diff --git a/lv2/aarch64/ToobAmp.lv2/ConvolutionReverb.ttl b/lv2/aarch64/ToobAmp.lv2/ConvolutionReverb.ttl index bdac290..d347d53 100644 --- a/lv2/aarch64/ToobAmp.lv2/ConvolutionReverb.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ConvolutionReverb.ttl @@ -53,7 +53,7 @@ toobimpulse:impulseFile doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; rdfs:comment """ Convolution reverb is a notoriously compute-intensive effect. If you are having performance issues, use the Max T control to constrain the length of the impulse file to diff --git a/lv2/aarch64/ToobAmp.lv2/ConvolutionReverbStereo.ttl b/lv2/aarch64/ToobAmp.lv2/ConvolutionReverbStereo.ttl index b92ebdc..6f6ee24 100644 --- a/lv2/aarch64/ToobAmp.lv2/ConvolutionReverbStereo.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ConvolutionReverbStereo.ttl @@ -51,7 +51,7 @@ toobimpulse:impulseFile doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; rdfs:comment """ diff --git a/lv2/aarch64/ToobAmp.lv2/InputStage.ttl b/lv2/aarch64/ToobAmp.lv2/InputStage.ttl index 22f5cec..e1c1e74 100644 --- a/lv2/aarch64/ToobAmp.lv2/InputStage.ttl +++ b/lv2/aarch64/ToobAmp.lv2/InputStage.ttl @@ -65,7 +65,7 @@ inputStage:filterGroup doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; mod:brand "TooB"; mod:label "TooB Input"; diff --git a/lv2/aarch64/ToobAmp.lv2/PowerStage2.ttl b/lv2/aarch64/ToobAmp.lv2/PowerStage2.ttl index ab5a4b0..f99f60b 100644 --- a/lv2/aarch64/ToobAmp.lv2/PowerStage2.ttl +++ b/lv2/aarch64/ToobAmp.lv2/PowerStage2.ttl @@ -67,7 +67,7 @@ pstage:stage3 doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; mod:brand "TooB"; mod:label "Power Stage"; diff --git a/lv2/aarch64/ToobAmp.lv2/SpectrumAnalyzer.ttl b/lv2/aarch64/ToobAmp.lv2/SpectrumAnalyzer.ttl index d809dba..cc895f1 100644 --- a/lv2/aarch64/ToobAmp.lv2/SpectrumAnalyzer.ttl +++ b/lv2/aarch64/ToobAmp.lv2/SpectrumAnalyzer.ttl @@ -58,7 +58,7 @@ doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; rdfs:comment "TooB spectrum analyzer" ; mod:brand "TooB"; diff --git a/lv2/aarch64/ToobAmp.lv2/ToneStack.ttl b/lv2/aarch64/ToobAmp.lv2/ToneStack.ttl index 296fb9b..a150f92 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToneStack.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToneStack.ttl @@ -55,7 +55,7 @@ tonestack:eqGroup doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; uiext:ui ; diff --git a/lv2/aarch64/ToobAmp.lv2/ToobAmp.so b/lv2/aarch64/ToobAmp.lv2/ToobAmp.so index 964e6cc..e6e2914 100644 Binary files a/lv2/aarch64/ToobAmp.lv2/ToobAmp.so and b/lv2/aarch64/ToobAmp.lv2/ToobAmp.so differ diff --git a/lv2/aarch64/ToobAmp.lv2/ToobAmpUI.so b/lv2/aarch64/ToobAmp.lv2/ToobAmpUI.so index 9c8d490..6ccd10e 100644 Binary files a/lv2/aarch64/ToobAmp.lv2/ToobAmpUI.so and b/lv2/aarch64/ToobAmp.lv2/ToobAmpUI.so differ diff --git a/lv2/aarch64/ToobAmp.lv2/ToobChorus.ttl b/lv2/aarch64/ToobAmp.lv2/ToobChorus.ttl index 4494dfe..7d7b0bf 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobChorus.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobChorus.ttl @@ -40,7 +40,7 @@ doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; rdfs:comment """ Emulation of a Boss CE-2 Chorus. diff --git a/lv2/aarch64/ToobAmp.lv2/ToobDelay.ttl b/lv2/aarch64/ToobAmp.lv2/ToobDelay.ttl index dd9237e..1faeb88 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobDelay.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobDelay.ttl @@ -41,7 +41,7 @@ doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; rdfs:comment """ A straightforward no-frills digital delay. diff --git a/lv2/aarch64/ToobAmp.lv2/ToobFlanger.ttl b/lv2/aarch64/ToobAmp.lv2/ToobFlanger.ttl index dafeda2..bce6f3c 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobFlanger.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobFlanger.ttl @@ -41,7 +41,7 @@ doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; rdfs:comment """ Emulation of a Boss BF-2 Flanger, based on circuit analysis and simulation of the original. diff --git a/lv2/aarch64/ToobAmp.lv2/ToobFlangerStereo.ttl b/lv2/aarch64/ToobAmp.lv2/ToobFlangerStereo.ttl index c54e093..c291c3b 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobFlangerStereo.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobFlangerStereo.ttl @@ -41,7 +41,7 @@ doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; rdfs:comment """ Digital emulation of a Boss BF-2 Flanger. diff --git a/lv2/aarch64/ToobAmp.lv2/ToobFreeverb.ttl b/lv2/aarch64/ToobAmp.lv2/ToobFreeverb.ttl index 51f3e1f..77575e2 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobFreeverb.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobFreeverb.ttl @@ -41,7 +41,7 @@ doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; rdfs:comment """ Toob Freeverb is an Lv2 implementation of the famous Freeverb reverb effect. FreeVerb delivers a well-balanced reverb with very little tonal coloration. diff --git a/lv2/aarch64/ToobAmp.lv2/ToobML.ttl b/lv2/aarch64/ToobAmp.lv2/ToobML.ttl index d883091..25dce24 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobML.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobML.ttl @@ -65,7 +65,7 @@ toobml:sagGroup doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; rdfs:comment """ The TooB ML Amplifier plugin provides emulation of a variety of amplifiers and overdrive pedals that are implemented using neural-network-based machine learning models of real amplifiers. @@ -313,7 +313,7 @@ and uses model files from the GuitarML Neural Pi project (https://github.com/Gui lv2:default 3.0 ; lv2:minimum 0.0 ; lv2:maximum 10.0 ; - rdfs:comment "Model gain parameter (used by BluesJR model only)" + rdfs:comment "Model gain parameter (if supported by model) ()" ], [ a lv2:InputPort , diff --git a/lv2/aarch64/ToobAmp.lv2/ToobNeuralAmpModeler.ttl b/lv2/aarch64/ToobAmp.lv2/ToobNeuralAmpModeler.ttl index d4d869f..57c7b2b 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobNeuralAmpModeler.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobNeuralAmpModeler.ttl @@ -61,7 +61,7 @@ toobNam:eqGroup doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; rdfs:comment """ A port of Steven Atkinson's Neural Amp Modeler to LV2. @@ -326,7 +326,7 @@ toobNam:ui pipedal_ui:fileProperties [ a pipedal_ui:fileProperty; - rdfs:label "Model (*.nam)" ; + rdfs:label "Model" ; pipedal_ui:directory "NeuralAmpModels"; lv2:index 2 ; pipedal_ui:patchProperty toobNam:modelFile ; diff --git a/lv2/aarch64/ToobAmp.lv2/ToobTuner.ttl b/lv2/aarch64/ToobAmp.lv2/ToobTuner.ttl index e185b2e..3f47c08 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobTuner.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobTuner.ttl @@ -40,7 +40,7 @@ doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 53 ; + lv2:microVersion 57 ; rdfs:comment """ TooB Tuner is a chromatic guitar tuner. """ ; diff --git a/lv2/x86_64/toobamp_1.1.53_amd64.deb b/lv2/x86_64/toobamp_1.1.53_amd64.deb deleted file mode 100644 index 4d71445..0000000 Binary files a/lv2/x86_64/toobamp_1.1.53_amd64.deb and /dev/null differ diff --git a/lv2/x86_64/toobamp_1.1.57_amd64.deb b/lv2/x86_64/toobamp_1.1.57_amd64.deb new file mode 100644 index 0000000..d025ecf Binary files /dev/null and b/lv2/x86_64/toobamp_1.1.57_amd64.deb differ diff --git a/react-config b/react-config index 86b4bab..6245245 100755 --- a/react-config +++ b/react-config @@ -1,5 +1,5 @@ #!/usr/bin/bash # Install react dependencies -cd react +cd vite npm install cd .. diff --git a/react/.gitignore b/react/.gitignore deleted file mode 100644 index 6362cab..0000000 --- a/react/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - -# dependencies -/node_modules -/.pnp -/package-lock.json -.pnp.js - -# testing -/coverage - -# production -/build - -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local - -npm-debug.log* -yarn-debug.log* -yarn-error.log* diff --git a/react/CMakeLists.txt b/react/CMakeLists.txt deleted file mode 100644 index 2c84502..0000000 --- a/react/CMakeLists.txt +++ /dev/null @@ -1,208 +0,0 @@ - - -find_program(NPM_COMMAND npm) - - -if (CMAKE_BUILD_TYPE MATCHES Debug) - set(BUILD_REACT "echo") - set(BUILD_REACT_ARGS Skipping react debug build) -else() - set(BUILD_REACT npm) - set(BUILD_REACT_ARGS run build) -endif() - -set (BUILD_DIRECTORY ${PROJECT_SOURCE_DIR}/build/react/build) - - -add_custom_command( - OUTPUT ${BUILD_DIRECTORY}/index.html - COMMAND ${BUILD_REACT} - ARGS ${BUILD_REACT_ARGS} - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/react - - DEPENDS - src/PiPedalError.tsx - src/OldDeleteIcon.tsx - src/MaterialColors.tsx - src/Pedalboard.tsx - src/SystemMidiBindingView.tsx - src/GovernorSettings.tsx - src/ObservableProperty.tsx - src/SnapshotEditor.tsx - src/SelectMidiChannelsDialog.tsx - src/AlsaMidiDeviceInfo.tsx - src/WifiDirectConfigSettings.tsx - src/WifiConfigSettings.tsx - src/SnapshotButton.tsx - src/WindowScale.tsx - src/JsonAtom.tsx - src/PiPedalSocket.tsx - src/TemporaryDrawer.tsx - src/DarkMode.tsx - src/MidiBindingsDialog.tsx - src/MidiBinding.tsx - src/SnapshotDialog.tsx - src/SettingsDialog.tsx - src/PedalboardView.tsx - src/reportWebVitals.ts - src/OptionsDialog.tsx - src/SelectChannelsDialog.tsx - src/PluginPresetSelector.tsx - src/VuMeter.tsx - src/ToobFrequencyResponseView.tsx - src/SystemMidiBindingsDialog.tsx - src/FullScreenIME.tsx - src/App.tsx - src/ToobInputStageView.tsx - src/XxxSnippet.tsx - src/JackServerSettings.tsx - src/ToobWaveShapeView.tsx - src/ToobPowerStage2View.tsx - src/PluginPreset.tsx - src/logo.svg - src/Banks.tsx - src/NoChangePassword.tsx - src/SearchFilter.tsx - src/FilePropertyDirectorySelectDialog.tsx - src/GxTunerView.tsx - src/UpdateDialog.tsx - src/svg/file_download_black_24dp.svg - src/svg/fx_filter.svg - src/svg/fx_pitch.svg - src/svg/fx_distortion.svg - src/svg/fx_split_b.svg - src/svg/fx_chorus.svg - src/svg/fx_limiter.svg - src/svg/fx_phaser.svg - src/svg/snapshot_0.svg - src/svg/snapshot_3.svg - src/svg/file_upload_black_24dp.svg - src/svg/ic_bank.svg - src/svg/fx_function.svg - src/svg/fx_dial.svg - src/svg/ic_settings.svg - src/svg/fx_split_a.svg - src/svg/fx_empty.svg - src/svg/fx_amplifier.svg - src/svg/fx_spectral.svg - src/svg/fx_eq.svg - src/svg/ic_edit_banks.svg - src/svg/ic_help_outline.svg - src/svg/ic_save_bank_as.svg - src/svg/ic_pluginpreset2.svg - src/svg/fx_flanger2.svg - src/svg/snapshot_6.svg - src/svg/fx_lr.svg - src/svg/fx_generator.svg - src/svg/snapshot_1.svg - src/svg/fx_reverb.svg - src/svg/fx_plugin.svg - src/svg/snapshot_4.svg - src/svg/drive_file_rename_outline_black_24dp.svg - src/svg/snapshot_2.svg - src/svg/fx_instrument.svg - src/svg/fx_modulator.svg - src/svg/fx_error.svg - src/svg/fx_simulator.svg - src/svg/fx_filter_hp.svg - src/svg/fx_compressor.svg - src/svg/fx_gate.svg - src/svg/fx_terminal.svg - src/svg/ic_midi.svg - src/svg/fx_oscillator.svg - src/svg/fx_analyzer.svg - src/svg/fx_flanger.svg - src/svg/old_delete_outline_24dp.svg - src/svg/ic_presets.svg - src/svg/fx_delay.svg - src/svg/fx_parametric_eq.svg - src/svg/fx_spatial.svg - src/svg/fx_converter.svg - src/svg/fx_constant.svg - src/svg/snapshot_5.svg - src/svg/ic_pluginpreset.svg - src/svg/fx_mixer.svg - src/svg/fx_utility.svg - src/Updater.tsx - src/UploadPresetDialog.tsx - src/RadioSelectDialog.tsx - src/setupTests.ts - src/ToobCabSimView.tsx - src/RenameDialog.tsx - src/SplitControlView.tsx - src/SelectHoverBackground.tsx - src/IControlViewFactory.tsx - src/OkCancelDialog.tsx - src/BankDialog.tsx - src/PluginPresetsDialog.tsx - src/App.test.tsx - src/ControlViewFactory.tsx - src/DraggableGrid.tsx - src/ZoomedDial.tsx - src/index.css - src/Pedal.tsx - src/Draggable.tsx - src/PluginIcon.tsx - src/react-app-env.d.ts - src/TextFieldEx.tsx - src/FilePropertyDialog.tsx - src/FilePropertyDirectoryTree.tsx - src/StringBuilder.tsx - src/MainPage.tsx - src/PluginInfoDialog.tsx - src/AppThemed.tsx - src/Lv2Plugin.tsx - src/ToobSpectrumResponseView.tsx - src/PerformanceView.tsx - src/JackServerSettingsDialog.tsx - src/Utility.tsx - src/JackStatusView.tsx - src/ToobSpectrumAnalyzerView.tsx - src/SvgPathBuilder.tsx - src/PresetSelector.tsx - src/PresetDialog.tsx - src/WifiChannel.tsx - src/AboutDialog.tsx - src/GxTunerControl.tsx - src/VirtualKeyboardHandler.tsx - src/PluginControl.tsx - src/LoadPluginDialog.tsx - src/ZoomedUiControl.tsx - src/AlsaDeviceInfo.tsx - src/ToobToneStackView.tsx - src/UploadFileDialog.tsx - src/PluginOutputControl.tsx - src/SelectThemeDialog.tsx - src/Rect.tsx - src/AppThemed.css - src/ColorDropdownButton.tsx - src/AndroidHost.tsx - src/SnapshotPanel.tsx - src/ToobMLView.tsx - src/WifiConfigDialog.tsx - src/Rectangle.tsx - src/SnapshotColors.tsx - src/PiPedalModel.tsx - src/ObservableEvent.tsx - src/JackHostStatus.tsx - src/index.tsx - src/FilePropertyControl.tsx - src/WifiDirectConfigDialog.tsx - src/MidiBindingView.tsx - src/PluginControlView.tsx - src/SplitUiControls.tsx - src/PluginClass.tsx - src/DialogEx.tsx - src/Jack.tsx - src/ResizeResponsiveComponent.tsx - src/NumericInput.tsx - src/SnapshotPropertiesDialog.tsx - src/SearchControl.tsx - src/Units.tsx - -) - -add_custom_target ( - ReactBuild ALL - DEPENDS ${BUILD_DIRECTORY}/index.html -) diff --git a/react/README.md b/react/README.md deleted file mode 100644 index b87cb00..0000000 --- a/react/README.md +++ /dev/null @@ -1,46 +0,0 @@ -# Getting Started with Create React App - -This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). - -## Available Scripts - -In the project directory, you can run: - -### `npm start` - -Runs the app in the development mode.\ -Open [http://localhost:3000](http://localhost:3000) to view it in the browser. - -The page will reload if you make edits.\ -You will also see any lint errors in the console. - -### `npm test` - -Launches the test runner in the interactive watch mode.\ -See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. - -### `npm run build` - -Builds the app for production to the `build` folder.\ -It correctly bundles React in production mode and optimizes the build for the best performance. - -The build is minified and the filenames include the hashes.\ -Your app is ready to be deployed! - -See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. - -### `npm run eject` - -**Note: this is a one-way operation. Once you `eject`, you can’t go back!** - -If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. - -Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. - -You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. - -## Learn More - -You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). - -To learn React, check out the [React documentation](https://reactjs.org/). diff --git a/react/package.json b/react/package.json deleted file mode 100644 index 477237d..0000000 --- a/react/package.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "name": "pipedal", - "version": "0.1.0", - "private": true, - "dependencies": { - "@emotion/react": "^11.7.1", - "@emotion/styled": "^11.6.0", - "@mui/icons-material": "^5.4.1", - "@mui/material": "^5.4.1", - "@mui/styles": "^5.4.1", - "@testing-library/jest-dom": "^5.14.1", - "@testing-library/react": "^11.2.7", - "@testing-library/user-event": "^12.8.3", - "@types/jest": "^26.0.23", - "@types/node": "^12.20.15", - "@types/react": "^17.0.11", - "@types/react-dom": "^17.0.8", - "react": "^17.0.2", - "react-dom": "^17.0.2", - "react-remark": "^2.1.0", - "react-scripts": "^5.0.1", - "react-virtualized-auto-sizer": "^1.0.6", - "react-window": "^1.8.6", - "typescript": "^4.3.4", - "web-vitals": "^1.1.2", - - "@babel/plugin-proposal-private-property-in-object": "^7.2.11" - - }, - "scripts": { - "start": "react-scripts start", - "build": "BUILD_PATH='../build/react/build' react-scripts build", - "test": "react-scripts test", - "eject": "react-scripts eject" - }, - "eslintConfig": { - "extends": [ - "react-app", - "react-app/jest" - ], - "rules": { - "eqeqeq": 2, - "no-unused-expressions": 2, - "@typescript-eslint/no-unused-vars": 2 - } - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - }, - "devDependencies": { - "@types/react-virtualized-auto-sizer": "^1.0.1", - "@types/react-window": "^1.8.5", - "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2" - } -} diff --git a/react/public/logo192x.png b/react/public/logo192x.png deleted file mode 100644 index d483c7b..0000000 Binary files a/react/public/logo192x.png and /dev/null differ diff --git a/react/react_info.txt b/react/react_info.txt deleted file mode 100644 index 5771b93..0000000 --- a/react/react_info.txt +++ /dev/null @@ -1,28 +0,0 @@ -found 8 vulnerabilities (4 moderate, 4 high) - run `npm audit fix` to fix them, or `npm audit` for details - -Created git commit. - -Success! Created my-app at /home/patch/src/piddle/react/my-app -Inside that directory, you can run several commands: - - npm start - Starts the development server. - - npm run build - Bundles the app into static files for production. - - npm test - Starts the test runner. - - npm run eject - Removes this tool and copies build dependencies, configuration files - and scripts into the app directory. If you do this, you canât go back! - -We suggest that you begin by typing: - - cd my-app - npm start - -Happy hacking! - diff --git a/react/src/AboutDialog.tsx b/react/src/AboutDialog.tsx deleted file mode 100644 index eb95eef..0000000 --- a/react/src/AboutDialog.tsx +++ /dev/null @@ -1,296 +0,0 @@ - -import React, { SyntheticEvent, Component } from 'react'; -import IconButton from '@mui/material/IconButton'; -import Typography from '@mui/material/Typography'; -import { PiPedalModel, PiPedalModelFactory, State } from './PiPedalModel'; -import AppBar from '@mui/material/AppBar'; -import Toolbar from '@mui/material/Toolbar'; -import Divider from '@mui/material/Divider'; -import ArrowBackIcon from '@mui/icons-material/ArrowBack'; - -import JackHostStatus from './JackHostStatus'; -import { PiPedalError } from './PiPedalError'; -import DialogEx from './DialogEx'; - -import { Theme, createStyles } from '@mui/material/styles'; -import { withStyles, WithStyles } from '@mui/styles'; -import Slide, { SlideProps } from '@mui/material/Slide'; - -interface AboutDialogProps extends WithStyles { - open: boolean; - onClose: () => void; -}; - -interface AboutDialogState { - jackStatus?: JackHostStatus; - - openSourceNotices: string; -}; - - -const styles = (theme: Theme) => createStyles({ - dialogAppBar: { - position: 'relative', - top: 0, left: 0 - }, - dialogTitle: { - marginLeft: theme.spacing(2), - flex: 1, - }, - sectionHead: { - marginLeft: 24, - marginRight: 24, - marginTop: 16, - paddingBottom: 12 - - }, - textBlock: { - marginLeft: 24, - marginRight: 24, - marginTop: 16, - paddingBottom: 0, - opacity: 0.95 - - }, - textBlockIndented: { - marginLeft: 40, - marginRight: 24, - marginTop: 16, - paddingBottom: 0, - opacity: 0.95 - - }, - - setting: { - minHeight: 64, - width: "100%", - textAlign: "left", - paddingLeft: 22, - paddingRight: 22 - }, - primaryItem: { - - }, - secondaryItem: { - - }, - can_select: { - userSelect: "text", - cursor: "text" - }, - no_select: { - userSelect: "none", - cursor: "text" - - } - - -}); - - -const Transition = React.forwardRef(function Transition( - props: SlideProps, ref: React.Ref -) { - return (); -}); - - -const AboutDialog = withStyles(styles, { withTheme: true })( - - class extends Component { - - model: PiPedalModel; - refNotices: React.RefObject; - - - constructor(props: AboutDialogProps) { - super(props); - this.model = PiPedalModelFactory.getInstance(); - this.refNotices = React.createRef(); - this.handleDialogClose = this.handleDialogClose.bind(this); - this.state = { - jackStatus: undefined, - openSourceNotices: "" - - }; - } - - mounted: boolean = false; - subscribed: boolean = false; - - tick() { - if (this.model.state.get() === State.Ready) { - this.model.getJackStatus() - .then(jackStatus => { - this.setState({ jackStatus: jackStatus }); - }) - .catch(error => { /* ignore*/ }); - } - } - - timerHandle?: NodeJS.Timeout; - - updateNotifications() { - let subscribed = this.mounted && this.props.open; - if (subscribed !== this.subscribed) { - if (subscribed) { - this.timerHandle = setInterval(() => this.tick(), 1000); - } else { - if (this.timerHandle) { - clearInterval(this.timerHandle); - this.timerHandle = undefined; - } - } - this.subscribed = subscribed; - } - } - - startFossRequest() { - if (this.state.openSourceNotices === "") { - fetch("var/notices.txt") - .then((request) => { - if (!request.ok) { - throw new PiPedalError("notices request failed."); - } - return request.text(); - }) - .then((text) => { - if (this.mounted) { - this.setState({ openSourceNotices: text }); - } - - }) - .catch((err) => { - // ok in debug builds. File doesn't get placed until install time. - console.log("Failed to fetch open-source notices. " + err.toString()); - }); - } - } - - componentDidMount() { - super.componentDidMount?.(); - this.mounted = true; - this.updateNotifications(); - this.startFossRequest(); - } - componentWillUnmount() { - super.componentWillUnmount?.(); - this.mounted = false; - this.updateNotifications(); - } - componentDidUpdate(prevProps: Readonly, prevState: Readonly, snapshot: any): void { - super.componentDidUpdate?.(prevProps, prevState, snapshot); - this.updateNotifications(); - } - - handleDialogClose(e: SyntheticEvent) { - this.props.onClose(); - } - - - render() { - let classes = this.props.classes; - let addressKey = 0; - let serverVersion = this.model.serverVersion?.serverVersion ?? ""; - let nPos = serverVersion.indexOf(' '); - if (nPos !== -1) { - serverVersion = serverVersion.substring(nPos + 1); - } - return ( - { this.props.onClose() }} TransitionComponent={Transition} - onEnterKey={() => { this.props.onClose() }} - style={{ userSelect: "none" }} - > - -
-
- - - - - - - About - - - -
-
-
-
- - PiPedal - {serverVersion - + (this.model.serverVersion?.debug ? " (Debug)" : "")} - - - -
- - Copyright © 2022-2024 Robin Davies. - - {this.model.isAndroidHosted() && ( - - {this.model.getAndroidHostVersion()} - - )} - - {this.model.isAndroidHosted() && ( - - Copyright © 2022-2024 Robin Davies. - - )} - - - ADDRESSES - -
- { - this.model.serverVersion?.webAddresses.map((address) => - ( - - {address} - - )) - - } -
- - - - SERVER OS - -
- - {this.model.serverVersion?.osVersion ?? ""} - -
-
- - - - LEGAL NOTICES - -
-
- -
-
-
- - - ); - - } - - } - -); - -export default AboutDialog; \ No newline at end of file diff --git a/react/src/App.test.tsx b/react/src/App.test.tsx deleted file mode 100644 index 2a68616..0000000 --- a/react/src/App.test.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import React from 'react'; -import { render, screen } from '@testing-library/react'; -import App from './App'; - -test('renders learn react link', () => { - render(); - const linkElement = screen.getByText(/learn react/i); - expect(linkElement).toBeInTheDocument(); -}); diff --git a/react/src/AppThemed.tsx b/react/src/AppThemed.tsx deleted file mode 100644 index 2dd578e..0000000 --- a/react/src/AppThemed.tsx +++ /dev/null @@ -1,1121 +0,0 @@ -// Copyright (c) 2022 Robin Davies -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of -// this software and associated documentation files (the "Software"), to deal in -// the Software without restriction, including without limitation the rights to -// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -// the Software, and to permit persons to whom the Software is furnished to do so, -// subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -import { WithStyles } from '@mui/styles'; - -import './AppThemed.css'; -//import {alpha} from '@mui/material/styles'; -import AppBar from '@mui/material/AppBar'; -import Modal from '@mui/material/Modal'; -import Toolbar from '@mui/material/Toolbar'; -import CssBaseline from '@mui/material/CssBaseline'; -import Typography from '@mui/material/Typography'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; -import IconButton from '@mui/material/IconButton'; -import VolunteerActivismIcon from '@mui/icons-material/VolunteerActivism'; -import MenuButton from '@mui/icons-material/Menu'; -import { TemporaryDrawer } from './TemporaryDrawer'; -import FullscreenIcon from '@mui/icons-material/Fullscreen'; -import FullscreenExitIcon from '@mui/icons-material/FullscreenExit'; -import List from '@mui/material/List'; -import Divider from '@mui/material/Divider'; -// import ListItem from '@mui/material/ListItem'; -import ListItemButton from '@mui/material/ListItemButton'; - -import ListItemIcon from '@mui/material/ListItemIcon'; -import ListItemText from '@mui/material/ListItemText'; -import CircularProgress from '@mui/material/CircularProgress'; -import { OnChangedHandler } from './ObservableProperty'; -import ErrorOutlineIcon from '@mui/icons-material/Error'; -import ResizeResponsiveComponent from './ResizeResponsiveComponent'; -import Button from '@mui/material/Button'; -import PresetSelector from './PresetSelector'; -import SettingsDialog from './SettingsDialog'; -import AboutDialog from './AboutDialog'; -import BankDialog from './BankDialog'; - -import { PiPedalModelFactory, PiPedalModel, State, ZoomedControlInfo, wantsReloadingScreen } from './PiPedalModel'; -import ZoomedUiControl from './ZoomedUiControl' -import MainPage from './MainPage'; -import DialogContent from '@mui/material/DialogContent'; -import DialogContentText from '@mui/material/DialogContentText'; -import DialogActions from '@mui/material/DialogActions'; -import ListSubheader from '@mui/material/ListSubheader'; -import { BankIndex, BankIndexEntry } from './Banks'; -import RenameDialog from './RenameDialog'; -import JackStatusView from './JackStatusView'; -import { Theme } from '@mui/material/styles'; -import { isDarkMode } from './DarkMode'; -import UpdateDialog from './UpdateDialog'; - -import { ReactComponent as RenameOutlineIcon } from './svg/drive_file_rename_outline_black_24dp.svg'; -import { ReactComponent as SaveBankAsIcon } from './svg/ic_save_bank_as.svg'; -import { ReactComponent as EditBanksIcon } from './svg/ic_edit_banks.svg'; -import { ReactComponent as SettingsIcon } from './svg/ic_settings.svg'; -import { ReactComponent as HelpOutlineIcon } from './svg/ic_help_outline.svg'; -import { ReactComponent as FxAmplifierIcon } from './svg/fx_amplifier.svg'; -import { PerformanceView } from './PerformanceView'; - -import DialogEx, { DialogStackState } from './DialogEx'; - - -const appStyles = (theme: Theme) => createStyles({ - "&": { // :root - colorScheme: (isDarkMode() ? "dark" : "light") - }, - menuListItem: { - color: "#FE8!important" as any, //theme.palette.text.primary, - fill: "#FE8!important" as any, //theme.palette.text.primary, - }, - menuIcon: { - fill: (theme.palette.text.primary + "!important") as any, //theme.palette.text.primary, - opacity: 0.6 - }, - toolBar: { - color: "white" - }, - listSubheader: { - backgroundImage: "linear-gradient(255,255,255,0.15),rgba(255,255,255,0.15)" - }, - loadingMask: { - position: "absolute", - minHeight: "10em", - left: "0px", - top: "0px", - right: "0px", - bottom: "0px", - opacity: 0.8, - background: - isDarkMode() ? "#222" : "#EEE", - }, - loadingContent: { - display: "block", - position: "absolute", - minHeight: "10em", - left: "0px", - top: "0px", - width: "100%", - height: "100%", - opacity: "0.95", - justifyContent: "center", - textAlign: "center", - zIndex: 2010 - }, - errorContent: { - - display: "flex", - flexDirection: "column", - justifyContent: "center", - flexWrap: "nowrap", - alignItems: "center", - position: "fixed", - minHeight: "10em", - left: "0px", - top: "0px", - width: "100%", - height: "100%", - color: isDarkMode() ? "#CCC" : "#444", - zIndex: 2000 - }, - errorContentMask: { - position: "absolute", left: 0, top: 0, - width: "100%", height: "100%", - background: isDarkMode() ? "#121212" : "#BBB", - opacity: 0.95, - zIndex: 1999 - }, - errorText: { - marginTop: 0, - padding: 0, - marginBottom: 12, - fontWeight: 500, - fontSize: "13pt", - maxWidth: 250, - opacity: 1, - zIndex: 2010, - }, - progressText: { - marginTop: 0, - fontWeight: 500, - fontSize: "13pt", - opacity: 1, - zIndex: 2010, - paddingTop: 12, - gravity: "center", - textAlign: "center" - }, - - errorMessageBox: { - flex: "0 0 auto", - width: 300, - marginLeft: "auto", - marginRight: "auto", - zIndex: 2010 - - - }, - errorMessage: { - color: theme.palette.text.secondary, - textAlign: "left", - zIndex: 2010 - - }, - loadingBox: { - display: "flex", - flexFlow: "column nowrap", - position: "absolute", - top: "20%", - left: 0, right: 0, - color: isDarkMode() ? theme.palette.text.secondary : "#888", - // border: "3px solid #888", - alignItems: "center", - textAlign: "center", - opacity: 0.8, - - }, - loadingBoxItem: { - display: "flex", flexFlow: "row nowrap", - alignItems: "center", - textAlign: "center", - - }, - - - toolBarContent: - { - position: "absolute", top: 0, width: "100%" - }, - - toolBarSpacer: - { - position: "relative", flex: "0 0 auto", - }, - - - mainFrame: { - overflow: "hidden", - display: "flex", - flexFlow: "column", - flex: "1 1 100%" - }, - - toolbarSizingPosition: { - flexGrow: 0, - flexShrink: 1, - width: "100%", - flexBasis: "auto" - }, - mainSizingPosition: { - overflow: "hidden", - flex: "1 1 auto" - }, - - heroContent: { - backgroundColor: theme.mainBackground, - position: "relative", - height: "100%", - width: "100%" - }, - - drawerItem: { - width: 350, - }, - drawerItemFullWidth: { - width: 'auto', - }, - -}); - - - -function supportsFullScreen(): boolean { - let doc: any = window.document; - let docEl: any = doc.documentElement; - var requestFullScreen = docEl.requestFullscreen || docEl.mozRequestFullScreen || docEl.webkitRequestFullscreen || docEl.msRequestFullScreen; - return (!!requestFullScreen); - -} - -function setFullScreen(value: boolean) { - let doc: any = window.document; - let docEl: any = doc.documentElement; - - if (docEl.requestFullscren) // the latest offical api. - { - if (value) { - window.document.documentElement.requestFullscreen({ navigationUI: "show" }); - } else { - window.document.exitFullscreen(); - } - } - - var requestFullScreen = docEl.requestFullscreen || docEl.mozRequestFullScreen || docEl.webkitRequestFullscreen || docEl.msRequestFullScreen; - var cancelFullScreen = docEl.exitFullscreen || doc.mozCancelFullScreen || doc.webkitExitFullscreen || doc.msExitFullscreen; - - if (value) { - requestFullScreen.call(docEl); - } - else { - cancelFullScreen.call(doc); - } -} - - -// function preventDefault(e: SyntheticEvent): void { -// e.stopPropagation(); -// e.preventDefault(); -// } - -type AppState = { - zoomedControlInfo: ZoomedControlInfo | undefined; - - isDrawerOpen: boolean; - errorMessage: string; - displayState: State; - - performanceView: boolean; - - canFullScreen: boolean; - isFullScreen: boolean; - tinyToolBar: boolean; - alertDialogOpen: boolean; - alertDialogMessage: string; - updateDialogOpen: boolean; - isSettingsDialogOpen: boolean; - onboarding: boolean; - isDebug: boolean; - - renameBankDialogOpen: boolean; - saveBankAsDialogOpen: boolean; - - aboutDialogOpen: boolean; - bankDialogOpen: boolean; - editBankDialogOpen: boolean; - zoomedControlOpen: boolean; - - - presetName: string; - presetChanged: boolean; - banks: BankIndex; - bankDisplayItems: number; - showStatusMonitor: boolean; -}; -interface AppProps extends WithStyles { -} - -const AppThemed = withStyles(appStyles)(class extends ResizeResponsiveComponent { - // Before the component mounts, we initialise our state - - model_: PiPedalModel; - errorChangeHandler_: OnChangedHandler; - stateChangeHandler_: OnChangedHandler; - - constructor(props: AppProps) { - super(props); - this.model_ = PiPedalModelFactory.getInstance(); - - this.model_.zoomedUiControl.addOnChangedHandler( - () => { - this.setState({ - zoomedControlOpen: this.model_.zoomedUiControl.get() !== undefined, - zoomedControlInfo: this.model_.zoomedUiControl.get() - }); - } - ); - - this.state = { - performanceView: false, - zoomedControlInfo: this.model_.zoomedUiControl.get(), - isDrawerOpen: false, - errorMessage: this.model_.errorMessage.get(), - displayState: this.model_.state.get(), - canFullScreen: supportsFullScreen() && !this.model_.isAndroidHosted(), - isFullScreen: !!document.fullscreenElement, - tinyToolBar: false, - alertDialogOpen: false, - alertDialogMessage: "", - presetName: this.model_.presets.get().getSelectedText(), - isSettingsDialogOpen: false, - updateDialogOpen: false, - onboarding: false, - isDebug: true, - presetChanged: this.model_.presets.get().presetChanged, - banks: this.model_.banks.get(), - renameBankDialogOpen: false, - saveBankAsDialogOpen: false, - aboutDialogOpen: false, - bankDialogOpen: false, - editBankDialogOpen: false, - zoomedControlOpen: false, - bankDisplayItems: 5, - showStatusMonitor: this.model_.showStatusMonitor.get() - - }; - - this.promptForUpdateHandler = this.promptForUpdateHandler.bind(this); - this.errorChangeHandler_ = this.setErrorMessage.bind(this); - this.beforeUnloadListener = this.beforeUnloadListener.bind(this); - this.unloadListener = this.unloadListener.bind(this); - this.stateChangeHandler_ = this.setDisplayState.bind(this); - this.presetChangedHandler = this.presetChangedHandler.bind(this); - this.alertMessageChangedHandler = this.alertMessageChangedHandler.bind(this); - this.handleCloseAlert = this.handleCloseAlert.bind(this); - this.banksChangedHandler = this.banksChangedHandler.bind(this); - this.showStatusMonitorHandler = this.showStatusMonitorHandler.bind(this); - this.onPopStateHandler = this.onPopStateHandler.bind(this); - } - - showDrawer() { - if (!this.state.isDrawerOpen) { - this.setState({ isDrawerOpen: true }) - this.pushOpenMenuState(); - } - } - hideDrawer(loadingDialog: boolean = false) { - if (!loadingDialog && window.location.hash === "#menu") { - window.history.back(); - } else { - this.setState({ isDrawerOpen: false }) - } - } - - pushOpenMenuState() { - let stackState = { tag: "OpenMenu", previousState: null }; - window.history.replaceState(stackState, "", window.location.href); - window.history.pushState({}, "", "#menu"); - } - onPopStateHandler(ev: PopStateEvent) { - let stackState: DialogStackState | null = ev.state as (DialogStackState | null); - if (stackState && stackState.tag === "OpenMenu") { - if (this.state.isDrawerOpen) { - this.setState({ isDrawerOpen: false }); - } - ev.stopPropagation(); - window.history.replaceState(stackState.previousState, "", window.location.href); - return true; - } - return false; - } - - handleSpecificBank(bankId: number) { - - this.model_.openBank(bankId) - .catch((error) => this.model_.showAlert(error.toString())); - - } - - handleSaveBankAsOk(newName: string) { - let currentName = this.model_.banks.get().getSelectedEntryName(); - if (currentName === newName) { - this.setState({ - renameBankDialogOpen: false, - saveBankAsDialogOpen: false - }); - return; - - } - - if (this.model_.banks.get().nameExists(newName)) { - this.model_.showAlert("A bank by that name already exists."); - return; - } - this.setState({ - renameBankDialogOpen: false, - saveBankAsDialogOpen: false - }); - this.model_.saveBankAs(this.model_.banks.get().selectedBank, newName) - .catch((error) => { - this.model_.showAlert(error.toString()); - }); - - } - handleBankRenameOk(newName: string) { - let currentName = this.model_.banks.get().getSelectedEntryName(); - if (currentName === newName) { - this.setState({ - renameBankDialogOpen: false, - saveBankAsDialogOpen: false - }); - return; - - } - - if (this.model_.banks.get().nameExists(newName)) { - this.model_.showAlert("A bank by that name already exists."); - return; - } - this.setState({ - renameBankDialogOpen: false - }); - this.model_.renameBank(this.model_.banks.get().selectedBank, newName) - .catch((error) => { - this.model_.showAlert(error.toString()); - }); - - } - handleSettingsDialogClose() { - this.setState({ - isSettingsDialogOpen: false, - onboarding: false - }); - } - handleDrawerSettingsClick() { - this.setState({ - isDrawerOpen: false, - isSettingsDialogOpen: true, - onboarding: false - }); - - } - - handleDisplayOnboarding() { - this.setState({ - isDrawerOpen: false, - isSettingsDialogOpen: true, - onboarding: true - }); - - } - - handleDrawerManageBanks() { - this.setState({ - isDrawerOpen: false, - bankDialogOpen: true, - editBankDialogOpen: true - }); - - } - handleDrawerSelectBank() { - - this.setState({ - bankDialogOpen: true, - editBankDialogOpen: false - }); - - } - handleDrawerDonationClick() { - this.hideDrawer(false); - if (this.model_.isAndroidHosted()) { - this.model_.showAndroidDonationActivity(); - } else { - if (window) { - window.open("https://github.com/sponsors/rerdavies", '_blank'); - } - } - - } - - handleDrawerAboutClick() { - this.setState({ - aboutDialogOpen: true - }); - - } - handleDrawerRenameBank() { - this.setState({ - renameBankDialogOpen: true, - saveBankAsDialogOpen: false - }); - - } - handleDrawerSaveBankAs() { - this.setState({ - renameBankDialogOpen: false, - saveBankAsDialogOpen: true - }); - } - - - handleCloseAlert(e?: any, reason?: any) { - this.model_.alertMessage.set(""); - } - showStatusMonitorHandler() { - this.setState({ - showStatusMonitor: this.model_.showStatusMonitor.get() - }); - } - banksChangedHandler() { - this.setState({ - banks: this.model_.banks.get() - }); - } - presetChangedHandler() { - let presets = this.model_.presets.get(); - - this.setState({ - presetName: presets.getSelectedText(), - presetChanged: presets.presetChanged - }); - } - toggleFullScreen(): void { - setFullScreen(!this.state.isFullScreen); - this.setState({ isFullScreen: !this.state.isFullScreen }); - } - - private unloadListener(e: Event) { - this.model_.close(); - return undefined; - } - - private beforeUnloadListener(e: Event) { - this.model_.close(); - return undefined; - } - promptForUpdateHandler(newValue: boolean) { - if (this.model_.enableAutoUpdate) { - if (this.state.updateDialogOpen !== newValue) { - this.setState({ updateDialogOpen: newValue }); - } - } - } - componentDidMount() { - - super.componentDidMount(); - window.addEventListener("beforeunload", this.beforeUnloadListener); - window.addEventListener("unload", this.unloadListener); - window.addEventListener("popstate", this.onPopStateHandler); - - this.model_.errorMessage.addOnChangedHandler(this.errorChangeHandler_); - this.model_.state.addOnChangedHandler(this.stateChangeHandler_); - this.model_.pedalboard.addOnChangedHandler(this.presetChangedHandler); - this.model_.alertMessage.addOnChangedHandler(this.alertMessageChangedHandler); - this.model_.banks.addOnChangedHandler(this.banksChangedHandler); - this.model_.showStatusMonitor.addOnChangedHandler(this.showStatusMonitorHandler); - this.model_.promptForUpdate.addOnChangedHandler(this.promptForUpdateHandler); - this.alertMessageChangedHandler(); - - } - - - updateOverscroll(): void { - if (this.model_.serverVersion) { - // no pull-down refresh on android devices once we're ready (unless we're debug) - let preventOverscroll = - this.model_.state.get() === State.Ready - && !this.model_.debug; - - let overscrollBehavior = preventOverscroll ? "none" : "auto"; - document.body.style.overscrollBehavior = overscrollBehavior; - } - } - - componentDidUpdate() { - } - - componentWillUnmount() { - super.componentWillUnmount(); - window.removeEventListener("beforeunload", this.beforeUnloadListener); - - window.removeEventListener("popstate", this.onPopStateHandler); - - - this.model_.promptForUpdate.removeOnChangedHandler(this.promptForUpdateHandler); - this.model_.errorMessage.removeOnChangedHandler(this.errorChangeHandler_); - this.model_.state.removeOnChangedHandler(this.stateChangeHandler_); - this.model_.pedalboard.removeOnChangedHandler(this.presetChangedHandler); - this.model_.banks.removeOnChangedHandler(this.banksChangedHandler); - this.model_.banks.removeOnChangedHandler(this.showStatusMonitorHandler); - - this.model_.close(); - - } - - alertMessageChangedHandler() { - let message = this.model_.alertMessage.get(); - if (message === "") { - this.setState({ alertDialogOpen: false }); - // leave the message intact so the dialog can fade. - } else { - this.setState({ - alertDialogOpen: true, - alertDialogMessage: message - }); - } - - } - updateResponsive() { - // functional, but disabled. - // let tinyToolBar_ = this.windowSize.height < 600; - // this.setState({ tinyToolBar: tinyToolBar_ }); - - let height = this.windowSize.height; - - const ENTRY_HEIGHT = 48; - // ENTRY_HEIGHT*6 +K = 727 from observation. - const K = 450; - - let bankEntries = Math.floor((height - K) / ENTRY_HEIGHT); - if (bankEntries < 1) bankEntries = 1; - if (bankEntries > 7) bankEntries = 7; - if (bankEntries === 2) bankEntries = 1; - - this.setState({ bankDisplayItems: bankEntries }); - - } - onWindowSizeChanged(width: number, height: number): void { - super.onWindowSizeChanged(width, height); - this.updateResponsive(); - } - - - setErrorMessage(message: string): void { - this.setState({ errorMessage: message }); - } - - - setDisplayState(newState: State): void { - this.updateOverscroll(); - - this.setState({ - displayState: newState, - canFullScreen: supportsFullScreen() && !this.model_.isAndroidHosted() - }); - if (newState === State.Ready) { - if (this.model_.isOnboarding()) { - this.handleDisplayOnboarding(); - } - } - } - - shortBankList(banks: BankIndex): BankIndexEntry[] { - let nDisplayEntries = this.state.bankDisplayItems; - let entries = banks.entries; - let nListEntries = entries.length; - - let result: BankIndexEntry[] = []; - - if (nListEntries <= nDisplayEntries) { - for (let i = 0; i < nListEntries; ++i) { - result.push(entries[i]); - } - } else { - // a subset of the list CENTERED on the currently selected entry. - let selectedIndex = 0; - for (let i = 0; i < nListEntries; ++i) { - if (entries[i].instanceId === banks.selectedBank) { - selectedIndex = i; - break; - } - } - - let minN = selectedIndex - Math.floor(nDisplayEntries / 2); - if (minN < 0) minN = 0; - let maxN = minN + nDisplayEntries; - if (maxN > entries.length) { - maxN = entries.length; - } - for (let i = minN; i < maxN; ++i) { - result.push(entries[i]); - } - } - return result; - } - handleReload() { - if (this.model_.isAndroidHosted()) { - this.model_.chooseNewDevice(); - } else { - window.location.reload(); - } - } - getReloadingMessage(): string { - switch (this.state.displayState) { - case State.ApplyingChanges: - return "Applying\u00A0changes..."; - case State.ReloadingPlugins: - return "Reloading\u00A0plugins..."; - case State.DownloadingUpdate: - return "Downloading update..."; - case State.InstallingUpdate: - return "Installing update...."; - case State.HotspotChanging: - return "Network connection changing..." - default: - return "Reconnecting..."; - } - } - render() { - - const { classes } = this.props; - - let shortBankList = this.shortBankList(this.state.banks); - let showBankSelectDialog = shortBankList.length !== this.state.banks.entries.length; - - - return ( -
{ - if (!this.model_.debug) { - e.preventDefault(); e.stopPropagation(); - } - }} - > - - {this.state.performanceView ? ( - { this.setState({ performanceView: false }); }} - /> - ) : ( -
- - - {(!this.state.tinyToolBar) && !this.state.performanceView ? - ( - - - { this.showDrawer() }} - size="large"> - - -
- -
-
- {this.state.canFullScreen && - { this.toggleFullScreen(); }} - color="inherit" - size="large"> - {this.state.isFullScreen ? ( - - ) : ( - - - )} - - - } - - - ) : ( -
- { this.showDrawer() }} - color="inherit" - size="large"> - - - {this.state.canFullScreen && ( - { this.toggleFullScreen(); }} - size="large"> - {this.state.isFullScreen ? ( - - ) : ( - - - )} - - - )} -
- )} - { this.hideDrawer(false); }} > - - - { - ev.stopPropagation(); - this.hideDrawer(true); - this.setState({ performanceView: true }); - }}> - - - - - - - - - Banks - - - { - shortBankList.map((bank) => { - return ( - { - ev.stopPropagation(); - this.hideDrawer(false); - this.handleSpecificBank(bank.instanceId); - }} - > - - - - - ); - }) - } - { - showBankSelectDialog && ( - { - ev.stopPropagation(); - this.hideDrawer(true); - this.handleDrawerSelectBank(); - }} - > - - - - - - ) - } - - - - { - ev.stopPropagation(); - this.hideDrawer(true); - this.handleDrawerRenameBank() - }}> - - - - - - { - ev.stopPropagation(); - this.hideDrawer(true); - this.handleDrawerSaveBankAs(); - }} > - - - - - - { - ev.stopPropagation(); - this.hideDrawer(true); - this.handleDrawerManageBanks(); - }}> - - - - - - - - - { - ev.stopPropagation(); - this.hideDrawer(true); - this.handleDrawerSettingsClick() - }}> - - - - - - { - ev.stopPropagation(); - this.hideDrawer(true); - this.handleDrawerAboutClick(); - }}> - - - - - - { - ev.stopPropagation(); - this.handleDrawerDonationClick(); - }}> - - - - - - - - - {!this.state.tinyToolBar && ( - - )} -
-
-
- {(this.state.displayState !== State.Loading) && - ( - - ) - } -
- -
-
- this.setState({ bankDialogOpen: false })} /> - {(this.state.aboutDialogOpen) && - ( - this.setState({ aboutDialogOpen: false })} /> - )} - this.handleSettingsDialogClose()} /> - { - this.setState({ - renameBankDialogOpen: false, - saveBankAsDialogOpen: false - }) - }} - onOk={(text: string) => { - if (this.state.renameBankDialogOpen) { - this.handleBankRenameOk(text); - } else if (this.state.saveBankAsDialogOpen) { - this.handleSaveBankAsOk(text); - } - } - } - /> - - { this.setState({ zoomedControlOpen: false }); }} - onDialogClosed={() => { this.model_.zoomedUiControl.set(undefined); } - } - /> - - {this.state.showStatusMonitor && ()} -
- ) - } - - - - - - - - { - this.state.alertDialogMessage - } - - - - - - - - - - -
-
-
 
-
-
- -
-
-

- Error: {this.state.errorMessage} -

-
-
- - -
-
-
 
-
- - - {/* Reloading mask */} - < Modal - open={wantsReloadingScreen(this.state.displayState) || this.state.displayState === State.Loading} - aria-label="loading" - aria-describedby="reloading-modal-description" - > -
-
-
-
- -
- - { - this.state.displayState === State.Loading ? - "Loading..." - :this.getReloadingMessage() - } - -
-
- -
- - ); - } -}); - -export default AppThemed; diff --git a/react/src/DialogEx.tsx b/react/src/DialogEx.tsx deleted file mode 100644 index 70c765a..0000000 --- a/react/src/DialogEx.tsx +++ /dev/null @@ -1,218 +0,0 @@ -// Copyright (c) 2022 Robin Davies -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of -// this software and associated documentation files (the "Software"), to deal in -// the Software without restriction, including without limitation the rights to -// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -// the Software, and to permit persons to whom the Software is furnished to do so, -// subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -import React from 'react'; - -import Dialog, {DialogProps} from '@mui/material/Dialog'; - - -interface DialogExProps extends DialogProps { - tag: string; - fullwidth?: boolean; - onEnterKey: () => void; -} - -interface DialogExState { -} - -export interface IDialogStackable { - getTag: ()=> string; - isOpen: ()=> boolean; - onDialogStackClose(): void; -} - -class DialogStackEntry { - constructor(dialog: IDialogStackable) - { - this.tag = dialog.getTag(); - this.dialog = dialog; - } - tag: string; - dialog: IDialogStackable; -}; - -let dialogStack: DialogStackEntry[] = []; - - -export function popDialogStack(): void { - if (dialogStack.length !== 0) - { - dialogStack.splice(dialogStack.length-1,1); - } -} -export function pushDialogStack(dialog: IDialogStackable): void { - dialogStack.push(new DialogStackEntry(dialog)); -} - -export interface DialogStackState{ - tag: String; - previousState: DialogStackState | null; -}; - - -// Close all dialogs higher in the dialog stack than "tag". -export function removeDialogStackEntriesAbove(tag: string) -{ - for (let i = dialogStack.length-1; i >= 0; --i) - { - let entry = dialogStack[i]; - if (entry.dialog.getTag() === tag) - { - return; - } - popDialogStack(); - if (entry.dialog.isOpen()) - { - entry.dialog.onDialogStackClose(); - } - - } -} -class DialogEx extends React.Component implements IDialogStackable { - constructor(props: DialogExProps) - { - super(props); - this.state = { - - }; - this.handlePopState = this.handlePopState.bind(this); - - } - - mounted: boolean = false; - - hasHooks: boolean = false; - stateWasPopped: boolean = false; - - getTag() { - return this.props.tag; - } - isOpen(): boolean { - return this.props.open; - } - onDialogStackClose() { - this.props.onClose?.({},"backdropClick"); - } - - handlePopState(ev: PopStateEvent): any - { - let evTag: DialogStackState | null = ev.state as DialogStackState | null; - if (evTag && evTag.tag === this.props.tag) { - removeDialogStackEntriesAbove(this.props.tag); - - if (!this.stateWasPopped) - { - this.stateWasPopped = true; - popDialogStack(); - if (this.props.open) { - this.props.onClose?.(ev,"backdropClick"); - } - } - window.history.replaceState(evTag.previousState,"",window.location.href); - window.removeEventListener("popstate",this.handlePopState); - - if (window.location.hash === "#menu") // The menu popstate is next? - { - window.history.back(); // then clear off the menu popstate too. - } - ev.stopPropagation(); - } - } - - updateHooks() : void { - let wantHooks = this.mounted && this.props.open; - if (wantHooks !== this.hasHooks) - { - this.hasHooks = wantHooks; - - if (this.hasHooks) - { - this.stateWasPopped = false; - window.addEventListener("popstate",this.handlePopState); - - pushDialogStack(this); - let dialogStackState: DialogStackState = {tag: this.props.tag,previousState: window.history.state as DialogStackState | null}; - window.history.replaceState(dialogStackState,"",window.location.href); - window.history.pushState( - null, - "", - "#" + this.props.tag - ); - } else { - if (!this.stateWasPopped) - { - window.history.back(); - } - } - } - } - - componentDidMount() - { - super.componentDidMount?.(); - - this.mounted = true; - this.updateHooks(); - } - componentWillUnmount() - { - super.componentWillUnmount?.(); - this.mounted = false; - this.updateHooks(); - } - - componentDidUpdate() - { - this.updateHooks(); - } - myOnClose(event:{}, reason: "backdropClick" | "escapeKeyDown") - { - if (this.props.onClose) this.props.onClose(event,reason); - } - - onEnterKey() { - if (this.props.onEnterKey) - { - this.props.onEnterKey(); - } - } - onKeyDown(evt: React.KeyboardEvent) - { - if (evt.key === 'Enter') - { - this.onEnterKey(); - } - evt.stopPropagation(); - } - render() { - let { tag,onClose,...extra} = this.props; - return ( - { this.myOnClose(event,reason);}} - onKeyDown={(evt)=>{ this.onKeyDown(evt); }} - > - {this.props.children} - - ); - } - -}; - -export default DialogEx; \ No newline at end of file diff --git a/react/src/FilePropertyControl.tsx b/react/src/FilePropertyControl.tsx deleted file mode 100644 index a3d987b..0000000 --- a/react/src/FilePropertyControl.tsx +++ /dev/null @@ -1,244 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2023 Robin E. R. Davies - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import React, { Component, SyntheticEvent } from 'react'; -import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; -import { UiFileProperty } from './Lv2Plugin'; -import Typography from '@mui/material/Typography'; -import { PiPedalModel, PiPedalModelFactory, ListenHandle,State} from './PiPedalModel'; -import ButtonBase from '@mui/material/ButtonBase' -import MoreHorizIcon from '@mui/icons-material/MoreHoriz'; -import {PedalboardItem} from './Pedalboard'; -import {isDarkMode} from './DarkMode'; - -export const StandardItemSize = { width: 80, height: 140 } - - - -const styles = (theme: Theme) => createStyles({ - frame: { - position: "relative", - margin: "12px" - }, - switchTrack: { - height: '100%', - width: '100%', - borderRadius: 14 / 2, - zIndex: -1, - transition: theme.transitions.create(['opacity', 'background-color'], { - duration: theme.transitions.duration.shortest - }), - backgroundColor: theme.palette.secondary.main, - opacity: theme.palette.mode === 'light' ? 0.38 : 0.3 - }, - displayValue: { - position: "absolute", - top: 0, - left: 0, - right: 0, - bottom: 4, - textAlign: "center", - background: "white", - color: "#666", - // zIndex: -1, - } -}); - - -export interface FilePropertyControlProps extends WithStyles { - fileProperty: UiFileProperty; - pedalboardItem: PedalboardItem; - onFileClick: (fileProperty: UiFileProperty, value: string) => void; - theme: Theme; -} -type FilePropertyControlState = { - error: boolean; - hasValue: boolean; - value: string; -}; - -const FilePropertyControl = - withStyles(styles, { withTheme: true })( - class extends Component - { - - model: PiPedalModel; - - - constructor(props: FilePropertyControlProps) { - super(props); - - this.state = { - error: false, - hasValue: false, - value: "", - }; - this.model = PiPedalModelFactory.getInstance(); - this.onStateChanged = this.onStateChanged.bind(this); - } - - - onStateChanged(state: State) { - if (this.mounted) - { - if (state === State.Ready) { - this.subscribeToPatchProperty(); - } - } - } - private propertyGetHandle?: ListenHandle; - - monitorPropertyHandle?: ListenHandle; - - subscribeToPatchProperty() { - // this.propertyGetHandle = this.model.listenForAtomOutput(this.props.instanceId,(instanceId,atomOutput)=>{ - // // PARSE THE OBJECT! - // // this.setState({value: atomOutput?.value as string}); - // }); - this.unsubscribeToPatchProperty(); - this.monitorPropertyHandle = this.model.monitorPatchProperty(this.props.pedalboardItem.instanceId, - this.props.fileProperty.patchProperty, - (instanceId,property,propertyValue) => { - if (propertyValue.otype_ === "Path") - { - this.setState({value: propertyValue.value as string,hasValue: true}); - } - } - ); - - } - unsubscribeToPatchProperty() { - if (this.monitorPropertyHandle !== undefined) - { - this.model.cancelMonitorPatchProperty(this.monitorPropertyHandle); - this.monitorPropertyHandle = undefined; - } - - } - private mounted: boolean = false; - componentDidMount() { - this.model.state.addOnChangedHandler(this.onStateChanged); - this.mounted = true; - this.subscribeToPatchProperty(); - } - componentWillUnmount() { - this.unsubscribeToPatchProperty(); - this.mounted = false; - this.model.state.removeOnChangedHandler(this.onStateChanged); - } - componentDidUpdate(prevProps: Readonly, prevState: Readonly, snapshot?: any): void { - if (prevProps.fileProperty.patchProperty !== this.props.fileProperty.patchProperty - || prevProps.pedalboardItem.instanceId !== this.props.pedalboardItem.instanceId - || prevProps.pedalboardItem.stateUpdateCount !== this.props.pedalboardItem.stateUpdateCount - - ) { - this.unsubscribeToPatchProperty(); - this.subscribeToPatchProperty(); - } - - } - - - inputChanged: boolean = false; - - onDrag(e: SyntheticEvent) { - e.preventDefault(); - } - - onFileClick() { - this.props.onFileClick(this.props.fileProperty, this.state.value); - } - private fileNameOnly(path: string): string { - let slashPos = path.lastIndexOf('/'); - if (slashPos < 0) { - slashPos = 0; - } else { - ++slashPos; - } - let extPos = path.lastIndexOf('.'); - if (extPos < 0 || extPos < slashPos) { - extPos = path.length; - } - - return path.substring(slashPos, extPos); - - } - render() { - //let classes = this.props.classes; - let fileProperty = this.props.fileProperty; - - let value = "\u00A0"; - if (this.state.hasValue) - { - if (this.state.value.length === 0) - { - value = ""; - } else { - value = this.fileNameOnly(this.state.value); - } - } - - let item_width = 264; - - return ( -
- {/* TITLE SECTION */} -
- {fileProperty.label} -
- {/* CONTROL SECTION */} - -
- - { this.onFileClick() }} > -
-
- {value} - -
-
 
-
- -
- - {/* LABEL/EDIT SECTION*/} -
-
-
- ); - } - } - ); - -export default FilePropertyControl; \ No newline at end of file diff --git a/react/src/PedalboardView.tsx b/react/src/PedalboardView.tsx deleted file mode 100644 index e38a48d..0000000 --- a/react/src/PedalboardView.tsx +++ /dev/null @@ -1,1227 +0,0 @@ -// Copyright (c) 2022 Robin Davies -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of -// this software and associated documentation files (the "Software"), to deal in -// the Software without restriction, including without limitation the rights to -// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -// the Software, and to permit persons to whom the Software is furnished to do so, -// subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -import React, { ReactNode, Component, SyntheticEvent } from 'react'; -import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; -import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel'; -import { PluginType } from './Lv2Plugin'; -import ButtonBase from '@mui/material/ButtonBase'; -import Typography from '@mui/material/Typography'; -import PluginIcon, {SelectIconUri} from './PluginIcon'; -import { SelectHoverBackground } from './SelectHoverBackground'; -import SvgPathBuilder from './SvgPathBuilder'; -import Draggable from './Draggable' -import Rect from './Rect'; -import {PiPedalStateError} from './PiPedalError'; -import Utility from './Utility'; -import {isDarkMode} from './DarkMode'; -import { - Pedalboard, PedalboardItem, PedalboardSplitItem, SplitType -} from './Pedalboard'; - -const START_CONTROL = Pedalboard.START_CONTROL; -const END_CONTROL = Pedalboard.END_CONTROL; - - -const START_PEDALBOARD_ITEM_URI = Pedalboard.START_PEDALBOARD_ITEM_URI; -const END_PEDALBOARD_ITEM_URI = Pedalboard.END_PEDALBOARD_ITEM_URI; - -const ENABLED_CONNECTOR_COLOR = isDarkMode() ? "#CCC": "#666"; -const DISABLED_CONNECTOR_COLOR = isDarkMode() ? "#666": "#CCC"; - - - -const CELL_WIDTH: number = 96; -const CELL_HEIGHT: number = 64; -const FRAME_SIZE: number = 36; - -const STROKE_WIDTH = 3; -const STEREO_STROKE_WIDTH = 6; - -const SVG_STROKE_WIDTH = "3"; -const SVG_STEREO_STROKE_WIDTH = "6"; - - - -const EMPTY_ICON_URL = "img/fx_empty.svg"; -const ERROR_ICON_URL = "img/fx_error.svg"; -const TERMINAL_ICON_URL = "img/fx_terminal.svg"; - -function CalculateConnection(numberOfInputs: number, numberOfOutputs: number) -{ - - let result = Math.min(numberOfInputs, numberOfOutputs); - if (result > 2) result = 2; - return result; -} - -const pedalboardStyles = (theme: Theme) => createStyles({ - scrollContainer: { - }, - - container: { - position: "relative", - overflow: "visible", - - }, - splitItem: { - position: "absolute", - display: "flex", - alignItems: "center", - justifyContent: "center", - - - width: CELL_WIDTH, - height: CELL_HEIGHT - - }, - splitStart: { - position: "absolute", - display: "flex", - width: CELL_WIDTH, - height: CELL_HEIGHT, - left: 0, - top: 0 - }, - splitEnd: { - position: "absolute", - display: "flex", - width: CELL_WIDTH, - height: CELL_HEIGHT, - right: 0, - top: 0 - }, - buttonDraggable: { - display: "flex", - alignItem: "center", - justifyContent: "center", - width: "100%", - height: "100%" - }, - pedalItem: { - position: "absolute", - width: CELL_WIDTH, - height: CELL_HEIGHT, - display: "flex", - alignItems: "center", - justifyContent: "center", - }, - iconFrame: { - - display: "flex", - alignItems: "center", - justifyContent: "center", - - background: theme.palette.background.default, - marginLeft: (CELL_WIDTH - FRAME_SIZE) / 2, - marginRight: (CELL_WIDTH - FRAME_SIZE) / 2, - marginTop: (CELL_HEIGHT - FRAME_SIZE) / 2, - marginBottom: (CELL_HEIGHT - FRAME_SIZE) / 2, - width: FRAME_SIZE, - height: FRAME_SIZE, - border: isDarkMode()? "1pt #AAA solid": "1pt #666 solid", - borderRadius: 6 - }, - borderlessIconFrame: { - - display: "flex", - alignItems: "center", - justifyContent: "center", - - background: "transparent", - marginLeft: (CELL_WIDTH - FRAME_SIZE) / 2, - marginRight: (CELL_WIDTH - FRAME_SIZE) / 2, - marginTop: (CELL_HEIGHT - FRAME_SIZE) / 2, - marginBottom: (CELL_HEIGHT - FRAME_SIZE) / 2, - width: FRAME_SIZE, - height: FRAME_SIZE, - border: "0pt #666 solid", - borderRadius: 6 - }, - - pedalIcon: { - width: 24, - height: 24, - opacity: 0.8 - }, - connector: { - position: "absolute", - width: CELL_WIDTH, - height: CELL_HEIGHT - }, - stroke: { - position: "absolute", - background: "#888" - }, - stereoStrokeOuter: { - position: "absolute", - background: "#888" - }, - stereoStrokeInner: { - position: "absolute", - background: "#888" - }, - -}); - -export type OnSelectHandler = (selectedPedal: number) => void; - -interface PedalboardProps extends WithStyles { - theme: Theme; - selectedId?: number; - onSelectionChanged?: OnSelectHandler; - onDoubleClick?: OnSelectHandler; - hasTinyToolBar: boolean; - enableStructureEditing: boolean; - -} -interface LayoutSize { - width: number; - height: number; -} - -type PedalboardState = { - pedalboard?: Pedalboard; -}; - -const EMPTY_PEDALS: PedalLayout[] = []; - - -function makeChain(model: PiPedalModel, uiItems?: PedalboardItem[]): PedalLayout[] { - let result: PedalLayout[] = []; - if (uiItems) { - for (let i = 0; i < uiItems.length; ++i) { - let item = uiItems[i]; - result.push(new PedalLayout(model, item)); - } - } - return result; -} - -class PedalLayout { - uri: string = ""; - name: string = ""; - pluginType: PluginType = PluginType.Plugin; - iconUrl: string = ""; - - bounds: Rect = new Rect(); - - numberOfInputs: number = 2; - numberOfOutputs: number = 2; - - pedalItem?: PedalboardItem; - - // Split Layout only. - topChildren: PedalLayout[] = EMPTY_PEDALS; - bottomChildren: PedalLayout[] = EMPTY_PEDALS; - topConnectorY: number = 0; - bottomConnectorY: number = 0; - - - static Start(): PedalLayout { - let t: PedalLayout = new PedalLayout(); - t.uri = START_PEDALBOARD_ITEM_URI; - t.pluginType = PluginType.Terminal; - t.iconUrl = TERMINAL_ICON_URL; - t.numberOfInputs = 0; - t.numberOfOutputs = 2; - return t; - } - static End(): PedalLayout { - let t: PedalLayout = new PedalLayout(); - t.pluginType = PluginType.Terminal; - t.uri = END_PEDALBOARD_ITEM_URI; - t.iconUrl = TERMINAL_ICON_URL; - t.numberOfInputs = 2; - t.numberOfOutputs = 0; - return t; - } - constructor(model?: PiPedalModel, pedalItem?: PedalboardItem) { - if (model === undefined && pedalItem === undefined) { - return; - } - if (model === undefined || pedalItem === undefined) { - throw new Error("Invalid arguments."); - } - this.pedalItem = pedalItem; - this.uri = pedalItem.uri; - if (pedalItem.isSplit()) { - let splitter = pedalItem as PedalboardSplitItem; - - this.pluginType = PluginType.UtilityPlugin; - this.topChildren = makeChain(model, splitter.topChain); - this.bottomChildren = makeChain(model, splitter.bottomChain); - - this.numberOfInputs = 2; - this.numberOfOutputs = 2; - - } else if (pedalItem.isEmpty()) { - - this.pluginType = PluginType.None; - this.iconUrl = EMPTY_ICON_URL; - this.numberOfInputs = 2; - this.numberOfOutputs = 2; - - } else if (pedalItem.uri === START_PEDALBOARD_ITEM_URI) { - this.pluginType = PluginType.UtilityPlugin; - this.iconUrl = TERMINAL_ICON_URL; - this.numberOfInputs = 0; - this.numberOfOutputs = PiPedalModelFactory.getInstance().jackSettings.get().inputAudioPorts.length; - - } else if (pedalItem.uri === END_PEDALBOARD_ITEM_URI) { - this.pluginType = PluginType.UtilityPlugin; - this.iconUrl = TERMINAL_ICON_URL; - this.numberOfInputs = PiPedalModelFactory.getInstance().jackSettings.get().outputAudioPorts.length; - this.numberOfOutputs = 0; - } - else { - let uiPlugin = model.getUiPlugin(pedalItem.uri); - if (uiPlugin != null) { - this.pluginType = uiPlugin.plugin_type; - this.iconUrl = SelectIconUri(uiPlugin.plugin_type); - this.name = uiPlugin.label; - this.numberOfInputs = Math.max(uiPlugin.audio_inputs,2); - this.numberOfOutputs = Math.max(uiPlugin.audio_outputs,2); - } else { - // default to empty plugin. - this.pluginType = PluginType.ErrorPlugin; - this.name = pedalItem.pluginName??"#error"; - this.iconUrl = ERROR_ICON_URL; - this.numberOfInputs = 2; - this.numberOfOutputs = 2; - } - } - } - isEmpty(): boolean { - return (!this.pedalItem) || this.pedalItem.isEmpty(); - } - isSplitter(): boolean { - return this.pedalItem !== undefined && this.pedalItem.isSplit(); - } - isStart() { - return this.uri === START_PEDALBOARD_ITEM_URI; - } - isEnd() { - return this.uri === END_PEDALBOARD_ITEM_URI; - } -} - -function* chainIterator(layoutChain: PedalLayout[]): Generator { - for (let i = 0; i < layoutChain.length; ++i) { - let item = layoutChain[i]; - yield item; - if (item.isSplitter()) { - let g = chainIterator(item.topChildren); - while (true) { - let v = g.next(); - if (v.done) { - break; - } - yield v.value; - } - g = chainIterator(item.bottomChildren); - while (true) { - let v = g.next(); - if (v.done) { - break; - } - yield v.value; - } - } - } - return; -} - - - -class LayoutParams { - nextId: number = 1; - cx: number = 0; - cy: number = 0; -} - - -const PedalboardView = - withStyles(pedalboardStyles, { withTheme: true })( - class extends Component - { - model: PiPedalModel; - - frameRef: React.RefObject; - scrollRef: React.RefObject; - private bgColor: string; - - constructor(props: PedalboardProps) { - super(props); - this.model = PiPedalModelFactory.getInstance(); - - this.bgColor = props.theme.palette.background.default - - if (!props.selectedId) props.selectedId = -1; - this.state = { - pedalboard: this.model.pedalboard.get(), - }; - this.onPedalboardChanged = this.onPedalboardChanged.bind(this); - this.frameRef = React.createRef(); - this.scrollRef = React.createRef(); - this.handleTouchStart = this.handleTouchStart.bind(this); - } - - handleTouchStart(e: any) - { - // just has to exist to allow Draggable to receive - // touchyMove. :-/ - } - - onDragEnd(instanceId: number, clientX: number, clientY: number) { - if (!this.props.enableStructureEditing) - { - return; - } - if (!this.currentLayout) return; - - if (!this.frameRef.current) return; - - let currentLayout: PedalLayout[] = this.currentLayout; - let frameElement = this.frameRef.current; - - let rc = frameElement.getBoundingClientRect(); - clientX -= rc.left; - clientY -= rc.top; - - let it = chainIterator(currentLayout); - - while (true) { - let v = it.next(); - if (v.done) break; - let item = v.value; - - if (item.isSplitter() && item.pedalItem) { - if (item.bounds.contains(clientX, clientY)) { - if (clientX < item.bounds.x + CELL_WIDTH / 2) { - this.model.movePedalboardItemBefore(instanceId, item.pedalItem.instanceId); - this.setSelection(instanceId); - return; - } else if (clientX > item.bounds.right - CELL_WIDTH / 2) { - this.model.movePedalboardItemAfter(instanceId, item.pedalItem.instanceId); - this.setSelection(instanceId); - return; - - } - } - let yMid = (item.bounds.y + item.bounds.bottom) / 2; - if (clientX >= item.bounds.x - && clientY < yMid && clientY >= item.topChildren[0].bounds.y - - ) { - if (clientX < item.topChildren[0].bounds.x) { - let topPedalItem = item.topChildren[0].pedalItem; - if (topPedalItem) { - this.model.movePedalboardItemBefore(instanceId, topPedalItem.instanceId); - this.setSelection(instanceId); - return; - } - } - let lastTop = item.topChildren[item.topChildren.length - 1]; - if (clientX >= lastTop.bounds.right && clientX < item.bounds.right - CELL_WIDTH / 2) { - if (lastTop.pedalItem) { - this.model.movePedalboardItemAfter(instanceId, lastTop.pedalItem.instanceId); - this.setSelection(instanceId); - return; - } - } - - } - if (clientX >= item.bounds.x - && clientY > yMid && clientY < item.bottomChildren[0].bounds.bottom - ) { - if (clientX < item.bottomChildren[0].bounds.x) { - let bottomPedalItem = item.bottomChildren[0].pedalItem; - if (bottomPedalItem) { - this.model.movePedalboardItemBefore(instanceId, bottomPedalItem.instanceId); - this.setSelection(instanceId); - return; - } - } - let lastBottom = item.bottomChildren[item.bottomChildren.length-1]; - if (clientX >= lastBottom.bounds.right && clientX < item.bounds.right-CELL_WIDTH/2) - { - if (lastBottom.pedalItem) { - this.model.movePedalboardItemAfter(instanceId, lastBottom.pedalItem.instanceId); - this.setSelection(instanceId); - return; - } - - } - - } - - } else if (item.bounds.contains(clientX, clientY)) { - if (item.isStart()) { - this.model.movePedalboardItemToStart(instanceId); - this.setSelection(instanceId); - return; - } else if (item.isEnd()) { - this.model.movePedalboardItemToEnd(instanceId); - this.setSelection(instanceId); - return; - } else { - if (item.pedalItem) - { - let margin = (CELL_WIDTH - FRAME_SIZE) / 2; - if (clientX < item.bounds.x + margin) { - this.model.movePedalboardItemBefore(instanceId, item.pedalItem.instanceId); - } else if (clientX > item.bounds.right - margin) { - this.model.movePedalboardItemAfter(instanceId, item.pedalItem.instanceId); - } else { - this.model.movePedalboardItem(instanceId, item.pedalItem.instanceId); - } - this.setSelection(instanceId); - return; - } - } - - } - } - // delete the plugin. - let newId = this.model.setPedalboardItemEmpty(instanceId); - this.setSelection(newId); - - } - - onPedalboardChanged(value?: Pedalboard) { - this.setState({ pedalboard: value }); - } - - componentDidMount() { - this.scrollRef.current!.addEventListener("touchstart",this.handleTouchStart, {passive: false}); - this.model.pedalboard.addOnChangedHandler(this.onPedalboardChanged); - - } - componentWillUnmount() { - this.scrollRef.current!.removeEventListener("touchstart",this.handleTouchStart); - this.model.pedalboard.removeOnChangedHandler(this.onPedalboardChanged); - } - - offsetLayout_(layoutItems: PedalLayout[], offset: number): void { - for (let i = 0; i < layoutItems.length; ++i) { - let layoutItem = layoutItems[i]; - layoutItem.bounds.y += offset; - if (layoutItem.isSplitter()) { - layoutItem.topConnectorY += offset; - layoutItem.bottomConnectorY += offset; - this.offsetLayout_(layoutItem.topChildren, offset); - this.offsetLayout_(layoutItem.bottomChildren, offset); - } - } - } - - getSplitterIcon(layoutItem: PedalLayout): PluginType { - if (layoutItem.pedalItem === undefined) { - throw new Error("Invalid splitter"); - } - let split = layoutItem.pedalItem as PedalboardSplitItem; - if (split.getSplitType() === SplitType.Ab) { - if (split.isASelected()) { - return PluginType.SplitA; - } else { - return PluginType.SplitB; - - } - } else if (split.getSplitType() === SplitType.Mix) { - return PluginType.SplitMix; //"img/fx_dial.svg"; - } else { - return PluginType.SplitLR; //"img/fx_lr.svg"; - } - } - - doLayout2_(lp: LayoutParams, layoutItems: PedalLayout[]): Rect { - let bounds = new Rect(); - for (let i = 0; i < layoutItems.length; ++i) { - let layoutItem = layoutItems[i]; - if (layoutItem.isSplitter()) { - let x0 = lp.cx; - let y0 = lp.cy; - - layoutItem.bounds.x = x0; - layoutItem.bounds.y = y0; - layoutItem.bounds.height = CELL_HEIGHT; - layoutItem.bounds.width = CELL_WIDTH; - - lp.cx += CELL_WIDTH; - - - let topBounds = this.doLayout2_(lp, layoutItem.topChildren); - if (topBounds.isEmpty()) { - topBounds.x = lp.cx; - topBounds.width = 0; - topBounds.y = y0 - CELL_HEIGHT / 2; - topBounds.height = CELL_HEIGHT; - - } - - - let dyTop = (lp.cy + CELL_HEIGHT / 2)- (topBounds.y + topBounds.height) ; - - - - this.offsetLayout_(layoutItem.topChildren, dyTop); - topBounds.offset(0, dyTop); - bounds.accumulate(topBounds); - - let topCx = lp.cx; - lp.cx = x0; - lp.cx += CELL_WIDTH; - - let bottomBounds = this.doLayout2_(lp, layoutItem.bottomChildren); - if (bottomBounds.isEmpty()) { - bottomBounds.x = lp.cx; bottomBounds.width = 0; - bottomBounds.y = lp.cy; bottomBounds.height = CELL_HEIGHT; - } - - let dyBottom = (lp.cy+CELL_HEIGHT/2)-bottomBounds.y ; - this.offsetLayout_(layoutItem.bottomChildren, dyBottom) - bottomBounds.offset(0, dyBottom); - bounds.accumulate(bottomBounds); - - lp.cx = Math.max(lp.cx, topCx) + CELL_WIDTH; - lp.cy = y0; - - layoutItem.bounds.width = lp.cx - layoutItem.bounds.x; - bounds.accumulate(layoutItem.bounds); - - if (layoutItem.topChildren.length === 0) { - layoutItem.topConnectorY = bounds.y + CELL_HEIGHT / 2; - } else { - layoutItem.topConnectorY = layoutItem.topChildren[0].bounds.y + CELL_HEIGHT / 2; - } - if (layoutItem.bottomChildren.length === 0) { - layoutItem.bottomConnectorY = bounds.y + bounds.height - CELL_HEIGHT / 2; - } else { - layoutItem.bottomConnectorY = layoutItem.bottomChildren[0].bounds.y + CELL_HEIGHT / 2; - } - } else { - layoutItem.bounds.x = lp.cx; - layoutItem.bounds.y = lp.cy; - lp.cx += CELL_WIDTH; - layoutItem.bounds.width = CELL_WIDTH; - layoutItem.bounds.height = CELL_HEIGHT; - bounds.accumulate(layoutItem.bounds); - - } - } - return bounds; - } - doLayout(layoutItems: PedalLayout[]): LayoutSize { - const TWO_ROW_HEIGHT = 142 - 14; - - if (layoutItems.length === 0) - { - // if the current pedalboard is empty, reserve display space anyway. - return {width: 1, height: TWO_ROW_HEIGHT}; - } - - let lp = new LayoutParams(); - - let bounds = this.doLayout2_(lp, layoutItems); - // shift everything down so there are no negative y coordinates. - - if (bounds.height < TWO_ROW_HEIGHT) { - - let extra = Math.floor((TWO_ROW_HEIGHT - Math.ceil(bounds.height))/2); - this.offsetLayout_(layoutItems, Math.floor(-bounds.y + extra/2 )); - bounds.height += extra; - - } else { - this.offsetLayout_(layoutItems, -bounds.y); - } - - bounds.height += 14; // for labels that aren't accounted for. - return { width: bounds.width, height: bounds.height }; - - } - - onItemClick(e: SyntheticEvent, instanceId?: number): void { - if (instanceId) { - this.setSelection(instanceId); - } - } - setSelection(instanceId: number) { - if (this.props.onSelectionChanged) { - this.props.onSelectionChanged(instanceId); - } - } - - onItemDoubleClick(event: SyntheticEvent, instanceId?: number): void { - event.preventDefault(); - event.stopPropagation(); - - if (this.props.onDoubleClick && instanceId && this.props.enableStructureEditing) { - this.props.onDoubleClick(instanceId); - } - - } - - onItemLongClick(event: SyntheticEvent, instanceId?: number): void { - if (!instanceId) - { - return; - } - event.preventDefault(); - event.stopPropagation(); - - if (!this.props.enableStructureEditing) - { - this.setSelection(instanceId); - return; - } - if (!Utility.needsZoomedControls()) { - if (this.props.onDoubleClick && this.props.enableStructureEditing && instanceId) { - this.props.onDoubleClick(instanceId); - } - } - - } - - renderConnector(output: ReactNode[], item: PedalLayout, enabled: boolean): void { - // let classes = this.props.classes; - let x_ = item.bounds.x + CELL_WIDTH / 2; - let y_ = item.bounds.y + CELL_HEIGHT / 2; - let numberOfOutputs = item.numberOfOutputs; - let color = enabled ? ENABLED_CONNECTOR_COLOR : DISABLED_CONNECTOR_COLOR; - let stereoCenterColor = this.bgColor; - let svgPath = new SvgPathBuilder().moveTo(x_, y_).lineTo(x_ + CELL_WIDTH, y_).toString(); - - if (numberOfOutputs === 2) { - output.push(( - - )); - output.push(( - - )); - } else if (numberOfOutputs === 1) { - output.push(( - - )); - } - } - renderSplitConnectors(output: ReactNode[], item: PedalLayout, enabled: boolean, shortSplitOutput: boolean,): void { - //let classes = this.props.classes; - let x_ = item.bounds.x + CELL_WIDTH / 2; - let y_ = item.bounds.y + CELL_HEIGHT / 2; - let yTop = item.topConnectorY; - let yBottom = item.bottomConnectorY; - //let isStereo = item.stereoOutput; - let split = item.pedalItem as PedalboardSplitItem; - - let topEnabled = enabled && split.isASelected(); - let bottomEnabled = enabled && split.isBSelected(); - let topColor = topEnabled ? ENABLED_CONNECTOR_COLOR : DISABLED_CONNECTOR_COLOR; - let bottomColor = bottomEnabled ? ENABLED_CONNECTOR_COLOR : DISABLED_CONNECTOR_COLOR; - - - let topStartPath = new SvgPathBuilder().moveTo(x_, y_).lineTo(x_, yTop).lineTo(x_ + CELL_WIDTH, yTop).toString(); - let bottomStartPath = new SvgPathBuilder().moveTo(x_, y_).lineTo(x_, yBottom).lineTo(x_ + CELL_WIDTH, yBottom).toString(); - - if (item.numberOfInputs === 2 && item.topChildren[0].numberOfInputs === 2) { - output.push(()); - output.push(()); - } else if (item.numberOfInputs !== 0 && item.topChildren[0].numberOfInputs !== 0) { - output.push(()); - } - - if (item.numberOfInputs === 2 && item.bottomChildren[0].numberOfInputs === 2) { - output.push(()); - output.push(()); - - } else if (item.numberOfInputs !== 0 && item.bottomChildren[0].numberOfInputs !== 0) { - output.push(()); - } - - let lastTop = item.topChildren[item.topChildren.length - 1]; - let lastBottom = item.bottomChildren[item.bottomChildren.length - 1]; - - let xTop = lastTop.bounds.right - CELL_WIDTH / 2; - let xBottom = lastBottom.bounds.right - CELL_WIDTH / 2; - - let xEnd = shortSplitOutput ? item.bounds.right : item.bounds.right + CELL_WIDTH / 2; - let xTee0 = item.bounds.right - CELL_WIDTH / 2; - - let firstPath: string; // top or bottom depending on draw order. - let secondPath: string; // top or bottom depending on draw order. - - let firstPathStereo: boolean; - let secondPathStereo: boolean; - let firstPathAbsent: boolean; - let secondPathAbsent: boolean; - let firstPathEnabled: boolean; - let secondPathEnabled: boolean; - let xTee: number; - - let monoAdjustment = (STEREO_STROKE_WIDTH - STROKE_WIDTH) / 2; - - let bottomPathFirst = topEnabled && !bottomEnabled; - let topPathFirst = bottomEnabled && !topEnabled; - - - // Third case: L/R stereo output, when both outputs are mono, requires a third stroke. - let thirdPath: string | null = null; // for L/R stereo output (which can be stereo even if both outputs are mono) - let hasThirdPath = item.numberOfOutputs === 2 && (lastTop.numberOfOutputs !== 2) && (lastBottom.numberOfOutputs !== 2); - - if (hasThirdPath) { - firstPathStereo = false; - secondPathStereo = false; - firstPathAbsent = lastTop.numberOfOutputs === 0 || item.numberOfOutputs === 0; - secondPathAbsent = lastBottom.numberOfOutputs === 0 || item.numberOfOutputs === 0; - xTee = xTee0 - monoAdjustment; - firstPath = new SvgPathBuilder().moveTo(xBottom, yBottom).lineTo(xTee, yBottom).lineTo(xTee, y_).toString(); - - secondPath = new SvgPathBuilder().moveTo(xTop, yTop).lineTo(xTee, yTop).lineTo(xTee, y_).toString(); - - hasThirdPath = true; - thirdPath= new SvgPathBuilder().moveTo(xTee0,y_).lineTo(xEnd,y_).toString(); - firstPathEnabled = bottomEnabled; - secondPathEnabled = topEnabled; - } else if (bottomPathFirst || (topEnabled && lastTop.numberOfOutputs === 2)) { - // draw the bottom path first. - firstPathStereo = item.numberOfOutputs === 2 && lastBottom.numberOfOutputs === 2; - secondPathStereo = item.numberOfOutputs === 2 && lastTop.numberOfOutputs === 2; - firstPathAbsent = item.numberOfOutputs === 0 || lastBottom.numberOfOutputs === 0; - secondPathAbsent = item.numberOfOutputs === 0 || lastTop.numberOfOutputs === 0; - - xTee = firstPathStereo ? xTee0 : xTee0 - monoAdjustment; - firstPath = new SvgPathBuilder().moveTo(xBottom, yBottom).lineTo(xTee, yBottom).lineTo(xTee, y_).toString(); - xTee = secondPathStereo ? xTee0 : xTee0 - monoAdjustment; - - secondPath = new SvgPathBuilder().moveTo(xTop, yTop).lineTo(xTee, yTop).lineTo(xTee, y_).lineTo(xEnd, y_).toString(); - firstPathEnabled = bottomEnabled; - secondPathEnabled = topEnabled; - } else { - // draw the top path first. - firstPathStereo = item.numberOfOutputs === 2 && lastTop.numberOfOutputs === 2; - secondPathStereo = item.numberOfOutputs === 2 && lastBottom.numberOfOutputs === 2; - firstPathAbsent = item.numberOfOutputs === 0 || lastTop.numberOfOutputs === 0; - secondPathAbsent = item.numberOfOutputs === 0 || lastBottom.numberOfOutputs === 0; - - xTee = firstPathStereo ? xTee0 : xTee0 - monoAdjustment; - firstPath = new SvgPathBuilder().moveTo(xTop, yTop).lineTo(xTee, yTop).lineTo(xTee, y_).toString(); - - xTee = secondPathStereo ? xTee0 : xTee0 - monoAdjustment; - secondPath = new SvgPathBuilder().moveTo(xBottom, yBottom).lineTo(xTee, yBottom).lineTo(xTee, y_).lineTo(xEnd, y_).toString(); - - firstPathEnabled = topEnabled; - secondPathEnabled = bottomEnabled; - } - let firstPathColor = firstPathEnabled ? ENABLED_CONNECTOR_COLOR : DISABLED_CONNECTOR_COLOR; - let secondPathColor = secondPathEnabled ? ENABLED_CONNECTOR_COLOR : DISABLED_CONNECTOR_COLOR; - - if (bottomPathFirst || topPathFirst) { - // display stereo strokes with cutoff line. - if (firstPathStereo) { - output.push(( - - )); - output.push(( - - )); - } else if (!firstPathAbsent) { - output.push(( - - )); - } - if (secondPathStereo) { - output.push(( - - )); - output.push(( - - )); - } else if (!secondPathAbsent) { - output.push(( - - )); - } - - } else { - // stereo strokes merge. - if (firstPathStereo) { - output.push(( - - )); - } else if (!firstPathAbsent) { - output.push(( - - )); - } - if (secondPathStereo) { - output.push(( - - )); - } else if (!secondPathAbsent) { - output.push(( - - )); - } - - // draw stereo inner lines. - if (firstPathStereo) { - output.push(( - - )); - } - if (secondPathStereo) { - output.push(( - - )); - - } - } - if (thirdPath != null) - { - // stereo output of L/R splitter - output.push(( - - )); - output.push(( - - )); - - - } - } - getScrollContainer() - { - let el: HTMLElement | undefined | null= this.scrollRef.current; - // actually not here anymore. :-/ It has a reactive definition in MainPage.tsx now. - while (el) - { - if (el.id === "pedalboardScroll") - { - return el as HTMLDivElement; - } - el = el.parentElement; - } - throw new PiPedalStateError("scroll container not found."); - } - - pedalButton( - instanceId: number, - iconType: PluginType, - draggable: boolean, - enabled: boolean, - hasBorder: boolean = true, - pluginNotFound: boolean) - : ReactNode { - let classes = this.props.classes; - return ( -
{ e.preventDefault(); }}> - - { this.onItemClick(e, instanceId); }} - onDoubleClick={(e: SyntheticEvent) => { this.onItemDoubleClick(e, instanceId); }} - onContextMenu={(e: SyntheticEvent) => { this.onItemLongClick(e, instanceId); }} - > - - this.getScrollContainer()} - onDragEnd={(x, y) => { this.onDragEnd(instanceId, x, y) }} - > - - - - -
- ); - - } - renderConnectors(output: ReactNode[], layoutChain: PedalLayout[], enabled: boolean, shortSplitOutput: boolean): void { - let length = layoutChain.length - 1; - if (layoutChain.length > 0 && layoutChain[layoutChain.length - 1].isSplitter()) { - ++length; - } - for (let i = 0; i < length; ++i) { - let item = layoutChain[i]; - if (item.isSplitter()) { - let splitter = item.pedalItem as PedalboardSplitItem; - this.renderSplitConnectors(output, item, enabled, i === length - 1 && shortSplitOutput,); - this.renderConnectors(output, item.topChildren, enabled && splitter.isASelected(), false); - this.renderConnectors(output, item.bottomChildren, enabled && splitter.isBSelected(), false); - - } else if (item.uri !== END_PEDALBOARD_ITEM_URI) { - this.renderConnector(output, item, enabled); - - } - } - } - renderConnectorFrame(layoutChain: PedalLayout[], layoutSize: LayoutSize): ReactNode { - let outputs: ReactNode[] = []; - this.renderConnectors(outputs, layoutChain, true, false); - return ( -
- - - { - outputs - } - - - -
- ); - - } - - renderChain(layoutChain: PedalLayout[], layoutSize: LayoutSize): ReactNode { - - let classes = this.props.classes; - - let result: ReactNode[] = []; - - result.push(this.renderConnectorFrame(layoutChain, layoutSize)); - - let it = chainIterator(layoutChain); - while (true) { - let v = it.next(); - if (v.done) break; - let item = v.value; - switch (item.uri) { - case START_PEDALBOARD_ITEM_URI: - result.push(
-
- - {this.pedalButton(START_CONTROL, item.pluginType,false,true,false,false)} -
-
); - break; - case END_PEDALBOARD_ITEM_URI: - result.push(
-
- - {this.pedalButton(END_CONTROL, item.pluginType, false,true,false,false)} -
-
); - break; - default: - if (item.isSplitter()) { - - result.push(
-
- {this.pedalButton(item.pedalItem?.instanceId ?? -1, this.getSplitterIcon(item), false,true,true,false)} -
-
); - - } else { - result.push( -
- {item.name} -
- ) - let uiPlugin = this.model.getUiPlugin(item.pedalItem?.uri??""); - let pluginMissing = uiPlugin == null; - result.push(
- {this.pedalButton(item.pedalItem?.instanceId ?? -1, item.pluginType, !item.isEmpty(), item.pedalItem?.isEnabled ?? false,true,pluginMissing)} - -
); - - } - break; - } - - } - return result; - } - - canInputStero(item: PedalLayout): boolean { - if (item.pedalItem) { - let plugin = this.model.getUiPlugin(item.pedalItem.uri); - if (plugin) { - return plugin.audio_inputs === 2; - } - } - return true; - } - getNumberOfInputs(item: PedalLayout): number { - if (item.pedalItem) { - let plugin = this.model.getUiPlugin(item.pedalItem.uri); - if (plugin) { - return plugin.audio_inputs; - } - } - return 1; - } - getNumberOfOutputs(item: PedalLayout): number { - if (item.pedalItem) { - let plugin = this.model.getUiPlugin(item.pedalItem.uri); - if (plugin) { - return plugin.audio_outputs; - } - } - return 1; - } - - markStereoOutputs(layoutChain: PedalLayout[], numberOfInputs: number, numberOfOutputs: number) { - // analyze forward flow. - this.markStereoForward(layoutChain, numberOfInputs); - // mark items that feed a mono effect as mono. - this.markStereoBackward(layoutChain, numberOfOutputs); - } - - markStereoBackward(layoutChain: PedalLayout[], numberOfOutputs: number) : number - { - for (let i = layoutChain.length-1; i >= 0; --i) - { - let item = layoutChain[i]; - if (item.isSplitter()) - { - item.numberOfOutputs = CalculateConnection(item.numberOfOutputs, numberOfOutputs) - - this.markStereoBackward(item.topChildren,numberOfOutputs); - this.markStereoBackward(item.bottomChildren,numberOfOutputs); - let topInputs = item.topChildren[0].numberOfInputs; - let bottomInputs = item.bottomChildren[0].numberOfInputs; - - let splitItem = item.pedalItem as PedalboardSplitItem; - if (splitItem.getSplitType() !== SplitType.Lr) - { - item.numberOfInputs = CalculateConnection(item.numberOfInputs, Math.max(topInputs,bottomInputs)); - } - } else if (item.isEnd()) - { - - } else if (item.isStart()) - { - item.numberOfOutputs = CalculateConnection(item.numberOfOutputs,numberOfOutputs); - return item.numberOfOutputs; - - } else if (item.isEmpty()) { - if (numberOfOutputs === 0) - { - item.numberOfOutputs = 0; - item.numberOfInputs = CalculateConnection(item.numberOfInputs,2); - } else { - item.numberOfOutputs = CalculateConnection(item.numberOfOutputs,numberOfOutputs); - item.numberOfInputs = CalculateConnection(item.numberOfInputs,numberOfOutputs); - } - } else { - item.numberOfOutputs = CalculateConnection(item.numberOfOutputs,numberOfOutputs); - } - numberOfOutputs = item.numberOfInputs; - } - return numberOfOutputs; - } - markStereoForward(layoutChain: PedalLayout[],numberOfInputs: number): number - { - if (layoutChain.length === 0) { - return numberOfInputs; - } - for (let i = 0; i < layoutChain.length; ++i) { - let item = layoutChain[i]; - if (item.isSplitter()) { - let splitter = item.pedalItem as PedalboardSplitItem; - item.numberOfInputs = numberOfInputs; - - let chainInputs = numberOfInputs; - if (splitter.getSplitType() === SplitType.Lr) - { - chainInputs = CalculateConnection(numberOfInputs,1); - } - let topOutputs = this.markStereoForward(item.topChildren, chainInputs); - let bottomOutputs = this.markStereoForward(item.bottomChildren, chainInputs); - - - if (splitter.getSplitType() === SplitType.Ab) { - if (splitter.isASelected()) { - item.numberOfOutputs = topOutputs; - } else { - item.numberOfOutputs = bottomOutputs; - } - } else { - item.numberOfOutputs = (topOutputs >= 1 || bottomOutputs >= 1) ? 2: 1; - } - } else if (item.isStart()) - { - item.numberOfOutputs = Math.min(PiPedalModelFactory.getInstance().jackSettings.get().inputAudioPorts.length,2); - } else if (item.isEnd()) { - item.numberOfInputs = - CalculateConnection( - Math.min(PiPedalModelFactory.getInstance().jackSettings.get().outputAudioPorts.length,2), - numberOfInputs); - return item.numberOfInputs; - } else if (item.isEmpty()) { - item.numberOfInputs = numberOfInputs; - if (numberOfInputs === 0) - { - item.numberOfOutputs = 2; - } else { - item.numberOfOutputs = item.numberOfInputs; - } - } else { - item.numberOfInputs = CalculateConnection(numberOfInputs,this.getNumberOfInputs(item)); - item.numberOfOutputs = this.getNumberOfOutputs(item); - } - numberOfInputs = item.numberOfOutputs; - } - return numberOfInputs; - } - - currentLayout?: PedalLayout[]; - private renderKey: number = 0; - render() { - const { classes } = this.props; - this.renderKey = 0; - let layoutChain = makeChain(this.model, this.state.pedalboard?.items); - let start = PedalLayout.Start(); - let end = PedalLayout.End(); - if (layoutChain.length !== 0) - { - layoutChain.splice(0, 0, start); - layoutChain.splice(layoutChain.length, 0, end); - this.markStereoOutputs(layoutChain, 2,2); - } - - let layoutSize = this.doLayout(layoutChain); - - - this.currentLayout = layoutChain; // save for mouse processing &c. - - return ( -
-
- {this.renderChain(layoutChain, layoutSize)} -
-
- ); - } - - } - ); - -export default PedalboardView \ No newline at end of file diff --git a/react/src/SnapshotEditor.tsx b/react/src/SnapshotEditor.tsx deleted file mode 100644 index d078ff7..0000000 --- a/react/src/SnapshotEditor.tsx +++ /dev/null @@ -1,362 +0,0 @@ -// Copyright (c) 2024 Robin Davies -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of -// this software and associated documentation files (the "Software"), to deal in -// the Software without restriction, including without limitation the rights to -// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -// the Software, and to permit persons to whom the Software is furnished to do so, -// subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -import { WithStyles } from '@mui/styles'; -import ArrowBackIcon from '@mui/icons-material/ArrowBack'; -import CloseIcon from '@mui/icons-material/Close'; -import AppBar from '@mui/material/AppBar'; -import Toolbar from '@mui/material/Toolbar'; -import CssBaseline from '@mui/material/CssBaseline'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; -import IconButton from '@mui/material/IconButton'; -import FullscreenIcon from '@mui/icons-material/Fullscreen'; -import FullscreenExitIcon from '@mui/icons-material/FullscreenExit'; -import ResizeResponsiveComponent from './ResizeResponsiveComponent'; -import { PiPedalModelFactory, PiPedalModel, State, ZoomedControlInfo } from './PiPedalModel'; -import ZoomedUiControl from './ZoomedUiControl' -import MainPage from './MainPage'; -import JackStatusView from './JackStatusView'; -import { Theme } from '@mui/material/styles'; -import { isDarkMode } from './DarkMode'; -import Typography from '@mui/material/Typography'; -import TextField from '@mui/material/TextField'; -import { Snapshot } from './Pedalboard'; -import ColorDropdownButton, { DropdownAlignment } from './ColorDropdownButton'; -import { getBackgroundColor } from './MaterialColors'; - - -const selectColor = isDarkMode() ? "#888" : "#FFFFFF"; - - -const appStyles = (theme: Theme) => createStyles({ - "&": { // :root - colorScheme: (isDarkMode() ? "dark" : "light") - }, - - - mainFrame: { - overflow: "hidden", - display: "flex", - flexFlow: "column", - marginTop: 8, - flex: "1 1 100%" - }, - heroContent: { - backgroundColor: theme.mainBackground, - position: "relative", - height: "100%", - width: "100%" - }, - shadowCatcher: { - backgroundColor: theme.mainBackground - }, - - select: { // fu fu fu.Overrides for white selector on dark background. - '&:before': { - borderColor: selectColor, - }, - '&:after': { - borderColor: selectColor, - }, - '&:hover:not(.Mui-disabled):before': { - borderColor: selectColor, - } - }, - select_icon: { - fill: selectColor, - } - - -}); - - -function supportsFullScreen(): boolean { - let doc: any = window.document; - let docEl: any = doc.documentElement; - var requestFullScreen = docEl.requestFullscreen || docEl.mozRequestFullScreen || docEl.webkitRequestFullScreen || docEl.msRequestFullscreen; - return (!!requestFullScreen); - -} - -function setFullScreen(value: boolean) { - let doc: any = window.document; - let docEl: any = doc.documentElement; - - var requestFullScreen = docEl.requestFullscreen || docEl.mozRequestFullScreen || docEl.webkitRequestFullScreen || docEl.msRequestFullscreen; - var cancelFullScreen = doc.exitFullscreen || doc.mozCancelFullScreen || doc.webkitExitFullscreen || doc.msExitFullscreen; - - if (!doc.fullscreenElement && !doc.mozFullScreenElement && !doc.webkitFullscreenElement && !doc.msFullscreenElement) { - requestFullScreen.call(docEl); - } - else { - cancelFullScreen.call(doc); - } -} - -type SnapshotEditorState = { - zoomedControlInfo: ZoomedControlInfo | undefined; - zoomedControlOpen: boolean; - - canFullScreen: boolean; - isFullScreen: boolean; - isDebug: boolean; - collapseLabel: boolean; - - showStatusMonitor: boolean; - name: string, - color: string - -}; -interface SnapshotEditorProps extends WithStyles { - onClose: () => void; - onOk: (snapshotIndex: number, name: string, color: string, newSnapshots: (Snapshot | null)[]) => void; - snapshotIndex: number; -} - -const SnapshotEditor = withStyles(appStyles)(class extends ResizeResponsiveComponent { - // Before the component mounts, we initialise our state - - model_: PiPedalModel; - - getCollapseLabel() { - return this.windowSize.width < 500; - } - - constructor(props: SnapshotEditorProps) { - super(props); - this.model_ = PiPedalModelFactory.getInstance(); - - this.model_.zoomedUiControl.addOnChangedHandler( - () => { - this.setState({ - zoomedControlOpen: this.model_.zoomedUiControl.get() !== undefined, - zoomedControlInfo: this.model_.zoomedUiControl.get() - }); - } - ); - - let snapshot = this.model_.pedalboard.get().snapshots[this.props.snapshotIndex] ?? new Snapshot(); - this.state = { - zoomedControlOpen: false, - zoomedControlInfo: this.model_.zoomedUiControl.get(), - canFullScreen: supportsFullScreen() && !this.model_.isAndroidHosted(), - isFullScreen: !!document.fullscreenElement, - showStatusMonitor: this.model_.showStatusMonitor.get(), - isDebug: true, - name: snapshot.name, - color: snapshot.color, - collapseLabel: this.getCollapseLabel() - - }; - - this.showStatusMonitorHandler = this.showStatusMonitorHandler.bind(this); - } - - showStatusMonitorHandler() { - this.setState({ - showStatusMonitor: this.model_.showStatusMonitor.get() - }); - } - toggleFullScreen(): void { - setFullScreen(this.state.isFullScreen); - this.setState({ isFullScreen: !this.state.isFullScreen }); - } - - componentDidMount() { - - super.componentDidMount(); - this.model_.showStatusMonitor.addOnChangedHandler(this.showStatusMonitorHandler); - - } - - - updateOverscroll(): void { - if (this.model_.serverVersion) { - // no pull-down refresh on android devices once we're ready (unless we're debug) - let preventOverscroll = - this.model_.state.get() === State.Ready - && !this.model_.debug; - - let overscrollBehavior = preventOverscroll ? "none" : "auto"; - document.body.style.overscrollBehavior = overscrollBehavior; - } - } - - componentDidUpdate() { - } - - componentWillUnmount() { - super.componentWillUnmount(); - this.model_.banks.removeOnChangedHandler(this.showStatusMonitorHandler); - } - - onWindowSizeChanged(width: number, height: number): void { - super.onWindowSizeChanged(width, height); - this.setState({ - collapseLabel: this.getCollapseLabel() - }); - - } - - handleOk() { - let currentPedalboard = this.model_.pedalboard.get(); - let selectedSnapshot = this.props.snapshotIndex; - let currentSnapshot: Snapshot | null = currentPedalboard.snapshots[selectedSnapshot]; - if (!currentSnapshot) - { - this.props.onClose(); - return; - } - - let changed = this.state.name !== currentSnapshot.name - || this.state.color !== currentSnapshot.color - || currentSnapshot.isModified; - if (!changed) - { - this.props.onClose(); - return; - } - let newSnapshots = Snapshot.cloneSnapshots(currentPedalboard.snapshots); - let newSnapshot = this.model_.pedalboard.get().makeSnapshot(); - newSnapshot.name = this.state.name; - newSnapshot.color = this.state.color; - newSnapshots[selectedSnapshot] = newSnapshot; - this.model_.setSnapshots(newSnapshots, selectedSnapshot); - - this.props.onOk(selectedSnapshot, this.state.name, this.state.color, newSnapshots); - - - } - - render() { - - const { classes } = this.props; - - return ( - -
{ - if (!this.model_.debug) { - e.preventDefault(); e.stopPropagation(); - } - }} - > - - - - { this.handleOk(); }} - size="large"> - - - {!this.state.collapseLabel && ( - - {'Snapshot ' + (this.props.snapshotIndex + 1)} - - )} - -
- { - this.setState({ name: ev.target.value }); - }} - /> -
- { - this.setState({ color: newColor }); - }} /> - {this.state.canFullScreen && - { this.toggleFullScreen(); }} - color="inherit" - size="medium"> - {this.state.isFullScreen ? ( - - ) : ( - - - )} - - - } - { this.props.onClose(); }} - color="inherit" - size="medium"> - - - - - -
-
-
- -
- -
-
- - { this.setState({ zoomedControlOpen: false }); }} - onDialogClosed={() => { this.model_.zoomedUiControl.set(undefined); } - } - /> - { this.state.showStatusMonitor && ()} -
- ); - } -} -); - -export default SnapshotEditor; diff --git a/react/src/index.css b/react/src/index.css deleted file mode 100644 index ec2585e..0000000 --- a/react/src/index.css +++ /dev/null @@ -1,13 +0,0 @@ -body { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; -} diff --git a/react/src/index.tsx b/react/src/index.tsx deleted file mode 100644 index ef2edf8..0000000 --- a/react/src/index.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import './index.css'; -import App from './App'; -import reportWebVitals from './reportWebVitals'; - -ReactDOM.render( - - - , - document.getElementById('root') -); - -// If you want to start measuring performance in your app, pass a function -// to log results (for example: reportWebVitals(console.log)) -// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals -reportWebVitals(); diff --git a/react/src/reportWebVitals.ts b/react/src/reportWebVitals.ts deleted file mode 100644 index 49a2a16..0000000 --- a/react/src/reportWebVitals.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { ReportHandler } from 'web-vitals'; - -const reportWebVitals = (onPerfEntry?: ReportHandler) => { - if (onPerfEntry && onPerfEntry instanceof Function) { - import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => { - getCLS(onPerfEntry); - getFID(onPerfEntry); - getFCP(onPerfEntry); - getLCP(onPerfEntry); - getTTFB(onPerfEntry); - }); - } -}; - -export default reportWebVitals; diff --git a/react/src/setupTests.ts b/react/src/setupTests.ts deleted file mode 100644 index 8f2609b..0000000 --- a/react/src/setupTests.ts +++ /dev/null @@ -1,5 +0,0 @@ -// jest-dom adds custom jest matchers for asserting on DOM nodes. -// allows you to do things like: -// expect(element).toHaveTextContent(/react/i) -// learn more: https://github.com/testing-library/jest-dom -import '@testing-library/jest-dom'; diff --git a/react/start b/react/start deleted file mode 100755 index 0186425..0000000 --- a/react/start +++ /dev/null @@ -1 +0,0 @@ -npm start diff --git a/react/tmp.txt b/react/tmp.txt deleted file mode 100644 index 3a7e78a..0000000 --- a/react/tmp.txt +++ /dev/null @@ -1,178 +0,0 @@ -src/PiPedalError.tsx -src/OldDeleteIcon.tsx -src/MaterialColors.tsx -src/Pedalboard.tsx -src/SystemMidiBindingView.tsx -src/GovernorSettings.tsx -src/ObservableProperty.tsx -src/SnapshotEditor.tsx -src/SelectMidiChannelsDialog.tsx -src/AlsaMidiDeviceInfo.tsx -src/WifiDirectConfigSettings.tsx -src/WifiConfigSettings.tsx -src/SnapshotButton.tsx -src/WindowScale.tsx -src/JsonAtom.tsx -src/PiPedalSocket.tsx -src/TemporaryDrawer.tsx -src/DarkMode.tsx -src/MidiBindingsDialog.tsx -src/MidiBinding.tsx -src/SnapshotDialog.tsx -src/SettingsDialog.tsx -src/PedalboardView.tsx -src/reportWebVitals.ts -src/OptionsDialog.tsx -src/SelectChannelsDialog.tsx -src/PluginPresetSelector.tsx -src/VuMeter.tsx -src/ToobFrequencyResponseView.tsx -src/SystemMidiBindingsDialog.tsx -src/FullScreenIME.tsx -src/App.tsx -src/ToobInputStageView.tsx -src/XxxSnippet.tsx -src/JackServerSettings.tsx -src/ToobWaveShapeView.tsx -src/ToobPowerStage2View.tsx -src/PluginPreset.tsx -src/logo.svg -src/Banks.tsx -src/NoChangePassword.tsx -src/SearchFilter.tsx -src/FilePropertyDirectorySelectDialog.tsx -src/GxTunerView.tsx -src/UpdateDialog.tsx -src/svg/file_download_black_24dp.svg -src/svg/fx_filter.svg -src/svg/fx_pitch.svg -src/svg/fx_distortion.svg -src/svg/fx_split_b.svg -src/svg/fx_chorus.svg -src/svg/fx_limiter.svg -src/svg/fx_phaser.svg -src/svg/snapshot_0.svg -src/svg/snapshot_3.svg -src/svg/file_upload_black_24dp.svg -src/svg/ic_bank.svg -src/svg/fx_function.svg -src/svg/fx_dial.svg -src/svg/ic_settings.svg -src/svg/fx_split_a.svg -src/svg/fx_empty.svg -src/svg/fx_amplifier.svg -src/svg/fx_spectral.svg -src/svg/fx_eq.svg -src/svg/ic_edit_banks.svg -src/svg/ic_help_outline.svg -src/svg/ic_save_bank_as.svg -src/svg/ic_pluginpreset2.svg -src/svg/fx_flanger2.svg -src/svg/snapshot_6.svg -src/svg/fx_lr.svg -src/svg/fx_generator.svg -src/svg/snapshot_1.svg -src/svg/fx_reverb.svg -src/svg/fx_plugin.svg -src/svg/snapshot_4.svg -src/svg/drive_file_rename_outline_black_24dp.svg -src/svg/snapshot_2.svg -src/svg/fx_instrument.svg -src/svg/fx_modulator.svg -src/svg/fx_error.svg -src/svg/fx_simulator.svg -src/svg/fx_filter_hp.svg -src/svg/fx_compressor.svg -src/svg/fx_gate.svg -src/svg/fx_terminal.svg -src/svg/ic_midi.svg -src/svg/fx_oscillator.svg -src/svg/fx_analyzer.svg -src/svg/fx_flanger.svg -src/svg/old_delete_outline_24dp.svg -src/svg/ic_presets.svg -src/svg/fx_delay.svg -src/svg/fx_parametric_eq.svg -src/svg/fx_spatial.svg -src/svg/fx_converter.svg -src/svg/fx_constant.svg -src/svg/snapshot_5.svg -src/svg/ic_pluginpreset.svg -src/svg/fx_mixer.svg -src/svg/fx_utility.svg -src/Updater.tsx -src/UploadPresetDialog.tsx -src/RadioSelectDialog.tsx -src/setupTests.ts -src/ToobCabSimView.tsx -src/RenameDialog.tsx -src/SplitControlView.tsx -src/SelectHoverBackground.tsx -src/IControlViewFactory.tsx -src/OkCancelDialog.tsx -src/BankDialog.tsx -src/PluginPresetsDialog.tsx -src/App.test.tsx -src/ControlViewFactory.tsx -src/DraggableGrid.tsx -src/ZoomedDial.tsx -src/index.css -src/Pedal.tsx -src/Draggable.tsx -src/PluginIcon.tsx -src/react-app-env.d.ts -src/TextFieldEx.tsx -src/FilePropertyDialog.tsx -src/FilePropertyDirectoryTree.tsx -src/StringBuilder.tsx -src/MainPage.tsx -src/PluginInfoDialog.tsx -src/AppThemed.tsx -src/Lv2Plugin.tsx -src/ToobSpectrumResponseView.tsx -src/PerformanceView.tsx -src/JackServerSettingsDialog.tsx -src/Utility.tsx -src/JackStatusView.tsx -src/ToobSpectrumAnalyzerView.tsx -src/SvgPathBuilder.tsx -src/PresetSelector.tsx -src/PresetDialog.tsx -src/WifiChannel.tsx -src/AboutDialog.tsx -src/GxTunerControl.tsx -src/VirtualKeyboardHandler.tsx -src/PluginControl.tsx -src/LoadPluginDialog.tsx -src/ZoomedUiControl.tsx -src/AlsaDeviceInfo.tsx -src/ToobToneStackView.tsx -src/UploadFileDialog.tsx -src/PluginOutputControl.tsx -src/SelectThemeDialog.tsx -src/Rect.tsx -src/AppThemed.css -src/ColorDropdownButton.tsx -src/AndroidHost.tsx -src/SnapshotPanel.tsx -src/ToobMLView.tsx -src/WifiConfigDialog.tsx -src/Rectangle.tsx -src/SnapshotColors.tsx -src/PiPedalModel.tsx -src/ObservableEvent.tsx -src/JackHostStatus.tsx -src/index.tsx -src/FilePropertyControl.tsx -src/WifiDirectConfigDialog.tsx -src/MidiBindingView.tsx -src/PluginControlView.tsx -src/SplitUiControls.tsx -src/PluginClass.tsx -src/DialogEx.tsx -src/Jack.tsx -src/ResizeResponsiveComponent.tsx -src/NumericInput.tsx -src/SnapshotPropertiesDialog.tsx -src/SearchControl.tsx -src/Units.tsx diff --git a/react/tsconfig.json b/react/tsconfig.json deleted file mode 100644 index a191348..0000000 --- a/react/tsconfig.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "compilerOptions": { - "target": "es5", - "lib": [ - "dom", - "dom.iterable", - "esnext", - "es2020" - ], - "allowJs": true, - "skipLibCheck": true, - "esModuleInterop": true, - "allowSyntheticDefaultImports": true, - "strict": true, - "forceConsistentCasingInFileNames": true, - "noFallthroughCasesInSwitch": true, - "module": "esnext", - "moduleResolution": "node", - "resolveJsonModule": true, - "isolatedModules": true, - "noEmit": true, - "jsx": "react-jsx" - }, - "include": [ - "src" - ] -} diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp index 726c9b9..9b14d64 100644 --- a/src/AlsaDriver.cpp +++ b/src/AlsaDriver.cpp @@ -1257,7 +1257,7 @@ namespace pipedal { message = SS("Device " << alsa_device_name << " in use. The following applications are using your soundcard: " << apps - << ". Stop them as neccesary before trying to restart pipedald."); + << ". Stop them as neccesary before trying to pipedald."); } else { @@ -1657,7 +1657,7 @@ namespace pipedal Lv2Log::error(e.what()); Lv2Log::error("ALSA audio thread terminated abnormally."); } - this->driverHost->OnAudioStopped(); + this->driverHost->OnAlsaDriverStopped(); // if we terminated abnormally, pump messages until we have been terminated. if (!terminateAudio()) @@ -1671,11 +1671,16 @@ namespace pipedal pBuffer[j] = 0; } } - while (!terminateAudio()) + try { + while (!terminateAudio()) + { + std::this_thread::sleep_for(std::chrono::milliseconds(10)); + // zero out input buffers. + this->driverHost->OnProcess(this->bufferSize); + } + } catch (const std::exception &e) { - std::this_thread::sleep_for(std::chrono::milliseconds(10)); - // zero out input buffers. - this->driverHost->OnProcess(this->bufferSize); + } } this->driverHost->OnAudioTerminated(); diff --git a/src/AlsaDriverTest.cpp b/src/AlsaDriverTest.cpp index 8c3e4c2..29b1f2c 100644 --- a/src/AlsaDriverTest.cpp +++ b/src/AlsaDriverTest.cpp @@ -212,7 +212,7 @@ public: } - virtual void OnAudioStopped() { + virtual void OnAlsaDriverStopped() { } virtual void OnProcess(size_t nFrames) { if (testType == TestType::NullTest) return; diff --git a/src/ArmPerformanceCounters.hpp b/src/ArmPerformanceCounters.hpp index 8437dc8..335139e 100644 --- a/src/ArmPerformanceCounters.hpp +++ b/src/ArmPerformanceCounters.hpp @@ -100,8 +100,8 @@ namespace pipedal long long get_l1_misses() { - long long count; - read(fd_l1, &count, sizeof(long long)); + long long count = 0; + auto _ = read(fd_l1, &count, sizeof(long long)); return count; } @@ -111,8 +111,8 @@ namespace pipedal { return -1; } - long long count; - read(fd_l2, &count, sizeof(long long)); + long long count = 0; + auto _ = read(fd_l2, &count, sizeof(long long)); return count; } }; diff --git a/src/AudioDriver.hpp b/src/AudioDriver.hpp index 0d45658..6660761 100644 --- a/src/AudioDriver.hpp +++ b/src/AudioDriver.hpp @@ -48,7 +48,7 @@ namespace pipedal { public: virtual void OnProcess(size_t nFrames) = 0; virtual void OnUnderrun() = 0; - virtual void OnAudioStopped() = 0; + virtual void OnAlsaDriverStopped() = 0; virtual void OnAudioTerminated() = 0; diff --git a/src/AudioHost.cpp b/src/AudioHost.cpp index 5c238aa..ded2b98 100644 --- a/src/AudioHost.cpp +++ b/src/AudioHost.cpp @@ -32,6 +32,7 @@ #include #include "PluginHost.hpp" #include "PatchPropertyWriter.hpp" +#include "CpuTemperatureMonitor.hpp" using namespace pipedal; @@ -182,7 +183,8 @@ namespace pipedal reader.read(&vProperty); if (!vProperty.is_null()) { - try { + try + { vProperty = pluginHost.MapPath(vProperty); // now to atom format (what we want on the rt thread0) @@ -193,7 +195,8 @@ namespace pipedal pathPatchProperty.atomBuffer.resize(atomValue->size + sizeof(LV2_Atom)); memcpy(pathPatchProperty.atomBuffer.data(), atomValue, pathPatchProperty.atomBuffer.size()); this->pathPatchProperties.push_back(std::move(pathPatchProperty)); - } catch (const std::exception &e) + } + catch (const std::exception &e) { Lv2Log::info(SS("IndexedSnapshotValue: Failed to map path property " << pathProperty.first << ". " << e.what())); } @@ -206,7 +209,7 @@ namespace pipedal void ApplyValues(IEffect *effect) { - effect->SetBypass(this->enabled); + effect->SetBypass(this->enabled); if (effect != pEffect) { throw std::runtime_error("Wrong effect"); @@ -387,6 +390,7 @@ private: std::mutex atomConverterMutex; AtomConverter atomConverter; + CpuTemperatureMonitor::ptr cpuTemperatureMonitor; static constexpr size_t DEFERRED_MIDI_BUFFER_SIZE = 1024; uint8_t deferredMidiMessages[DEFERRED_MIDI_BUFFER_SIZE]; @@ -905,7 +909,7 @@ private: bool onMidiEvent(Lv2EventBufferWriter &eventBufferWriter, Lv2EventBufferWriter::LV2_EvBuf_Iterator &iterator, MidiEvent &event) { - //eventBufferWriter.writeMidiEvent(iterator, 0, event.size, event.buffer); + // eventBufferWriter.writeMidiEvent(iterator, 0, event.size, event.buffer); this->realtimeActivePedalboard->OnMidiMessage(event.size, event.buffer, this, fnMidiValueChanged); if (listenForMidiEvent) @@ -1098,10 +1102,12 @@ private: { return this->active && (!this->audioStopped) && !this->isDummyAudioDriver; } - virtual void OnAudioStopped() override + virtual void OnAlsaDriverStopped() override { + this->audioStopped = true; Lv2Log::info("Audio stopped."); + this->realtimeWriter.AudioTerminatedAbnormally(); } virtual void OnAudioTerminated() override { @@ -1211,7 +1217,7 @@ private: } catch (const std::exception &e) { - Lv2Log::error("Fatal error while processing jack audio. (%s)", e.what()); + Lv2Log::error("Fatal error while processing realtime audio. (%s)", e.what()); throw; } } @@ -1231,6 +1237,8 @@ public: { realtimeAtomBuffer.resize(32 * 1024); lv2_atom_forge_init(&inputWriterForge, pHost->GetMapFeature().GetMap()); + + cpuTemperatureMonitor = CpuTemperatureMonitor::Get(); } virtual ~AudioHostImpl() { @@ -1252,12 +1260,14 @@ public: return this->sampleRate; } - void OnAudioComplete() + void HandleAudioTerminatedAbnormally() { - // there is actually no compelling circumstance in which this should ever happen. - Lv2Log::error("Audio processing terminated unexpectedly."); - realtimeWriter.AudioStopped(); + + if (pNotifyCallbacks) + { + pNotifyCallbacks->OnAlsaDriverTerminatedAbnormally(); + } } std::vector atomBuffer; std::vector realtimeAtomBuffer; @@ -1267,7 +1277,7 @@ public: { SetThreadName("rtsvc"); SetThreadPriority(SchedulerPriority::AudioService); - + int underrunMessagesGiven = 0; try { @@ -1452,7 +1462,7 @@ public: { LV2_URID propertyUrid = ((LV2_Atom_URID *)property)->body; this->pNotifyCallbacks->OnPatchSetReply(instanceId, propertyUrid, value); - //this->pNotifyCallbacks->OnNotifyMaybeLv2StateChanged(instanceId); + // this->pNotifyCallbacks->OnNotifyMaybeLv2StateChanged(instanceId); } } } @@ -1488,11 +1498,11 @@ public: hostReader.read(&buffer); OnPathPropertyReceived(buffer); } - else if (command == RingBufferCommand::AudioStopped) + else if (command == RingBufferCommand::AudioTerminatedAbnormally) { AudioStoppedBody body; hostReader.read(&body); - OnAudioComplete(); + HandleAudioTerminatedAbnormally(); return; } else if (command == RingBufferCommand:: @@ -1617,7 +1627,7 @@ public: if (jackServerSettings.IsDummyAudioDevice()) { this->isDummyAudioDriver = true; - this->audioDriver = std::unique_ptr(CreateDummyAudioDriver(this,jackServerSettings.GetAlsaInputDevice())); + this->audioDriver = std::unique_ptr(CreateDummyAudioDriver(this, jackServerSettings.GetAlsaInputDevice())); } else { @@ -1852,8 +1862,9 @@ public: VuUpdate v; v.instanceId_ = instanceId; // Display mono VUs if a stereo device is being fed identical L/R inputs. - v.isStereoInput_ = effect->GetNumberOfInputAudioPorts() != 1 && effect->GetAudioInputBuffer(0) != effect->GetAudioInputBuffer(1); - v.isStereoOutput_ = effect->GetNumberOfOutputAudioPorts() != 1; + v.isStereoInput_ = effect->GetNumberOfInputAudioBuffers() >= 2 + && effect->GetAudioInputBuffer(0) != effect->GetAudioInputBuffer(1); + v.isStereoOutput_ = effect->GetNumberOfOutputAudioBuffers() >= 2; vuConfig->vuUpdateWorkingData.push_back(v); vuConfig->vuUpdateResponseData.push_back(v); @@ -1923,7 +1934,7 @@ public: } private: - //virtual bool UpdatePluginStates(Pedalboard &pedalboard) override; + // virtual bool UpdatePluginStates(Pedalboard &pedalboard) override; virtual bool UpdatePluginState(PedalboardItem &pedalboardItem) override; class RestartThread @@ -2032,21 +2043,6 @@ public: this->hostWriter.ParameterRequest(pParameterRequest); } - static int32_t GetRaspberryPiTemperature() - { - try - { - std::ifstream f("/sys/class/thermal/thermal_zone0/temp"); - int32_t temp; - f >> temp; - return temp; - } - catch (std::exception &) - { - return -1000000; - } - } - virtual JackHostStatus getJackStatus() { CleanRestartThreads(false); @@ -2062,7 +2058,7 @@ public: result.msSinceLastUnderrun_ = (uint64_t)dt; - result.temperaturemC_ = GetRaspberryPiTemperature(); + result.temperaturemC_ = (int32_t)(std::round(cpuTemperatureMonitor->GetTemperatureC() * 1000)); result.active_ = IsAudioRunning(); result.restarting_ = this->restarting; @@ -2071,12 +2067,14 @@ public: { result.cpuUsage_ = audioDriver->CpuUse(); } - GetCpuFrequency(&result.cpuFreqMax_, &result.cpuFreqMin_); + GetCpuFrequency(&result.cpuFreqMin_, &result.cpuFreqMax_); result.hasCpuGovernor_ = HasCpuGovernor(); if (result.hasCpuGovernor_) { result.governor_ = GetGovernor(); - } else { + } + else + { result.governor_ = ""; } @@ -2121,7 +2119,7 @@ void AudioHostImpl::SetSystemMidiBindings(const std::vector &bindin else if (i->symbol() == "prevBank") { this->prevBankMidiBinding.SetBinding(*i); - } + } else if (i->symbol() == "nextProgram") { this->nextPresetMidiBinding.SetBinding(*i); diff --git a/src/AudioHost.hpp b/src/AudioHost.hpp index cbaf7d2..9942042 100644 --- a/src/AudioHost.hpp +++ b/src/AudioHost.hpp @@ -170,6 +170,8 @@ namespace pipedal virtual void OnNotifyLv2RealtimeError(int64_t instanceId, const std::string &error) = 0; virtual void OnNotifyMidiRealtimeEvent(RealtimeMidiEventType eventType) = 0; virtual void OnNotifyMidiRealtimeSnapshotRequest(int32_t snapshotIndex,int64_t snapshotRequestId) = 0; + + virtual void OnAlsaDriverTerminatedAbnormally() = 0; }; class JackHostStatus diff --git a/src/AvahiService.cpp b/src/AvahiService.cpp index ca7c6fd..a3feb36 100644 --- a/src/AvahiService.cpp +++ b/src/AvahiService.cpp @@ -181,6 +181,7 @@ void AvahiService::EntryGroupCallback(AvahiEntryGroup *g, AvahiEntryGroupState s char *n = avahi_alternative_service_name(avahiNameString); avahi_free(avahiNameString); avahiNameString = n; + this->serviceName = n; Lv2Log::warning(SS("Service name collision, renaming service to '" << avahiNameString << "'\n")); /* And recreate the services */ create_group(avahi_entry_group_get_client(g)); @@ -253,7 +254,7 @@ void AvahiService::create_group(AvahiClient *c) * because it was reset previously, add our entries. */ if (this->makeAnnouncement && avahi_entry_group_is_empty(group)) { - Lv2Log::debug(SS("Adding service '" << avahiNameString << "'")); + Lv2Log::debug(SS("Adding service '" << serviceName << "'")); std::string instanceTxtRecord = SS("id=" << this->instanceId); diff --git a/src/Base64.hpp b/src/Base64.hpp index c356861..e546fd6 100644 --- a/src/Base64.hpp +++ b/src/Base64.hpp @@ -41,7 +41,7 @@ namespace macaron public: static std::string Encode(const std::vector &data) { - return Encode(data.size(),&(data[0])); + return Encode(data.size(),data.data()); } static std::string Encode(size_t size, const uint8_t *data) { @@ -55,13 +55,14 @@ namespace macaron 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'}; + size_t in_len = size; size_t out_len = 4 * ((in_len + 2) / 3); std::string ret(out_len, '\0'); - size_t i; + size_t i = 0; char *p = const_cast(ret.c_str()); - for (i = 0; i < in_len - 2; i += 3) + for (i = 0; i+2 < in_len; i += 3) { *p++ = sEncodingTable[(data[i] >> 2) & 0x3F]; *p++ = sEncodingTable[((data[i] & 0x3) << 4) | ((int)(data[i + 1] & 0xF0) >> 4)]; @@ -111,6 +112,9 @@ namespace macaron if (in_len % 4 != 0) throw std::invalid_argument("Input data size is not a multiple of 4"); + if (in_len < 4) { + return std::vector(); + } size_t out_len = in_len / 4 * 3; if (input[in_len - 1] == '=') out_len--; diff --git a/src/BootConfig.cpp b/src/BootConfig.cpp new file mode 100644 index 0000000..ba7adc2 --- /dev/null +++ b/src/BootConfig.cpp @@ -0,0 +1,465 @@ +// Copyright (c) 2024 Robin E. R. Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +#include "BootConfig.hpp" +#include +#include +#include "ss.hpp" +#include +#include "SysExec.hpp" +#include "util.hpp" +#include +#include "SystemConfigFile.hpp" + +namespace fs = std::filesystem; + +#include +#include +#include +#include +#include +#include + +using namespace pipedal; + +static bool IsGrubBootLoader() +{ + const std::vector grub_config_paths = { + "/boot/grub/grub.cfg", + "/boot/grub2/grub.cfg", + }; + + for (const auto &path : grub_config_paths) + { + if (std::filesystem::exists(path)) + { + return true; + } + } + return false; +} + +static std::set KNOWN_KERNEL_TYPES = { + "PREEMPT_NONE", + "PREEMPT_VOLUNTARY", + "PREEMPT", + "PREEMPT_RT", + "PREEMPT_DYNAMIC"}; + +std::string GetKernelType() +{ + auto result = sysExecForOutput("uname", "-a"); + if (result.exitCode != EXIT_SUCCESS) + { + throw std::runtime_error("Unable to execute 'uname -a'"); + } + std::vector items = split(result.output, ' '); + for (std::string &item : items) + { + if (KNOWN_KERNEL_TYPES.contains(item)) + { + return item; + } + } + return "Unknown"; +} + +std::string ReadFileLine(const fs::path &path) +{ + if (!fs::exists(path)) + { + throw std::runtime_error(SS("File does not exist: " << path)); + } + + std::ifstream f(path); + if (!f.is_open()) + { + throw std::runtime_error(SS("Can't read file " << path)); + } + std::string line; + + std::getline(f, line); + return line; +} +std::vector ReadFileArgs(const fs::path &path) +{ + std::string line = ReadFileLine(path); + + return split(line, ' '); +} + +using namespace pipedal; +BootConfig::BootConfig() +{ + if (fs::exists("/boot/firmware/cmdline.txt")) + { + this->bootLoader = BootLoaderT::UBoot; + } + else if (IsGrubBootLoader()) + { + this->bootLoader = BootLoaderT::Grub; + } + else + { + this->bootLoader = BootLoaderT::Unknown; + } + + this->kernelType = GetKernelType(); + + if (this->kernelType == "PREEMPT_DYNAMIC") + { + this->dynamicScheduler = DynamicSchedulerT::Voluntary; // the default. + } + + std::string cmdLine = ReadFileLine("/proc/cmdline"); + std::vector cmdLineArgs = split(cmdLine, ' '); + + for (const auto &arg : cmdLineArgs) + { + if (arg == "preempt=full") + { + this->dynamicScheduler = DynamicSchedulerT::Full; + } + else if (arg == "preempt=voluntary") + { + this->dynamicScheduler = DynamicSchedulerT::Voluntary; + } + else if (arg == "preempt=none") + { + this->dynamicScheduler = DynamicSchedulerT::None; + } + else if (arg.starts_with("preempt=")) + { + this->dynamicScheduler = DynamicSchedulerT::Unknown; + } + else if (arg == "threadirqs") + { + this->threadedIrqs = true; + } + } + this->canSetThreadIrqs = this->kernelType == "PREEMPT" || this->kernelType == "PREEMPT_DYNAMIC"; +} + +BootConfig::~BootConfig() +{ + this->thread = nullptr; // join and clean up the tread before deleting ANYTHING else. +} +bool BootConfig::operator==(BootConfig &other) const +{ + return this->bootLoader == other.bootLoader && this->kernelType == other.kernelType && this->preemptMode == other.preemptMode && this->threadedIrqs == other.threadedIrqs; +} + +bool BootConfig::CanWriteConfig() +{ + if (!CanSetThreadIrqs() && dynamicScheduler == DynamicSchedulerT::NotApplicable) + { + return true; + } + return (this->bootLoader != BootLoaderT::Unknown); +} + +void BootConfig::WriteConfiguration(std::function onComplete) +{ + this->thread = nullptr; // wait for any previous operations to complete. + if (!changed) + { + if (onComplete) + onComplete(true, ""); + } + else + { + changed = false; + + if (this->bootLoader == BootLoaderT::UBoot) + { + try + { + WriteUBootConfiguration(onComplete); + } + catch (const std::exception &e) + { + if (onComplete) + onComplete(false, e.what()); + } + } + else if (this->bootLoader == BootLoaderT::Grub) + { + WriteGrubConfiguration(onComplete); + } + else + { + if (onComplete) + onComplete(false, "Unsupported bootloader."); + } + } +} + +static std::string commandLineOption(BootConfig::DynamicSchedulerT dynamicScheduler) +{ + switch (dynamicScheduler) + { + case BootConfig::DynamicSchedulerT::None: + return "preempt=none"; + case BootConfig::DynamicSchedulerT::Voluntary: + return "preempt=voluntary"; + case BootConfig::DynamicSchedulerT::Full: + return "preempt=full"; + default: + throw std::range_error("Invalid value."); + } +} +void BootConfig::WriteUBootConfiguration(std::function onComplete) +{ + this->thread = nullptr; // blocks if already running. + + this->thread = std::make_unique( + [this, onComplete]() + { + try + { + + fs::path cmdlineFile = "/boot/firmware/cmdline.txt"; + + fs::path backupFile = "/boot/firmware/cmdline.txt.bak"; + if (!fs::exists(backupFile)) + { + try { + fs::copy_file(cmdlineFile,backupFile); + } catch(...) + { + + } + } + std::string line = ReadFileLine(cmdlineFile); + + std::string newLine = SetCmdlineArgs(line); + + { + std::ofstream f(cmdlineFile); + if (!f.is_open()) + { + throw std::runtime_error(SS("Can't write to " << cmdlineFile)); + } + f << newLine << '\n'; // trailing \n is REQUIRED + } + + if (onComplete) + { + onComplete(true, ""); + } + } + catch (const std::exception &e) + { + if (onComplete) + { + onComplete(false, e.what()); + } + } + }); +} + +static std::string QuoteGrubArgument(const std::string &value) { + std::ostringstream ss; + ss << '\"'; + for (char c : value) { + if (c == '\\' || c == '\"') + { + ss << '\\' << c; + } else { + ss << c; + } + } + ss << '\"'; + return ss.str(); +} +static std::string UnquoteGrubArgument(const std::string &value) { + if (value.length() == 0) return value; + std::istringstream ss(value); + if (ss.peek() == '\"') + { + // c-like; \ is escape character. + if (ss.peek() != '\"') + { + throw std::runtime_error("Invalid string in GRUB configuration file."); + } + ss.get(); + std::ostringstream result; + while (ss.peek() != '\"' && ss.peek() != -1) + { + int c = ss.get(); + if (c == -1 || c == '\n') { + throw std::runtime_error("Invalid string in GRUB configuration file."); + } + if (c == '\\') + { + int c2 = ss.get(); + if (c2 == '\n' || c2 == -1) { + throw std::runtime_error("Invalid string in GRUB configuration file."); + } + result << (char)c2; + } else { + result << (char)c; + } + } + return result.str(); + } else if (ss.peek() == '\'') + { + ss.get(); + std::ostringstream result; + while (true) + { + int c = ss.get(); + if (c == -1 || c == '\n') { + throw std::runtime_error("Invalid string in GRUB configuration file."); + } + if (c == '\'') + { + break; + } + result << (char)c; + } + return result.str(); + } else { + throw std::runtime_error("Invalid string in GRUB configuration file."); + } + +} + +std::string BootConfig::SetCmdlineArgs(const std::string &cmdLine) +{ + std::vector bootArgs = split(cmdLine,' '); + std::vector newBootArgs; + for (const auto &value : bootArgs) + { + if (value != "threadirqs" && !value.starts_with("preempt=")) + { + newBootArgs.push_back(value); + } + } + if (this->canSetThreadIrqs && this->threadedIrqs) + { + newBootArgs.push_back("threadirqs"); + } + if (this->dynamicScheduler != DynamicSchedulerT::NotApplicable) + { + newBootArgs.push_back(commandLineOption(this->dynamicScheduler)); + } + std::stringstream ss; + bool firstArg = true; + for (const std::string &arg : newBootArgs) + { + if (!firstArg) + { + ss << ' '; + } + firstArg = false; + ss << arg; + } + return ss.str(); +} + +void BootConfig::WriteGrubConfiguration(std::function onComplete) +{ + this->thread = nullptr; // blocks if already running. + + this->thread = std::make_unique( + [this, onComplete]() + { + try + { + ////////// rewrite /etc/default/grub //////////// + fs::path configPath = "/etc/default/grub"; + fs::path backupPath = "/etc/default/grub.bak"; + if (!fs::exists(backupPath)) + { + try { + fs::copy_file(configPath,backupPath); + } catch(...) + { + + } + } + SystemConfigFile grubFile(configPath); + + std::string linePrefix = "GRUB_CMDLINE_LINUX_DEFAULT="; + auto line = grubFile.GetLineNumberStartingWith(linePrefix); + if (line < 0) + { + throw std::runtime_error(SS("Unexpected file format: " << configPath)); + } + std::string cmdlineDefault = grubFile.Get(line); + + std::string cmdlineArgs = UnquoteGrubArgument(cmdlineDefault.substr(linePrefix.length())); + + std::string newArgs = SetCmdlineArgs(cmdlineArgs); + + std::string newLine = linePrefix + QuoteGrubArgument(newArgs); + + grubFile.Set(line,newLine); + + grubFile.Save(configPath); + + /////// regenerate actual GRUB boot files ///////////// + + auto result = sysExecForOutput("update-grub",""); + if (result.exitCode != EXIT_SUCCESS) + { + throw std::runtime_error(SS("update-grub failed. (" << result.output.substr(0,std::min((size_t)60,result.output.length())) << ")")); + } + //// signal completion ////// + + if (onComplete) + { + onComplete(true,""); + } + } + catch (const std::exception &e) + { + if (onComplete) + { + onComplete(false, e.what()); + } + } + }); +} + +void BootConfig::DynamicScheduler(DynamicSchedulerT value) +{ + if (value != this->dynamicScheduler) + { + if (this->dynamicScheduler == DynamicSchedulerT::NotApplicable) + { + throw std::runtime_error("Illegal operation."); + } + this->dynamicScheduler = value; + this->changed = true; + } +} +void BootConfig::ThreadedIrqs(bool value) +{ + if (value != threadedIrqs) + { + if (!CanSetThreadIrqs()) + { + throw std::runtime_error("Illegal operation."); + } + this->threadedIrqs = value; + this->changed = true; + } +} diff --git a/src/BootConfig.hpp b/src/BootConfig.hpp new file mode 100644 index 0000000..5e40329 --- /dev/null +++ b/src/BootConfig.hpp @@ -0,0 +1,84 @@ +// Copyright (c) 2024 Robin E. R. Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +#pragma once + +#include +#include +#include +#include + +namespace pipedal { + class BootConfig { + public: + BootConfig(); + ~BootConfig(); + + enum class BootLoaderT { + UBoot, + Grub, + Unknown + }; + + enum class DynamicSchedulerT { + None = 0, + Voluntary = 1, + Full = 2, + + NotApplicable = -1, + Unknown = -2, + + }; + + // BEWARE: The onComplete function gets called from off the main thread on machines with GRUB bootloaders! + void WriteConfiguration(std::function onComplete); + BootLoaderT BootLoader() const { return bootLoader; } + const std::string&KernelType() const { return kernelType; } + + bool CanSetThreadIrqs() const { return canSetThreadIrqs; } + bool ThreadedIrqs() const { return threadedIrqs; } + void ThreadedIrqs(bool value); + + const DynamicSchedulerT DynamicScheduler() const { return dynamicScheduler; } + void DynamicScheduler(DynamicSchedulerT value); + + + bool CanWriteConfig(); + + bool Changed() const { return changed; } + + bool operator==(BootConfig&other) const; + private: + std::unique_ptr thread; + std::string SetCmdlineArgs(const std::string &args); + + void WriteUBootConfiguration(std::function onComplete); + void WriteGrubConfiguration(std::function onComplete); + + bool changed = false; + BootLoaderT bootLoader = BootLoaderT::Unknown; + std::string kernelType; + std::string preemptMode; + DynamicSchedulerT dynamicScheduler = DynamicSchedulerT::NotApplicable; + bool canSetThreadIrqs = false; + bool threadedIrqs = false; + + }; +}; \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 36fc86f..c5979e2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,15 +7,49 @@ set (USE_PCH 1) set (ENABLE_BACKTRACE 1) -set (USE_SANITIZE true) +set (USE_SANITIZE OFF) # seems to be broken on Ubuntu 24.10 set(CXX_STANDARD 20) + +include(FetchContent) + +# FOR FTXUI +if(CMAKE_VERSION VERSION_GREATER 3.30) + cmake_policy(SET CMP0169 OLD) # Allow use of old FETCHCONTENT macros. +endif() + +# Our FTXUI option takes precedence over the one in the ftxui CMakeLists.txt +# because FTXUI uses cmake_minimum_required(VERSION 3.12) +set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) + +set(FETCHCONTENT_QUIET ON) +set(FTXUI_QUIET ON) + +FetchContent_Declare(ftxui + GIT_REPOSITORY https://github.com/ArthurSonzogni/ftxui + GIT_TAG v5.0.0 +) + +FetchContent_GetProperties(ftxui) +if(NOT ftxui_POPULATED) + FetchContent_Populate(ftxui) + add_subdirectory(${ftxui_SOURCE_DIR} ${ftxui_BINARY_DIR} EXCLUDE_FROM_ALL) +endif() + +message(STATUS "*** ${ftxui_SOURCE_DIR} ${ftxui_BINARY_DIR}") + + + include(FindPkgConfig) find_package(sdbus-c++ REQUIRED) +find_package(ICU REQUIRED COMPONENTS uc i18n ) +message(STATUS "ICU_LIBRARIES: ${ICU_LIBRARIES}") + + if(DEFINED ENV{GITHUB_ACTIONS}) message(STATUS "Building in GitHub Actions environment") set(GITHUB_ACTIONS TRUE) @@ -115,16 +149,16 @@ add_compile_definitions(DEBIAN_ARCHITECTURE="${DEBIAN_ARCHITECTURE}") if (CMAKE_BUILD_TYPE MATCHES Debug) message(STATUS "Debug build") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -DDEBUG -D_GLIBCXX_DEBUG" ) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -DDEBUG -D_GLIBCXX_DEBUG" ) if (USE_SANITIZE) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -static-libasan " ) endif() elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo) message(STATUS "RelWithgDebInfo build") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG" ) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -DNDEBUG" ) else() message(STATUS "Release build") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG" ) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG" ) endif() if (ENABLE_BACKTRACE) @@ -158,8 +192,10 @@ else() endif() set (PIPEDAL_SOURCES + CpuTemperatureMonitor.cpp CpuTemperatureMonitor.hpp SchedulerPriority.hpp SchedulerPriority.cpp ModFileTypes.cpp ModFileTypes.hpp + MimeTypes.cpp MimeTypes.hpp PatchPropertyWriter.hpp PresetBundle.cpp PresetBundle.hpp RealtimeMidiEventType.hpp @@ -178,9 +214,8 @@ set (PIPEDAL_SOURCES FilePropertyDirectoryTree.cpp FilePropertyDirectoryTree.hpp FileEntry.cpp FileEntry.hpp atom_object.hpp atom_object.cpp - FileBrowserFiles.h + lv2ext/pipedal.lv2/ext/fileBrowser.h FileBrowserFilesFeature.hpp FileBrowserFilesFeature.cpp - MimeTypes.cpp MimeTypes.hpp inverting_mutex.hpp DbDezipper.hpp DbDezipper.cpp WebServerLog.hpp @@ -272,16 +307,15 @@ set (PIPEDAL_INCLUDES . ) + set(PIPEDAL_LIBS libpipedald zip PiPedalCommon - icui18n - icuuc - icudata pthread atomic stdc++fs asound avahi-common avahi-client systemd ${VST3_LIBRARIES} ${LILV_0_LIBRARIES} # ${JACK_LIBRARIES} - pending delete for JACK support. - ) + + ) @@ -299,6 +333,24 @@ if(${USE_PCH}) endif() +################################# + +add_executable(pipedal_kconfig + kconfigMain.cpp + BootConfig.cpp BootConfig.hpp + SystemConfigFile.hpp SystemConfigFile.cpp + + +) + +target_link_libraries(pipedal_kconfig + PRIVATE ftxui::screen + PRIVATE ftxui::dom + PRIVATE ftxui::component # Not needed for this example. + PRIVATE PiPedalCommon + systemd +) + ################################# add_executable(pipedald asan_options.cpp # disable leak checking for sanitize=address. @@ -325,9 +377,10 @@ set_target_properties(hotspotManagerTest PROPERTIES EXCLUDE_FROM_ALL true) -add_executable(pipedaltest testMain.cpp +add_executable(pipedaltest +testMain.cpp - InvertingMutexTest.cpp + ModFileTypesTest.cpp jsonTest.cpp UpdaterTest.cpp @@ -339,6 +392,8 @@ add_executable(pipedaltest testMain.cpp PiPedalAlsaTest.cpp UnixSocketTest.cpp + LocaleTest.cpp + Lv2HostLeakTest.cpp @@ -348,7 +403,7 @@ add_executable(pipedaltest testMain.cpp MemDebug.cpp MemDebug.hpp ) -target_link_libraries(pipedaltest PRIVATE ${PIPEDAL_LIBS}) +target_link_libraries(pipedaltest PRIVATE ${PIPEDAL_LIBS} ${ICU_LIBRARIES}) target_include_directories(pipedaltest PRIVATE ${PIPEDAL_INCLUDES} ) @@ -642,7 +697,9 @@ add_executable(pipedalconfig ConfigMain.cpp alsaCheck.cpp alsaCheck.hpp + BootConfig.cpp BootConfig.hpp ModFileTypes.cpp ModFileTypes.hpp + MimeTypes.cpp MimeTypes.hpp PiPedalConfiguration.hpp PiPedalConfiguration.cpp JackServerSettings.hpp JackServerSettings.cpp SystemConfigFile.hpp SystemConfigFile.cpp @@ -653,9 +710,6 @@ add_executable(pipedalconfig ) target_link_libraries(pipedalconfig PRIVATE PiPedalCommon pthread atomic uuid stdc++fs asound - icui18n - icuuc - icudata ) @@ -774,7 +828,7 @@ add_custom_target ( ) -install (TARGETS pipedalconfig pipedal_latency_test DESTINATION ${CMAKE_INSTALL_PREFIX}/bin +install (TARGETS pipedalconfig pipedal_kconfig pipedal_latency_test DESTINATION ${CMAKE_INSTALL_PREFIX}/bin EXPORT pipedalTargets) install (TARGETS pipedald pipedaladmind pipedal_update DESTINATION ${CMAKE_INSTALL_PREFIX}/sbin diff --git a/src/ConfigMain.cpp b/src/ConfigMain.cpp index de5b78a..0c6c42a 100644 --- a/src/ConfigMain.cpp +++ b/src/ConfigMain.cpp @@ -27,6 +27,8 @@ #include "alsaCheck.hpp" #include "RegDb.hpp" #include "Locale.hpp" +#include "Finally.hpp" +#include "BootConfig.hpp" #include #include @@ -560,38 +562,6 @@ void InstallAudioService() #endif } -int SudoExec(int argc, char **argv) -{ - // re-execute with SUDO in order to prompt for SUDO credentials once only. - std::vector args; - std::string pkexec = "/usr/bin/sudo"; // staged because "ISO C++ forbids converting a string constant to std::vector::value_type"(!) - args.push_back((char *)(pkexec.c_str())); - - std::string sPath = getSelfExePath(); - args.push_back(const_cast(sPath.c_str())); - for (int arg = 1; arg < argc; ++arg) - { - args.push_back(const_cast(argv[arg])); - } - - args.push_back(nullptr); - - char **newArgs = &args[0]; - - int pbPid; - int returnValue = 0; - - if ((pbPid = fork()) == 0) - { - return execv(newArgs[0], newArgs); - } - else - { - waitpid(pbPid, &returnValue, 0); - int exitStatus = WEXITSTATUS(returnValue); - return exitStatus; - } -} static bool IsP2pServiceEnabled() { @@ -953,6 +923,132 @@ void InstallPgpKey() sysExec(cmd.c_str()); } } + + +static uint32_t autoSelectPorts[] = { + 80, + 81, // unofficial alternate + 8080, // unofficial alternate + 8081, // unofficial alternate + 8008, // unofficial alternate + 83 // Not official at all. + }; + + + +static bool isPortInUse(int port) { + int sockfd = socket(AF_INET, SOCK_STREAM, 0); + if (sockfd < 0) { + throw std::runtime_error(SS("Socket creation failed: " << strerror(errno))); + } + Finally ff{[sockfd]() { + close(sockfd); + }}; + struct sockaddr_in addr; + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = INADDR_ANY; + addr.sin_port = htons(port); + + // Try to bind to the port + int result = bind(sockfd, (struct sockaddr*)&addr, sizeof(addr)); + + if (result < 0) { + if (errno == EADDRINUSE) { + return true; // Port is in use + } else { + cout << "Warning: Unexpected error binding socket to port " << port << ": " << strerror(errno) << endl; + return true; + } + } + + return false; // Port is free +} + + +static std::string AutoSelectPort() { + constexpr size_t MAX_PORT = sizeof(autoSelectPorts)/sizeof(autoSelectPorts[0]); + + int32_t port = -1; + for (size_t i = 0; i < MAX_PORT; ++i) + { + if (!isPortInUse(autoSelectPorts[i])) + { + port = autoSelectPorts[i]; + break; + } + } + if (port == -1) { + cout << "Warning: Can't find an available HTTP port. Setting to port 80 anyway." << endl; + port = 80; + } else if (port != 80) + { + cout << "Warning: Port 80 is already in use. Using port " << port << " instead." << endl; + } + + return SS(port); + +} + + +bool SetWebServerPort(std::string portOption) +{ + + try { + auto nPos = portOption.find_last_of(':'); + std::string strPort; + if (nPos != std::string::npos) + { + strPort = portOption.substr(nPos+1); + } else { + strPort = portOption; + } + std::istringstream ss(strPort); + + uint16_t iPort = 0; + ss >> iPort; + if (!ss) + { + throw std::runtime_error(SS("Invalid port number: " << strPort)); + } + + StopService(false); + + PrepareServiceConfigurationFile(iPort); + + StartService(true); + + cout << "PiPedal web server is listening on port " << iPort << endl; + } catch (const std::exception&e) + { + cout << "Error: " << e.what() << endl; + return false; + } + return true; +} + +void CheckPreemptDynamicConfig() +{ + try { + BootConfig bootConfig; + + if (bootConfig.KernelType() == "PREEMPT_DYNAMIC") + { + if (bootConfig.DynamicScheduler() != BootConfig::DynamicSchedulerT::Full) + { + cout << endl; + cout << "Warning: PREEMPT_DYNAMIC kernel has not been configured for 'preempt=full'" << endl; + cout << "Run pipedal_kconfig to configure the kernel for real-time audio." << endl; + cout << endl; + } + } + + } catch(const std::exception& /* ignore */) + { + } +} + + void Install(const fs::path &programPrefix, const std::string endpointAddress) { cout << "Configuring pipedal" << endl; @@ -1000,14 +1096,14 @@ void Install(const fs::path &programPrefix, const std::string endpointAddress) { throw std::runtime_error("Invalid endpoint address: " + endpointAddress); } - uint16_t port; + uint16_t port = 80; auto strPort = endpointAddress.substr(endpos + 1); try { auto lport = std::stoul(strPort); if (lport == 0 || lport >= std::numeric_limits::max()) { - throw std::runtime_error("out of range."); + throw std::runtime_error("Port number is too large."); } port = (uint16_t)lport; std::stringstream s; @@ -1020,6 +1116,7 @@ void Install(const fs::path &programPrefix, const std::string endpointAddress) s << "Invalid port number: " << strPort; throw std::runtime_error(s.str()); } + PrepareServiceConfigurationFile(port); bool authBindRequired = port < 512; @@ -1183,14 +1280,25 @@ void Install(const fs::path &programPrefix, const std::string endpointAddress) // Restart Wi-Fi Direct if neccessary. OnWifiReinstall(); + + CheckPreemptDynamicConfig(); } catch (const std::exception &e) { // don't allow abnormal termination, which leaves the package in a state that's // difficult to uninstall. - cout << "Error: " << e.what(); + cout << "Error: " << e.what() << endl; cout << " Run 'pipedalconfig --install' again to complete setup of PiPedal." << endl; } + const std::string ADDR_ANY = "0.0.0.0:"; + + if (endpointAddress.starts_with(ADDR_ANY)) + { + cout << "PiPedal web server is listening on port " << endpointAddress.substr(ADDR_ANY.length()) << endl; + } else { + cout << "PiPedal web server is listening on port " << endpointAddress << endl; + } + } static std::string GetCurrentWebServicePort() @@ -1199,7 +1307,7 @@ static std::string GetCurrentWebServicePort() config.Load("/etc/pipedal/config", ""); std::ostringstream ss; - ss << config.GetSocketServerPort(); + ss << config.GetSocketServerAddress() << ":" << config.GetSocketServerPort(); return ss.str(); } @@ -1208,7 +1316,7 @@ static void PrintHelp() PrettyPrinter pp; pp << "pipedalconfig - Command-line post-install configuration for PiPedal" << "\n" - << "Copyright (c) 2022-2024 Robin Davies." + << "Copyright (c) 2022-2024 Robin E. R. Davies." << "\n" << "\n" << "See https://rerdavies.github.io/pipedal/Documentation.html for " @@ -1239,6 +1347,10 @@ static void PrintHelp() << "The --port option controls which TCP/IP port the web server uses." << "\n\n" + << HangingIndent() << " --port \t" + << "Set the TCP/IP port that the web server will use." + << "\n" + << HangingIndent() << " --uninstall\t" << "Remove installed services." << "\n" @@ -1401,6 +1513,29 @@ void ListValidCountryCodes() } } +static std::string ProcessPortOption(std::string portOption) +{ + if (portOption == "" || portOption == "0") // allow testing of port autodetect. + { + std::string t = GetCurrentWebServicePort(); + if (portOption != "0") {// allows easy debugging of port AutoSelectPort. + portOption = t; + } else { + portOption = ""; + } + if (portOption == "") + { + portOption = AutoSelectPort(); + } + } + std::string ADDR_ANY = "0.0.0.0:"; + + if (portOption.find(':') == string::npos) + { + portOption = ADDR_ANY + portOption; + } + return portOption; +} int main(int argc, char **argv) { @@ -1457,6 +1592,10 @@ int main(int argc, char **argv) uninstall + stop + start + enable + disable + enable_hotspot + disable_hotspot + restart + enable_p2p + disable_p2p + list_p2p_channels + fix_permissions + list_wifi_country_codes; + if (actionCount == 0 && portOption.length() != 0) + { + ++actionCount; + } if (actionCount > 1) { throw std::runtime_error("Please provide only one action."); @@ -1553,12 +1692,6 @@ int main(int argc, char **argv) { return ListP2PChannels(parser.Arguments()); } - if (portOption.size() != 0 && !install) - { - cout << "Error: -port option can only be specified with the -install option." - << "\n"; - exit(EXIT_FAILURE); - } auto uid = getuid(); if (uid != 0 && !nosudo) @@ -1568,6 +1701,12 @@ int main(int argc, char **argv) try { + if (portOption.length() != 0 && !install) + { + portOption = ProcessPortOption(portOption); + SetWebServerPort(portOption); + return EXIT_SUCCESS; + } if (fix_permissions) { FixPermissions(); @@ -1595,20 +1734,11 @@ int main(int argc, char **argv) } } - if (portOption == "") - { - portOption = GetCurrentWebServicePort(); - if (portOption == "") - { - portOption = "80"; - } - } - if (portOption.find(':') == string::npos) - { - portOption = "0.0.0.0:" + portOption; - } + portOption = ProcessPortOption(portOption); + Install(prefix, portOption); FileSystemSync(); + } catch (const std::exception &e) { diff --git a/src/CpuTemperatureMonitor.cpp b/src/CpuTemperatureMonitor.cpp new file mode 100644 index 0000000..6b9f8e9 --- /dev/null +++ b/src/CpuTemperatureMonitor.cpp @@ -0,0 +1,118 @@ +// Copyright (c) 2022 Robin Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +#include "CpuTemperatureMonitor.hpp" + +#include +#include +#include +#include +#include +#include +#include + +namespace fs = std::filesystem; +using namespace pipedal; + + + +static constexpr std::string_view THERMAL_PATH = "/sys/class/thermal/"; + + +static std::optional readFile(const fs::path& path) { + std::ifstream file(path); + if (!file) { + return std::nullopt; + } + + std::string content; + std::getline(file, content); + return content; +} + + +static bool isCpuThermal(const fs::path &zone_path) { + auto type = readFile(zone_path / "type"); + return type && (*type == "cpu-thermal") || (*type == "x86_pkg_temp"); +} + + + + +class CpuTemperatureMonitorImpl: public CpuTemperatureMonitor { +private: + std::vector cpuZones; +public: + explicit CpuTemperatureMonitorImpl(std::vector&&cpuZones) + : cpuZones(std::move(cpuZones)) { + } + + + virtual float GetTemperatureC() override { + float result = INVALID_TEMPERATURE*1000; + + for (const auto&cpuZone: cpuZones) + { + + std::ifstream file(cpuZone / "temp"); + if (file) { + float v; + file >> v; + if (file) + { + if (v > result) + { + result = v; + } + } + } + } + return result/1000; + } +}; + +static std::vector findCpuThermalZones() { + std::vector cpu_zones; + std::error_code ec; + + for (const auto& entry : fs::directory_iterator(THERMAL_PATH, ec)) { + if (ec) { + std::cerr << "Error reading directory: " << ec.message() << '\n'; + continue; + } + + const auto& path = entry.path(); + if (path.filename().string().find("thermal_zone") == 0) { + if (isCpuThermal(path)) { + cpu_zones.push_back(path); + } + } + } + return cpu_zones; +} + + +CpuTemperatureMonitor::ptr CpuTemperatureMonitor::Get() +{ + + std::vector cpuZones = findCpuThermalZones(); + + return std::make_unique(std::move(cpuZones)); +} diff --git a/react/src/XxxSnippet.tsx b/src/CpuTemperatureMonitor.hpp similarity index 58% rename from react/src/XxxSnippet.tsx rename to src/CpuTemperatureMonitor.hpp index 1e6b4ea..ec0f869 100644 --- a/react/src/XxxSnippet.tsx +++ b/src/CpuTemperatureMonitor.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Robin Davies +// Copyright (c) 2024 Robin Davies // // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in @@ -16,45 +16,28 @@ // COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -import React from 'react'; -import { Theme } from '@mui/material/styles'; +#pragma once -import { WithStyles } from '@mui/styles'; -import withStyles from '@mui/styles/withStyles'; -import createStyles from '@mui/styles/createStyles'; +#include +#include +#include +namespace pipedal { -const styles = (theme: Theme) => createStyles({ -}); + class CpuTemperatureMonitor { + protected: + CpuTemperatureMonitor() { } + public: + virtual ~CpuTemperatureMonitor() {}; + static constexpr float INVALID_TEMPERATURE = -400; + using ptr = std::unique_ptr; -interface XxxProps extends WithStyles { - theme: Theme, -} + static ptr Get(); // may return empty pointer. -interface XxxState { - -} - -const Xxx = withStyles(styles, { withTheme: true })( - - class extends React.Component { - constructor(props: XxxProps) - { - super(props); - this.state = { - - }; - } - - render() { - return ( -
- ); - } - } -); - -export default Xxx; + // degrees Celcius * 1000; + virtual float GetTemperatureC() = 0; + + }; +} \ No newline at end of file diff --git a/src/FileBrowserFiles.h b/src/FileBrowserFiles.h deleted file mode 100644 index 50687d4..0000000 --- a/src/FileBrowserFiles.h +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (c) 2023 Robin E. R. Davies - * All rights reserved. - - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#ifndef FILEBROWSERFILES_H -#define FILEBROWSERFILES_H - -#define LV2_FILEBROWSER_URI "http://two-play.com/ns/ext/fileBrowser" -#define LV2_FILEBROWSER_PREFIX LV2_FILEBROWSER_URI "#" -#define LV2_FILEBROWSER__files LV2_FILEBROWSER_PREFIX "files" ///< http://two-play.com/ns/ext/fileBrowser#files > - -/** - @defgroup filedialog LV2_FileBrowser_Files - @ingroup lv2 - - A feature for LV2 plugins to provide sample files (or other selectable files) within the plugin's resource bundle to host file selection dialogs. - - Browser directories may contain actual files that typically have been uploaded by users; but may also contain symlinks to files - in other locations. This feature allows plugins to publish files within the plugin's resource bundle to browser directories. For - each published file consists of a symlink in the browser directory that links to a corresponding file in the plugins resource bundle. - - The LV2_FileBrowser_Files.publish_resource_files() method allows plugins to publish entire directories. publish_resource_files() - implements a versioning system, which tracks whether sample files have been deleted by the user. If the symlink for sample files that were installed - by a previous version of the plugin have been deleted, the sample files from the current version are not reinstalled. See LV2_FileBrowser_Files.publish_resource_files. - not re-installed. - - See: for more details. - - @{ -*/ - - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum { - LV2_FileBrowser_Status_Success = 0, - LV2_FileBrowser_Status_Err_Filesystem = 1, - LV2_FileBrowser_Status_Err_InvalidParameter = 1, -} LV2_FileBrowser_Status; - -typedef void* - LV2_FileBrowser_Files_Handle; ///< Opaque handle for pipedal:uploadPath feature - - -/** - Feature data for filedialog:files (@ref LV2_FILEBROWSER_file). -*/ -typedef struct { - /** - Opaque host data. - */ - LV2_FileBrowser_Files_Handle handle; - - LV2_FileBrowser_Status (*publish_resource_files)(LV2_FileBrowser_Files_Handle handle,uint32_t version,const char*resourcePath, const char*uploadDirectory); - - /** - Return a path in which upload files will be stored for this plugin. - @param handle MUST be the `handle` member of this struct. - @param path The sub-directory name in which uploaded files will be stored. - @return The absolute path to use for the new directory. - - This function can be used by plugins to get the path of files or directories - that can be browsed by file dialogs. get_filebrowser_path, unlike map_path() does - not create or modify files in any way. - - The caller must free memory for the returned value with LV2_FileBrowser_Files.free_path(). - - Example: - [code] - TBD - [/code] - */ - char* (*get_upload_path)(LV2_FileBrowser_Files_Handle handle, const char* path); - - /** - Map resource bundle filenames to upload directories. - @param handle MUST be the `handle` member of this struct. - @param path File path name - @param fileBrowserDirectory relative directory of the file browser directory in which to create a link. - @return The absolute pathname of a file in the resource directory. - - The primary purpose of this method is to map file references to files in the plugin's bundle - directory to corresponding files in the a file browser directory. - - If the path is relative, the full path is resolved using the `rootResourceDirectory` path. - - If the full path is not a child of rootResourceDirectory or if the path is relative, - get_upload_path returns the supplied path unmodified. -` - If the filename is a child of rootResourceDirectory, creates a corresponding link to the file in the file browser - directory and returns the path of that link. - - The caller must free memory for the returned value with `LV2_FileBrowser_Files.free_path()`. - - Example: - */ - char* (*map_path)(LV2_FileBrowser_Files_Handle handle, const char* path, const char*rootResourceDirectory, const char*fileBrowserDirectory); - - - /** - Free a path returned by LV2_FileBrowser_Files.get_upload_path() or LV2_FileBrowser_Files.map_path() - @param handle MUST be the `handle` member of this struct. - @param path A path previously returned by a method of `LV2_FileBrowser_Files`. - - */ - void (*free_path)(LV2_FileBrowser_Files_Handle handle, char* path); -} LV2_FileBrowser_Files; - - - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // FILEBROWSERFILES_H diff --git a/src/FileBrowserFilesFeature.cpp b/src/FileBrowserFilesFeature.cpp index 3207688..92d8709 100644 --- a/src/FileBrowserFilesFeature.cpp +++ b/src/FileBrowserFilesFeature.cpp @@ -30,9 +30,11 @@ #include #include "util.hpp" #include "ofstream_synced.hpp" +#include "ModFileTypes.hpp" using namespace pipedal; using namespace pipedal::implementation; +namespace fs = std::filesystem; namespace pipedal::implementation { @@ -128,7 +130,9 @@ void FileBrowserFilesFeature::Initialize( lv2_log_logger_init(&this->lv2Logger,const_cast(lv2Map),const_cast(lv2Log)); this->bundleDirectory = bundleDirectory; - this->browserDirectory = browserDirectory; + this->browserRootDirectory = browserDirectory; + this->privateDirectory = browserDirectory / this->bundleDirectory.filename(); + MakeDirectoryMap(browserDirectory); featureData.handle = (void *)this; @@ -155,9 +159,73 @@ LV2_FileBrowser_Status FileBrowserFilesFeature::FN_publish_resource_files(LV2_Fi return ((FileBrowserFilesFeature *)handle)->PublishResourceFiles(version, resourcePath, uploadDirectory); } + +const char*FileBrowserFilesFeature::GetWellKnownDirectory(const std::string&directory) +{ + if (strcmp(directory.c_str(), "~") == 0) { + return privateDirectory.c_str(); + } + const auto &f = g_wellKnownDirectoryMap->find(directory); + if (f != g_wellKnownDirectoryMap->end()) + { + return f->second.c_str(); + } + return nullptr; +} + + +using WellKnownDirectoryMap = std::map; +std::mutex FileBrowserFilesFeature::g_DirectoryMap_mutex; + +std::unique_ptr FileBrowserFilesFeature::g_wellKnownDirectoryMap; + +void FileBrowserFilesFeature::MakeDirectoryMap(const std::filesystem::path&rootBrowserDirectory) +{ + std::lock_guard lock { g_DirectoryMap_mutex}; + + if (!g_wellKnownDirectoryMap) + { + g_wellKnownDirectoryMap = std::make_unique(); + for (const auto&modDirectory: ModFileTypes::ModDirectories()) + { + (*g_wellKnownDirectoryMap)[modDirectory.modType] = + (rootBrowserDirectory / modDirectory.pipedalPath).string(); + } + + } +} + + + char *FileBrowserFilesFeature::GetUploadPath(const char *fileBrowserPath) { - std::filesystem::path result = this->browserDirectory / fileBrowserPath; + if (fileBrowserPath == nullptr | fileBrowserPath[0] == '\0') + { + return strdup(""); + } + std::filesystem::path path {fileBrowserPath}; + + auto iter = path.begin(); + if (iter == path.end()) + { + return strdup(""); + } + std::string firstSegment = iter->string(); + + const auto f = (g_wellKnownDirectoryMap)->find(firstSegment); + if (f == g_wellKnownDirectoryMap->end()) + { + return nullptr; + } + + fs::path result = f->second; + + ++iter; + while (iter != path.end()) + { + result /= (*iter); + ++iter; + } return strdup(result.c_str()); } void FileBrowserFilesFeature::FreePath(char *path) @@ -224,7 +292,7 @@ char *FileBrowserFilesFeature::MapPath(const char *path,const char*resourcePathB } else { targetDirectory = fileBrowserPath; } - targetDirectory = this->browserDirectory / targetDirectory; + targetDirectory = this->browserRootDirectory / targetDirectory; std::filesystem::create_directories(targetDirectory); std::filesystem::path targetPath = targetDirectory / relativePath; @@ -297,7 +365,7 @@ LV2_FileBrowser_Status FileBrowserFilesFeature::PublishResourceFiles(uint32_t ve static std::string VERSION_FILENAME_PREFIX = ".versionInfo."; // generate a filename that will allow multiple plugins to install files into the same directory. - std::filesystem::path versionFileName = this->browserDirectory / uploadDirectory / + std::filesystem::path versionFileName = this->browserRootDirectory / uploadDirectory / (VERSION_FILENAME_PREFIX + GetPluginTag(this->bundleDirectory)); bool loaded = versionInfo.Load(versionFileName); @@ -325,8 +393,8 @@ LV2_FileBrowser_Status FileBrowserFilesFeature::PublishResourceFiles(uint32_t ve LogError("uploadDirectory must be relative."); return LV2_FileBrowser_Status::LV2_FileBrowser_Status_Err_InvalidParameter; } - targetDirectory = this->browserDirectory / targetDirectory; - PublishRecursive(versionInfo, sourcePath,sourcePath, this->browserDirectory / uploadDirectory); + targetDirectory = this->browserRootDirectory / targetDirectory; + PublishRecursive(versionInfo, sourcePath,sourcePath, this->browserRootDirectory / uploadDirectory); versionInfo.Save(versionFileName); } catch (const std::exception & e) { diff --git a/src/FileBrowserFilesFeature.hpp b/src/FileBrowserFilesFeature.hpp index 94eb547..6d9cb05 100644 --- a/src/FileBrowserFilesFeature.hpp +++ b/src/FileBrowserFilesFeature.hpp @@ -24,10 +24,12 @@ #pragma once -#include "FileBrowserFiles.h" +#include "lv2ext/pipedal.lv2/ext/fileBrowser.h" #include #include #include +#include +#include @@ -47,20 +49,32 @@ namespace pipedal { const std::string&browserDirectory); const LV2_Feature*GetFeature() { return &feature; } private: + static void MakeDirectoryMap(const std::filesystem::path&rootBrowserDirectory); + + using WellKnownDirectoryMap = std::map; + static std::mutex g_DirectoryMap_mutex; + static std::unique_ptr g_wellKnownDirectoryMap; + LV2_Feature feature; const LV2_URID_Map *lv2Map = nullptr; LV2_Log_Logger lv2Logger = {nullptr,0,0,0,0}; std::filesystem::path bundleDirectory; - std::filesystem::path browserDirectory; + std::filesystem::path browserRootDirectory; + std::filesystem::path privateDirectory; LV2_FileBrowser_Files featureData; + std::map wellKnownPaths; + + static char* FN_get_upload_path(LV2_FileBrowser_Files_Handle handle, const char* fileBrowserDirectory); static char* FN_map_path(LV2_FileBrowser_Files_Handle handle, const char* path, const char *resourcePathBase,const char*fileBrowserDirectory); static void FN_free_path(LV2_FileBrowser_Files_Handle handle, char* path); static LV2_FileBrowser_Status FN_publish_resource_files(LV2_FileBrowser_Files_Handle handle,uint32_t version,const char*resourcePath, const char*uploadDirectory); + const char*GetWellKnownDirectory(const std::string&directory); + void LogError(const char*message); char* GetUploadPath(const char* fileBrowserDirectory); char* MapPath(const char* path,const char*resourcePathBase,const char* fileBrowserDirectory); diff --git a/src/FilePropertyDirectoryTree.cpp b/src/FilePropertyDirectoryTree.cpp index c73bbed..0098873 100644 --- a/src/FilePropertyDirectoryTree.cpp +++ b/src/FilePropertyDirectoryTree.cpp @@ -18,6 +18,7 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "FilePropertyDirectoryTree.hpp" +#include using namespace pipedal; namespace fs = std::filesystem; diff --git a/src/HotspotManager.cpp b/src/HotspotManager.cpp index a6ba8db..b02921d 100644 --- a/src/HotspotManager.cpp +++ b/src/HotspotManager.cpp @@ -372,7 +372,7 @@ void HotspotManagerImpl::onStartMonitoring() ethernetDevice = GetDevice(NM_DEVICE_TYPE_ETHERNET); if (!ethernetDevice) { - throw std::runtime_error("eth0 device not found."); + throw std::runtime_error("ethernet device not found."); } this->ethernetDevice->OnStateChanged.add( [this](uint32_t, uint32_t, uint32_t) @@ -383,7 +383,7 @@ void HotspotManagerImpl::onStartMonitoring() wlanDevice = GetDevice(NM_DEVICE_TYPE_WIFI); if (!wlanDevice) { - throw std::runtime_error("wlan0 device not found."); + throw std::runtime_error("Wi-Fi device not found."); } wlanWirelessDevice = DeviceWireless::Create(dbusDispatcher, wlanDevice->getObjectPath()); diff --git a/src/IEffect.hpp b/src/IEffect.hpp index 520c19b..b5a4ce7 100644 --- a/src/IEffect.hpp +++ b/src/IEffect.hpp @@ -49,8 +49,11 @@ namespace pipedal { virtual void SetBypass(bool enable) = 0; virtual float GetOutputControlValue(int controlIndex) const = 0; - virtual int GetNumberOfInputAudioPorts() const = 0; - virtual int GetNumberOfOutputAudioPorts() const = 0; + virtual int GetNumberOfInputAudioPorts() const = 0; // as declared + virtual int GetNumberOfOutputAudioPorts() const = 0; // as declared. + + virtual int GetNumberOfInputAudioBuffers() const = 0; // may be different if plugin has zero inputs. + virtual int GetNumberOfOutputAudioBuffers() const = 0; // may be different if plugin has zero inputs. virtual float *GetAudioInputBuffer(int index) const = 0; virtual float *GetAudioOutputBuffer(int index) const = 0; virtual void ResetAtomBuffers() = 0; @@ -58,6 +61,7 @@ namespace pipedal { virtual bool GetRequestStateChangedNotification() const = 0; virtual void SetRequestStateChangedNotification(bool value) = 0; + virtual void PrepareNoInputEffect(int numberOfInputs, size_t maxBufferSize) = 0; virtual void SetAudioInputBuffer(int index, float *buffer) = 0; virtual void SetAudioOutputBuffer(int index, float*buffer) = 0; diff --git a/src/Ipv6Helpers.cpp b/src/Ipv6Helpers.cpp index 04b56b6..a3bad9a 100644 --- a/src/Ipv6Helpers.cpp +++ b/src/Ipv6Helpers.cpp @@ -30,10 +30,10 @@ #include #include "ss.hpp" #include "Finally.hpp" +#include using namespace pipedal; - static bool IsIpv4MappedAddress(const struct in6_addr &inetAddr6) { return IN6_IS_ADDR_V4MAPPED(&inetAddr6) != 0; @@ -62,6 +62,71 @@ static bool ipv6NetmaskCompare(const struct in6_addr &left, const struct in6_add return true; } +NetworkInterfaceType pipedal::GetNetworkInterfaceType(const char *interfaceName) +{ + // stock linux. + if (strncmp(interfaceName, "eth", 3) == 0) + { + return NetworkInterfaceType::Ethernet; + } + if (strncmp(interfaceName, "wlan", 4) == 0) + { + return NetworkInterfaceType::WiFi; + } + if (strncmp(interfaceName, "lo", 2) == 0) + { + return NetworkInterfaceType::Loopback; + } + + // ubuntu-style names. + if (strncmp(interfaceName, "en", 2) == 0) + { + return NetworkInterfaceType::Ethernet; + } + if (strncmp(interfaceName, "wl", 2) == 0) + { + return NetworkInterfaceType::WiFi; + } + return NetworkInterfaceType::Other; +} + +std::optional pipedal::GetWlanInterfaceName() +{ + struct ifaddrs *ifap = nullptr; + if (getifaddrs(&ifap) != 0) + throw std::runtime_error("No networks available."); + + Finally f{[ifap]() + { + freeifaddrs(ifap); + }}; + + for (struct ifaddrs *p = ifap; p != nullptr; p = p->ifa_next) + { + if (GetNetworkInterfaceType(p->ifa_name) == NetworkInterfaceType::WiFi) + { + return std::string(p->ifa_name); + } + } + + return std::optional(); +} + +std::optional pipedal::GetWlanIpv4Address() +{ + auto wlanAddress = GetWlanInterfaceName(); + if (wlanAddress) + { + auto result = GetInterfaceIpv4Address(*wlanAddress); + if (result.length() != 0) + { + return result; + } + } + return std::optional(); +} + + static bool IsIpv4OnLocalSubnet(uint32_t ipv4Addres) { bool result = false; @@ -71,7 +136,7 @@ static bool IsIpv4OnLocalSubnet(uint32_t ipv4Addres) for (ifaddrs *p = ifap; p != nullptr; p = p->ifa_next) { - if (p->ifa_addr->sa_family == AF_INET && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) { // TODO: Add support for AF_INET6 uint32_t netmask = htonl(((sockaddr_in *)(p->ifa_netmask))->sin_addr.s_addr); uint32_t ifAddr = htonl(((sockaddr_in *)(p->ifa_addr))->sin_addr.s_addr); @@ -245,7 +310,7 @@ bool pipedal::IsOnLocalSubnet(const std::string &fromAddress) for (ifaddrs *p = ifap; p != nullptr; p = p->ifa_next) { - if (p->ifa_addr->sa_family == AF_INET6 && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) + if (p->ifa_addr && p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) { struct sockaddr_in6 *pAddr = (struct sockaddr_in6 *)(p->ifa_addr); @@ -267,6 +332,44 @@ bool pipedal::IsOnLocalSubnet(const std::string &fromAddress) return result; } +static bool isEthernetAddress(const char *ifName) +{ + // either ethN (classic), + if (strncmp(ifName, "eth", 3) == 0) + return true; + // or "enpNNsNN" (ubuntu) + return (ifName[0] == 'e' && ifName[1] == 'n'); +} + +std::vector pipedal::GetEthernetIpv4Addresses() +{ + std::vector result; + + struct ifaddrs *ifap = nullptr; + if (getifaddrs(&ifap) != 0) + return result; + + for (ifaddrs *p = ifap; p != nullptr; p = p->ifa_next) + { + if (isEthernetAddress(p->ifa_name)) + { + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) + uint32_t netmask = htonl(((sockaddr_in *)(p->ifa_netmask))->sin_addr.s_addr); + uint32_t ifAddr = htonl(((sockaddr_in *)(p->ifa_addr))->sin_addr.s_addr); + { + if (ifAddr & 0xFF) + { // has an actual bound IP address. + std::string name = SS( + ((ifAddr >> 24) & 0xFF) << '.' << ((ifAddr >> 16) & 0xFF) << '.' << ((ifAddr >> 8) & 0xFF) << '.' << ((ifAddr) & 0xFF)); + result.push_back(std::move(name)); + } + } + } + } + freeifaddrs(ifap); + return result; +} + static std::string GetInterfaceForIp4Address(uint32_t ipv4Address) { struct ifaddrs *ifap = nullptr; @@ -275,7 +378,7 @@ static std::string GetInterfaceForIp4Address(uint32_t ipv4Address) std::string result; for (ifaddrs *p = ifap; p != nullptr; p = p->ifa_next) { - if (p->ifa_addr->sa_family == AF_INET && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) { // TODO: Add support for AF_INET6 uint32_t netmask = htonl(((sockaddr_in *)(p->ifa_netmask))->sin_addr.s_addr); uint32_t ifAddr = htonl(((sockaddr_in *)(p->ifa_addr))->sin_addr.s_addr); @@ -299,7 +402,7 @@ static std::string GetInterfaceForIp6Address(const in6_addr inetAddr6) std::string result; for (ifaddrs *p = ifap; p != nullptr; p = p->ifa_next) { - if (p->ifa_addr->sa_family == AF_INET6 && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) { // TODO: Add support for AF_INET6 struct sockaddr_in6 *pAddr = (struct sockaddr_in6 *)(p->ifa_addr); struct sockaddr_in6 *pNetMask = (struct sockaddr_in6 *)(p->ifa_netmask); @@ -325,9 +428,10 @@ static std::string GetNonLinkLocalAddress(const boost::asio::ip::address_v6 &ipV if (getifaddrs(&ifap) != 0) throw std::runtime_error("No networks available."); - Finally f{[ifap]() { - freeifaddrs(ifap); - }}; + Finally f{[ifap]() + { + freeifaddrs(ifap); + }}; std::string result; @@ -337,7 +441,7 @@ static std::string GetNonLinkLocalAddress(const boost::asio::ip::address_v6 &ipV // get the nameof the interface for this scopeId. for (ifaddrs *p = ifap; p != nullptr; p = p->ifa_next) { - if (p->ifa_addr->sa_family == AF_INET6 && p->ifa_addr != nullptr) + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && p->ifa_addr != nullptr) { // TODO: Add support for AF_INET6 struct sockaddr_in6 *pAddr = (struct sockaddr_in6 *)(p->ifa_addr); if (pAddr->sin6_scope_id == scopeId) @@ -355,9 +459,9 @@ static std::string GetNonLinkLocalAddress(const boost::asio::ip::address_v6 &ipV // an IPV4 address would be the ideal result. for (ifaddrs *p = ifap; p != nullptr; p = p->ifa_next) { - if (p->ifa_addr->sa_family == AF_INET && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) { - if (strcmp(p->ifa_name,targetInterfaceName) == 0) + if (strcmp(p->ifa_name, targetInterfaceName) == 0) { constexpr int BUFSIZE = 128; char host[BUFSIZE]; @@ -381,14 +485,13 @@ static std::string GetNonLinkLocalAddress(const boost::asio::ip::address_v6 &ipV { char buffer[128]; inet_ntop(AF_INET6, &(pAddr->sin6_addr), - buffer,sizeof(buffer)); + buffer, sizeof(buffer)); return SS('[' << buffer << ']'); } } } // probably network address settling after the hotspot comes up. :-/ throw std::runtime_error("Not ready. Try again later."); - } static std::string GetNonLinkLocalAddressForInterface(const std::string &name) @@ -400,7 +503,7 @@ static std::string GetNonLinkLocalAddressForInterface(const std::string &name) for (ifaddrs *p = ifap; p != nullptr; p = p->ifa_next) { - if (p->ifa_addr->sa_family == AF_INET6 && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) { // TODO: Add support for AF_INET6 struct sockaddr_in6 *pAddr = (struct sockaddr_in6 *)(p->ifa_addr); if (!IN6_IS_ADDR_LINKLOCAL(&(pAddr->sin6_addr))) @@ -444,8 +547,8 @@ static std::string GetNonLinkLocalAddressForIp4Interface(const std::string &name std::string result = ""; for (ifaddrs *p = ifap; p != nullptr; p = p->ifa_next) { - if (p->ifa_addr->sa_family == AF_INET && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) - { // TODO: Add support for AF_INET6 + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET && p->ifa_addr != nullptr && p->ifa_netmask != nullptr) + { struct sockaddr_in *pAddr = (struct sockaddr_in *)(p->ifa_addr); { if (name == p->ifa_name) @@ -543,7 +646,6 @@ static std::string GetNonLinkLocalAddressForIp4Interface(const std::string &name // else // { - // std::string interfaceName = GetInterfaceForIp6Address(inetAddr6); // result = GetNonLinkLocalAddressForInterface(interfaceName); // } @@ -556,7 +658,6 @@ static std::string GetNonLinkLocalAddressForIp4Interface(const std::string &name // return result; // } - std::string pipedal::GetNonLinkLocalAddress(const std::string &fromAddress) { std::string address = fromAddress; @@ -572,12 +673,11 @@ std::string pipedal::GetNonLinkLocalAddress(const std::string &fromAddress) throw std::invalid_argument("Bad address."); address = address.substr(1, address.length() - 2); - auto nPos = address.find('%') ; + auto nPos = address.find('%'); if (nPos != std::string::npos) { - std::string ifName = address.substr(nPos+1); + std::string ifName = address.substr(nPos + 1); return GetNonLinkLocalAddressForInterface(ifName); - } struct in6_addr inetAddr6; memset(&inetAddr6, 0, sizeof(inetAddr6)); @@ -599,9 +699,8 @@ std::string pipedal::GetNonLinkLocalAddress(const std::string &fromAddress) else { - std::string interfaceName = GetInterfaceForIp6Address(inetAddr6); - result = GetNonLinkLocalAddressForInterface(interfaceName); + result = GetNonLinkLocalAddressForInterface(interfaceName); } } } @@ -612,12 +711,11 @@ std::string pipedal::GetNonLinkLocalAddress(const std::string &fromAddress) return result; } -std::string pipedal::GetInterfaceIpv4Address(const std::string& interfaceName) +std::string pipedal::GetInterfaceIpv4Address(const std::string &interfaceName) { return GetNonLinkLocalAddressForIp4Interface(interfaceName); } - // std::string getNonLinkLocalAddress(const std::string&address, const std::string&interface) // { // if (!interface.empty()) @@ -628,7 +726,7 @@ std::string pipedal::GetInterfaceIpv4Address(const std::string& interfaceName) // } -static bool parseForLinkLocalUrl(const std::string&url,std::string*prefix, std::string *suffix) +static bool parseForLinkLocalUrl(const std::string &url, std::string *prefix, std::string *suffix) { auto iter = url.begin(); auto end = url.end(); @@ -636,7 +734,8 @@ static bool parseForLinkLocalUrl(const std::string&url,std::string*prefix, std:: // proto: while (true) { - if (iter == end) return false; + if (iter == end) + return false; if (*iter == ':') { ++iter; @@ -646,17 +745,20 @@ static bool parseForLinkLocalUrl(const std::string&url,std::string*prefix, std:: } // // - if (iter == end || *iter != '/') return false; + if (iter == end || *iter != '/') + return false; ++iter; - if (iter == end || *iter != '/') return false; + if (iter == end || *iter != '/') + return false; ++iter; - // (user@)? of id: http://user@[::1]/ - if (*iter != '[') { + if (*iter != '[') + { while (true) { - if (iter == end || *iter == '/') return false; + if (iter == end || *iter == '/') + return false; if (*iter == '@') { ++iter; @@ -674,23 +776,30 @@ static bool parseForLinkLocalUrl(const std::string&url,std::string*prefix, std:: ++iter; // fe80: ... - if (iter == end || !(*iter == 'f' || *iter == 'F')) return false; + if (iter == end || !(*iter == 'f' || *iter == 'F')) + return false; ++iter; - if (iter == end || !(*iter == 'e' || *iter == 'E')) return false; + if (iter == end || !(*iter == 'e' || *iter == 'E')) + return false; ++iter; - if (iter == end || *iter != '8' ) return false; + if (iter == end || *iter != '8') + return false; ++iter; - if (iter == end || *iter != '0' ) return false; + if (iter == end || *iter != '0') + return false; ++iter; - if (iter == end || *iter != ':' ) return false; + if (iter == end || *iter != ':') + return false; ++iter; while (true) { - if (iter == end) break; + if (iter == end) + break; char c = *iter; bool valid = (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F') || c >= '0' && c <= '9' || c == ':'; - if (!valid) break; + if (!valid) + break; ++iter; } // potentially a scope ID @@ -698,38 +807,40 @@ static bool parseForLinkLocalUrl(const std::string&url,std::string*prefix, std:: auto endOfAddress = iter; if (iter != end && *iter == '%') { - while (true) { - if (iter == end) return false; - if (*iter == ']') break; + while (true) + { + if (iter == end) + return false; + if (*iter == ']') + break; ++iter; } } // made it! - if (iter == end || *iter != ']') return false; + if (iter == end || *iter != ']') + return false; ++iter; auto startOfRest = iter; - *prefix = std::string(url.begin(),endOfPrefix); - *suffix = std::string(startOfRest,url.end()); + *prefix = std::string(url.begin(), endOfPrefix); + *suffix = std::string(startOfRest, url.end()); return true; - } bool pipedal::RemapLinkLocalUrl( const boost::asio::ip::address &boostAddress, - const std::string&url,std::string*outputUrl) + const std::string &url, std::string *outputUrl) { std::string prefix, suffix; - if (!parseForLinkLocalUrl(url,&prefix,&suffix)) return false; + if (!parseForLinkLocalUrl(url, &prefix, &suffix)) + return false; boost::asio::ip::address_v6 addressV6 = boostAddress.to_v6(); std::string directAddress; directAddress = ::GetNonLinkLocalAddress(addressV6); - *outputUrl = SS(prefix << directAddress << suffix); + *outputUrl = SS(prefix << directAddress << suffix); return true; } - - diff --git a/src/Ipv6Helpers.hpp b/src/Ipv6Helpers.hpp index 17e5640..1400f2f 100644 --- a/src/Ipv6Helpers.hpp +++ b/src/Ipv6Helpers.hpp @@ -22,12 +22,33 @@ #include #include #include -namespace pipedal { +#include +namespace pipedal { + enum class NetworkInterfaceType { + Loopback, + Ethernet, + WiFi, + WiFiDirect, + Other, + }; + + NetworkInterfaceType GetNetworkInterfaceType(const char*interfaceName); + inline NetworkInterfaceType GetNetworkInterfaceType(const std::string&interfaceName) + { + return GetNetworkInterfaceType(interfaceName.c_str()); + } std::string GetInterfaceIpv4Address(const std::string& interfaceName); + std::optional GetWlanInterfaceName(); + std::optional GetWlanIpv4Address(); + + std::vector GetEthernetIpv4Addresses(); + + + // bool IsLinkLocalAddress(const std::string &fromAddress); std::string GetNonLinkLocalAddress(const std::string& fromAddress); diff --git a/src/Locale.cpp b/src/Locale.cpp index 6caec02..8b56117 100644 --- a/src/Locale.cpp +++ b/src/Locale.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Robin Davies +// Copyright (c) 2024 Robin E. R. Davies // // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in @@ -17,44 +17,320 @@ // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -#include "pch.h" +/* + libicu does major version bumps without regard to whether api changes are major or minor. Documention + does, in fact, guarantee binary compatibility for the APIs that we are using. The major version bump + creates absolute havoc with .deb packaging, because the major version bumps on roughluy a monthyly basis. + This makes it impossible to generate .deb packages that are plausible portable between debian-derived distros. + The alternative: dynmaically link to the APIs that we are using, referencing non-major-versioned references + to the libicu dlls (e.g. libicuuc.lib instead of libicuuc.lib.74). Given how few APIs we are actually using, + this seems perfectly reasonable. fwiw, .net runtime uses a similar approach. + +*/ + +#include "pch.h" #include "Locale.hpp" +#include "ss.hpp" +#include +#include "Utf8Utils.hpp" +#include + +#define U_SHOW_CPLUSPLUS_API 0 #include #include "Lv2Log.hpp" #include #include #include -#include +#include #include #include "ss.hpp" #include +#include -// Must be UNICODE. Should reflect system locale. (.e.g en-US.UTF8, de-de.UTF8) - -// This is correct for libstdc++; most probably not correct for Windows or CLANG. :-( using namespace pipedal; +using namespace std; +namespace fs = std::filesystem; + +static inline bool isDigit(char c) +{ + return c >= '0' && c <= '9'; +} +static bool getSoVersionNumber(const std::string&fileName, int *version) +{ + auto fnamePos = fileName.find_last_of('/'); + if (fnamePos == std::string::npos) + { + fnamePos = 0; + } + auto extensionPos = fileName.find(".so.",fnamePos); + if (extensionPos == std::string::npos) + { + return false; + } -std::string getCurrentLocale() { + const char *p = fileName.c_str() + extensionPos + 4; + + if (!isDigit(*p)) { + return false; + } + int n = 0; + while (isDigit(*p)) + { + n = n*10 + *p-'0'; + ++p; + } + if (*p != '\0' && *p != '.') + { + return false; + } + *version = n; + return true; +} +// Function to get ICU version dynamically +static int getICUVersion(void* libHandle) { + + // pares the dlerror to get the version number. :-/ + dlerror(); // clear the error. + void * nonExistentFunction = dlsym(libHandle, "nonExistentFunction"); + + std::string error = dlerror(); + // "/lib/aarch64-linux-gnu/libicui18n.so.74: undefined symbol: nonExistentFunction" + + auto nPos = error.find(":"); + if (nPos == std::string::npos) + { + return false; + } + std::string fileName = error.substr(0,nPos); + + int version = -1; + + if (!getSoVersionNumber(fileName,&version)) + { + fs::path basePath = fileName; + fs::path parentDirectory = basePath.parent_path(); + auto fileName = basePath.filename().string(); + for (auto&entry: fs::directory_iterator(parentDirectory)) + { + if (entry. path().filename().string().starts_with(fileName)) + { + if (getSoVersionNumber(entry.path().string(),&version)) + { + break; + } + + } + } + if (version == -1) + { + throw std::runtime_error(SS("Unable to determine libicui18n.so version: " << error)); + } + } + return version; +} + + +class DynamicIcuLoader +{ +public: + using ptr = std::shared_ptr; + // Function pointer types + typedef UCollator *(*ucol_open_t)(const char *, UErrorCode *); + typedef void (*ucol_close_t)(UCollator *); + typedef UCollationResult (*ucol_strcoll_t)(const UCollator *, const UChar *, int32_t, const UChar *, int32_t); + using ucol_setStrength_t = typeof(&ucol_setStrength); + + static ptr icuLoader; + static std::mutex icuLoaderMutex; + + static DynamicIcuLoader::ptr get_instance() + { + std::lock_guard lock{icuLoaderMutex}; + + if (!icuLoader) + { + icuLoader = std::make_shared(); + } + return icuLoader; + } + + ~DynamicIcuLoader() + { + // Close the library if it was opened + if (library_handle) + { + dlclose(library_handle); + library_handle = nullptr; + } + } + + ucol_open_t ucol_open_fn; + ucol_close_t ucol_close_fn; + ucol_strcoll_t ucol_strcoll_fn; + ucol_setStrength_t ucol_setStrength_fn; + + DynamicIcuLoader() : library_handle(nullptr), + ucol_open_fn(nullptr), + ucol_close_fn(nullptr), + ucol_strcoll_fn(nullptr) + { +#ifndef DISABLE_DYNAMIC_ICU_LOADER + load(); +#else + this->ucol_open_fn = &ucol_open; + this->ucol_close_fn = &ucol_close; + this->ucol_strcoll_fn = &ucol_strcoll; + this->ucol_setStrength_fn = &ucol_setStrength; +#endif + } + +private: + void *library_handle; + // Function pointers + static std::string VersionedName(const char*name,int version) + { + std::stringstream ss; + ss << name << "_" << version; + return ss.str(); + } + void load() + { + try + { + // Open the library + library_handle = dlopen("libicui18n.so", RTLD_LAZY); + if (!library_handle) + { + throw std::runtime_error(SS("Error loading library: " << dlerror())); + } + + + int version = getICUVersion(library_handle); + + // Clear any existing errors + dlerror(); + + // Load ucol_open + ucol_open_fn = reinterpret_cast(dlsym(library_handle, VersionedName("ucol_open",version).c_str())); + if (!ucol_open_fn) + { + + throw std::runtime_error(SS("Error loading ucol_open: " << dlerror())); + } + + // Load ucol_close + ucol_close_fn = reinterpret_cast(dlsym(library_handle, VersionedName("ucol_close",version).c_str())); + if (!ucol_close_fn) + { + throw std::runtime_error(SS("Error loading ucol_close: " << dlerror())); + } + + // Load ucol_strcoll + ucol_strcoll_fn = reinterpret_cast(dlsym(library_handle, VersionedName("ucol_strcoll",version).c_str())); + if (!ucol_strcoll_fn) + { + throw std::runtime_error(SS("Error loading ucol_strcoll: " << dlerror())); + } + this->ucol_setStrength_fn = reinterpret_cast(dlsym(library_handle, VersionedName("ucol_setStrength",version).c_str())); + if (!ucol_setStrength_fn) + { + throw std::runtime_error(SS("Error loading ucol_setStrength: " << dlerror())); + } + } + catch (const std::exception &e) + { + Lv2Log::warning(e.what()); + this->ucol_open_fn = fallback_ucol_open_func; + this->ucol_close_fn = fallback_ucol_close_func; + this->ucol_strcoll_fn = fallback_ucol_strcoll_func; + this->ucol_setStrength_fn = fallback_ucol_setStrength_func; + } + } + + static void fallback_ucol_setStrength_func(UCollator *coll, + UCollationStrength strength) + { + + } + + + static UCollator *fallback_ucol_open_func(const char *locale, UErrorCode *ec) + { + *ec = UErrorCode::U_ZERO_ERROR; + return (UCollator *)(void *)-1; + } + static void fallback_ucol_close_func(UCollator *) + { + } + static UCollationResult fallback_ucol_strcoll_func(const UCollator *, const UChar *left, int32_t nLeft, const UChar *right, int32_t nRight) + { + auto c = std::min(nLeft, nRight); + + for (int32_t i = 0; i < c; ++i) + { + UChar cl = *left++; + UChar cr = *right++; + if (cl != cr) + { + if (cl >= 'A' && cl <= 'Z') + { + cl += 'A' - 'a'; + } + if (cr >= 'A' && cr <= 'Z') + { + cr += 'A' - 'a'; + } + if (cl != cr) + { + if (cl < cr) + { + return UCollationResult::UCOL_LESS; + } + else + { + return UCollationResult::UCOL_GREATER; + } + } + } + } + return UCollationResult::UCOL_EQUAL; + } +}; + +DynamicIcuLoader::ptr DynamicIcuLoader::icuLoader; +std::mutex DynamicIcuLoader::icuLoaderMutex; + +std::string getCurrentLocale() +{ std::string locale = setlocale(LC_ALL, nullptr); - if (locale.empty() || locale == "C") { + if (locale.empty() || locale == "C") + { // If setlocale fails, try getting it from environment variables - const char* lang = getenv("LC_ALL"); - if (lang) { + const char *lang = getenv("LC_ALL"); + if (lang) + { locale = lang; - } else { + } + else + { // If LANG is not set, fall back to a default lang = getenv("LC_COLLATE"); if (lang) { locale = lang; - } else{ + } + else + { lang = getenv("LANG"); - if (lang) { + if (lang) + { locale = lang; - } else { + } + else + { locale = "en_US"; } } @@ -62,88 +338,123 @@ std::string getCurrentLocale() { } // Extract just the language and country code size_t dot_pos = locale.find('.'); - if (dot_pos != std::string::npos) { + if (dot_pos != std::string::npos) + { locale = locale.substr(0, dot_pos); } return locale; } -Collator::~Collator() { - +Collator::~Collator() +{ } class LocaleImpl; -class CollatorImpl : public Collator { +class CollatorImpl : public Collator +{ public: - CollatorImpl(std::shared_ptr LocaleImpl,icu::Locale &locale); + CollatorImpl(std::shared_ptr localeImpl, const char *localeStr); ~CollatorImpl(); - virtual int Compare(const std::string &left, const std::string&right); + virtual int Compare(const std::string &left, const std::string &right); + virtual int Compare(const std::u16string &left, const std::u16string &right); + private: - icu::Collator* collator = nullptr; + UCollator *collator = nullptr; std::shared_ptr localeImpl; + + DynamicIcuLoader::ptr icuLoader; }; CollatorImpl::~CollatorImpl() { - delete collator; + if (collator) + { + icuLoader->ucol_close_fn(collator); + collator = nullptr; + } localeImpl = nullptr; } -CollatorImpl::CollatorImpl(std::shared_ptr localeImpl, icu::Locale &locale) -:localeImpl(localeImpl) + +CollatorImpl::CollatorImpl(std::shared_ptr localeImpl, const char *localeStr) + : localeImpl(localeImpl) { + icuLoader = DynamicIcuLoader::get_instance(); UErrorCode status = U_ZERO_ERROR; + collator = icuLoader->ucol_open_fn(localeStr, &status); - this->collator = icu::Collator::createInstance(locale, status); - - if (U_FAILURE(status)) { - throw std::runtime_error(SS("Failed to create collator: " << u_errorName(status))); + if (U_FAILURE(status)) + { + throw std::runtime_error(SS("Failed to create collator: " << status)); } + icuLoader->ucol_setStrength_fn(collator,UCollationStrength::UCOL_PRIMARY); } -int CollatorImpl::Compare(const std::string &left, const std::string&right) { - return collator->compare(left.c_str(),right.c_str()); +int CollatorImpl::Compare(const std::u16string &left, const std::u16string&right) +{ + return icuLoader->ucol_strcoll_fn(collator, + reinterpret_cast(left.c_str()), left.length(), + reinterpret_cast(right.c_str()), right.length()); + } + +int CollatorImpl::Compare(const std::string &left_, const std::string &right_) +{ + std::u16string left = Utf8ToUtf16(left_); + std::u16string right = Utf8ToUtf16(right_); + + return icuLoader->ucol_strcoll_fn(collator, + reinterpret_cast(left.c_str()), left.length(), + reinterpret_cast(right.c_str()), right.length()); +} + Locale::ptr g_instance; -class LocaleImpl: public Locale, public std::enable_shared_from_this { +class LocaleImpl : public Locale, public std::enable_shared_from_this +{ public: LocaleImpl(); - virtual const std::string &CurrentLocale() const ; + LocaleImpl(const std::string&locale); + virtual const std::string &CurrentLocale() const; virtual Collator::ptr GetCollator(); + private: - std::unique_ptr locale; std::string currentLocale; }; LocaleImpl::LocaleImpl() { currentLocale = getCurrentLocale(); - locale = std::make_unique(currentLocale.c_str()); } -const std::string &LocaleImpl::CurrentLocale() const +LocaleImpl::LocaleImpl(const std::string& locale) +{ + currentLocale = locale; +} + + +const std::string &LocaleImpl::CurrentLocale() const { return currentLocale; } - -Collator::ptr LocaleImpl::GetCollator(){ +Collator::ptr LocaleImpl::GetCollator() +{ auto pThis = shared_from_this(); - return std::shared_ptr(new CollatorImpl(pThis,*locale)); + return std::shared_ptr(new CollatorImpl(pThis, currentLocale.c_str())); } static std::mutex createMutex; -Locale::~Locale() +Locale::~Locale() { - } + Locale::ptr Locale::g_instance; Locale::ptr Locale::GetInstance() { - std::lock_guard lock { createMutex}; + std::lock_guard lock{createMutex}; if (g_instance) { @@ -153,4 +464,7 @@ Locale::ptr Locale::GetInstance() return g_instance; } - +Locale::ptr Locale::GetTestInstance(const std::string&locale) +{ + return std::make_shared(locale); +} \ No newline at end of file diff --git a/src/Locale.hpp b/src/Locale.hpp index 9d0ae1b..068b4d8 100644 --- a/src/Locale.hpp +++ b/src/Locale.hpp @@ -27,6 +27,7 @@ namespace pipedal { public: using ptr = std::shared_ptr; virtual int Compare(const std::string &left, const std::string&right) = 0; + virtual int Compare(const std::u16string &left, const std::u16string&right) = 0; virtual ~Collator(); }; class Locale { @@ -43,6 +44,7 @@ namespace pipedal { using ptr = std::shared_ptr; static ptr GetInstance(); + static ptr GetTestInstance(const std::string&locale); // testing only. virtual const std::string &CurrentLocale() const = 0; virtual Collator::ptr GetCollator() = 0; diff --git a/src/LocaleTest.cpp b/src/LocaleTest.cpp new file mode 100644 index 0000000..1ba3678 --- /dev/null +++ b/src/LocaleTest.cpp @@ -0,0 +1,285 @@ +// Copyright (c) 2022 Robin Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +#include "pch.h" +#include "catch.hpp" +#include +#include + +#include // before Locale.hpp +#include +#include +#include + +#include "Locale.hpp" +#include +#include +#include + +using namespace pipedal; +using namespace std; + + +static std::string ToUtf8(const icu::UnicodeString &value) +{ + std::string result; + icu::StringByteSink sink(&result); + value.toUTF8(sink); + + sink.Flush(); + return result; +} + + +class LocaleEnumerator { +public: + // Enumerate all available locales + static std::vector getAllLocales() { + std::vector locales; + + // Get the number of available locales + int32_t count = 0; + const icu::Locale* availableLocales = icu::Locale::getAvailableLocales(count); + + for (int32_t i = 0; i < count; ++i) { + const icu::Locale& locale = availableLocales[i]; + + // Construct full locale name + std::string localeName = constructLocaleName(locale); + + locales.push_back(localeName); + } + + // Sort locales alphabetically + std::sort(locales.begin(), locales.end()); + + return locales; + } + + // Detailed locale information + static void printLocaleDetails(const std::string& localeName) { + try { + icu::Locale locale(localeName.c_str()); + + // Display locale information + std::cout << "Locale: " << localeName << "\n"; + + // Language display name + icu::UnicodeString languageName; + locale.getDisplayLanguage(locale, languageName); + std::cout << " Language: " << ToUtf8(languageName) << "\n"; + + // Country display name + icu::UnicodeString countryName; + locale.getDisplayCountry(locale, countryName); + std::cout << " Country: " << ToUtf8(countryName) << "\n"; + + // Variant information + icu::UnicodeString variantName; + locale.getDisplayVariant(locale, variantName); + if (!variantName.isEmpty()) { + std::cout << " Variant: " << ToUtf8(variantName) << "\n"; + } + UErrorCode status = U_ZERO_ERROR; + + std::unique_ptr collator(icu::Collator::createInstance(localeName.c_str(),status)); + icu::Collator::ECollationStrength strength = collator->getStrength(); + std::cout << " Default strength: " << strength << "\n"; + + } + catch (const std::exception& e) { + std::cerr << "Error processing locale " << localeName << ": " << e.what() << std::endl; + } + } + + // Enumerate locales by language or country + static std::vector getLocalesByLanguage(const std::string& language) { + std::vector matchingLocales; + + int32_t count = 0; + const icu::Locale* availableLocales = icu::Locale::getAvailableLocales(count); + + for (int32_t i = 0; i < count; ++i) { + const icu::Locale& locale = availableLocales[i]; + + if (language == locale.getLanguage()) { + std::string localeName = constructLocaleName(locale); + matchingLocales.push_back(localeName); + } + } + + std::sort(matchingLocales.begin(), matchingLocales.end()); + return matchingLocales; + } + +private: + // Construct a comprehensive locale name + static std::string constructLocaleName(const icu::Locale& locale) { + std::string localeName; + + const char* lang = locale.getLanguage(); + const char* country = locale.getCountry(); + const char* variant = locale.getVariant(); + + if (lang && *lang) { + localeName += lang; + + if (country && *country) { + localeName += "_"; + localeName += country; + + if (variant && *variant) { + localeName += "."; + localeName += variant; + } + } + } + + return localeName; + } +}; + +int enumerateLocales() { + try { + // Get and print total number of available locales + int32_t count = 0; + icu::Locale::getAvailableLocales(count); + std::cout << "Total Available Locales: " << count << "\n\n"; + + // Demonstrate different locale enumeration methods + + // 1. Get all locales + std::vector allLocales = LocaleEnumerator::getAllLocales(); + for (size_t i = 0; i < allLocales.size(); ++i) { + std::cout << allLocales[i] << "\n"; + } + + // 2. Get locales by specific language (e.g., English) + std::cout << "\nFrench Locales:\n"; + std::vector englishLocales = LocaleEnumerator::getLocalesByLanguage("fr"); + for (const auto& locale : englishLocales) { + std::cout << locale << "\n"; + } + + // 3. Detailed information for a specific locale + std::cout << "\nDetailed Locale Information:\n"; + LocaleEnumerator::printLocaleDetails("en_US"); + } + catch (const std::exception& e) { + std::cerr << "Error: " << e.what() << std::endl; + return 1; + } + + return 0; +} + +void printSortOptions(const std::string&localeName) +{ + UErrorCode status = U_ZERO_ERROR; + std::unique_ptr collator(icu::Collator::createInstance(localeName.c_str(),status)); + +} + +void u16Test() { + { + Locale::ptr locale = Locale::GetTestInstance("en_US"); + REQUIRE(locale->GetCollator()->Compare(u"ÄbcAe",u"Abcde") < 0); // standard sort order, not phone-book sort order. + REQUIRE(locale->GetCollator()->Compare(u"Äbcdefg",u"Abcde") > 0); // standard sort order, not phone-book sort order. + REQUIRE(locale->GetCollator()->Compare(u"Ä",u"A") == 0); // standard sort order, not phone-book sort order. + REQUIRE(locale->GetCollator()->Compare(u"A",u"b") < 0); + REQUIRE(locale->GetCollator()->Compare(u"B",u"a") > 0); + REQUIRE(locale->GetCollator()->Compare(u"A",u"a") == 0); + REQUIRE(locale->GetCollator()->Compare(u"c",u"ç") == 0); + REQUIRE(locale->GetCollator()->Compare(u"e",u"è") == 0); + + } + { + Locale::ptr locale = Locale::GetTestInstance("fr_FR"); + REQUIRE(locale->GetCollator()->Compare(u"Ä",u"A") == 0); // standard sort order, not phone-book sort order. + REQUIRE(locale->GetCollator()->Compare(u"A",u"b") < 0); + REQUIRE(locale->GetCollator()->Compare(u"B",u"a") > 0); + REQUIRE(locale->GetCollator()->Compare(u"A",u"a") == 0); + REQUIRE(locale->GetCollator()->Compare(u"c",u"ç") == 0); + REQUIRE(locale->GetCollator()->Compare(u"e",u"è") == 0); + } + { + Locale::ptr locale = Locale::GetTestInstance("de_DE"); + REQUIRE(locale->GetCollator()->Compare(u"Ä",u"A") == 0); // standard sort order, not phone-book sort order. + REQUIRE(locale->GetCollator()->Compare(u"A",u"b") < 0); + REQUIRE(locale->GetCollator()->Compare(u"B",u"a") > 0); + REQUIRE(locale->GetCollator()->Compare(u"A",u"a") == 0); + REQUIRE(locale->GetCollator()->Compare(u"c",u"ç") == 0); + REQUIRE(locale->GetCollator()->Compare(u"e",u"è") == 0); + } + { + Locale::ptr locale = Locale::GetTestInstance("da_DK"); + REQUIRE(locale->GetCollator()->Compare(u"Å",u"Z") > 0); + } +} + +void u8Test() { + { + Locale::ptr locale = Locale::GetTestInstance("en_US"); + REQUIRE(locale->GetCollator()->Compare("Äbcae","Abcde") < 0); // standard sort order, not phone-book sort order. + + REQUIRE(locale->GetCollator()->Compare("Ä","A") == 0); // standard sort order, not phone-book sort order. + REQUIRE(locale->GetCollator()->Compare("A","b") < 0); + REQUIRE(locale->GetCollator()->Compare("B","a") > 0); + REQUIRE(locale->GetCollator()->Compare("A","a") == 0); + REQUIRE(locale->GetCollator()->Compare("c","ç") == 0); + REQUIRE(locale->GetCollator()->Compare("e","è") == 0); + + } + { + Locale::ptr locale = Locale::GetTestInstance("fr_FR"); + REQUIRE(locale->GetCollator()->Compare("Ä","A") == 0); // standard sort order, not phone-book sort order. + REQUIRE(locale->GetCollator()->Compare("A","b") < 0); + REQUIRE(locale->GetCollator()->Compare("B","a") > 0); + REQUIRE(locale->GetCollator()->Compare("A","a") == 0); + REQUIRE(locale->GetCollator()->Compare("c","ç") == 0); + REQUIRE(locale->GetCollator()->Compare("e","è") == 0); + } + { + Locale::ptr locale = Locale::GetTestInstance("de_DE"); + REQUIRE(locale->GetCollator()->Compare("Ä","A") == 0); // standard sort order, not phone-book sort order. + REQUIRE(locale->GetCollator()->Compare("A","b") < 0); + REQUIRE(locale->GetCollator()->Compare("B","a") > 0); + REQUIRE(locale->GetCollator()->Compare("A","a") == 0); + REQUIRE(locale->GetCollator()->Compare("c","ç") == 0); + REQUIRE(locale->GetCollator()->Compare("e","è") == 0); + } + { + Locale::ptr locale = Locale::GetTestInstance("da_DK"); + REQUIRE(locale->GetCollator()->Compare("Å","Z") > 0); + } +} + +TEST_CASE( "Locale test", "[locale]" ) { + cout << "====== Locale test ===============" << endl; + + + // enumerateLocales(); + // printSortOptions("de_DE"); + + u8Test(); + u16Test(); + + + +} \ No newline at end of file diff --git a/src/Lv2Effect.cpp b/src/Lv2Effect.cpp index 3f4863d..4680216 100644 --- a/src/Lv2Effect.cpp +++ b/src/Lv2Effect.cpp @@ -47,7 +47,6 @@ namespace fs = std::filesystem; const float BYPASS_TIME_S = 0.1f; - static fs::path makeAbsolutePath(const std::filesystem::path &path, const std::filesystem::path &parentPath) { if (path.is_absolute()) @@ -57,7 +56,6 @@ static fs::path makeAbsolutePath(const std::filesystem::path &path, const std::f return parentPath / path; } - Lv2Effect::Lv2Effect( IHost *pHost_, const std::shared_ptr &info_, @@ -83,9 +81,9 @@ Lv2Effect::Lv2Effect( this->pathPropertyWriters.push_back(PatchPropertyWriter(instanceId, filePropertyUrid)); } } - for (auto &pathProperty: pedalboardItem.pathProperties_) + for (auto &pathProperty : pedalboardItem.pathProperties_) { - SetPathPatchProperty(pathProperty.first,pathProperty.second); + SetPathPatchProperty(pathProperty.first, pathProperty.second); } // initialize the atom forge used on the realtime thread. @@ -112,7 +110,6 @@ Lv2Effect::Lv2Effect( bundleUriString, storagePath); - mapPathFeature.Prepare(&(pHost_->GetMapFeature())); mapPathFeature.SetPluginStoragePath(pHost_->GetPluginStoragePath()); if (info->piPedalUI()) @@ -122,10 +119,8 @@ Lv2Effect::Lv2Effect( { if (!fileProperty->resourceDirectory().empty()) { - mapPathFeature.AddResourceFileMapping({ - makeAbsolutePath(fileProperty->resourceDirectory(),bundleUriString), - makeAbsolutePath(fileProperty->directory(),pHost_->GetPluginStoragePath()) - }); + mapPathFeature.AddResourceFileMapping({makeAbsolutePath(fileProperty->resourceDirectory(), bundleUriString), + makeAbsolutePath(fileProperty->directory(), pHost_->GetPluginStoragePath())}); } } } @@ -145,7 +140,6 @@ Lv2Effect::Lv2Effect( this->features.push_back(mapPathFeature.GetMakePathFeature()); this->features.push_back(mapPathFeature.GetFreePathFeature()); - this->features.push_back(this->fileBrowserFilesFeature.GetFeature()); this->work_schedule_feature = nullptr; @@ -311,6 +305,7 @@ void Lv2Effect::PreparePortIndices() size_t nPorts = info->ports().size(); isInputControlPort.resize(nPorts); this->defaultInputControlValues.resize(nPorts); + this->isInputTriggerControlPort.resize(nPorts); for (int i = 0; i < info->ports().size(); ++i) { @@ -349,11 +344,16 @@ void Lv2Effect::PreparePortIndices() } else if (port->is_control_port()) { - controlIndex[port->symbol()] = port->index(); + controlIndex[port->symbol()] = portIndex; if (port->is_input()) { - this->isInputControlPort[i] = true; - this->defaultInputControlValues[i] = port->default_value(); + this->isInputControlPort[portIndex] = true; + this->defaultInputControlValues[portIndex] = port->default_value(); + if (port->trigger_property()) + { + this->isInputTriggerControlPort[portIndex] = true; + } + } } } @@ -370,25 +370,62 @@ void Lv2Effect::PreparePortIndices() outputAtomBuffers.resize(outputAtomPortIndices.size()); } +void Lv2Effect::PrepareNoInputEffect(int numberOfInputs, size_t maxBufferSize) +{ + if (outputAudioPortIndices.size() == 0) + { + // pass the input through unmodified. + inputAudioBuffers.resize(std::max((size_t)numberOfInputs, inputAudioPortIndices.size())); + outputAudioBuffers.resize(numberOfOutputs); + } + else if (inputAudioPortIndices.size() == 0) + { + inputAudioBuffers.resize(numberOfInputs); + outputAudioBuffers.resize(std::max((size_t)numberOfInputs, outputAudioPortIndices.size())); + + // allocate a working buffer which we will mix with passed-through data. + outputMixBuffers.resize(outputAudioPortIndices.size()); + for (size_t i = 0; i < outputMixBuffers.size(); ++i) + { + outputMixBuffers[i].resize(maxBufferSize); + } + // connect the plugin to the mix buffer instead of output buffer. + for (size_t i = 0; i < outputAudioPortIndices.size(); ++i) + { + int pluginIndex = this->outputAudioPortIndices[i]; + lilv_instance_connect_port(this->pInstance, pluginIndex, outputMixBuffers[i].data()); + } + } +} + void Lv2Effect::SetAudioInputBuffer(int index, float *buffer) { - if (index >= inputAudioPortIndices.size()) - { - throw PiPedalArgumentException("Buffer index out of range."); - } this->inputAudioBuffers[index] = buffer; - int pluginIndex = this->inputAudioPortIndices[index]; - lilv_instance_connect_port(this->pInstance, pluginIndex, buffer); + + if (inputAudioPortIndices.size() == inputAudioBuffers.size()) + { + int pluginIndex = this->inputAudioPortIndices[index]; + lilv_instance_connect_port(this->pInstance, pluginIndex, buffer); + } + else + { + // cases: 1->0, 1->1, 2->0, 2->1 + if (index < inputAudioPortIndices.size()) + { + int pluginIndex = this->inputAudioPortIndices[index]; + lilv_instance_connect_port(this->pInstance, pluginIndex, buffer); + } + } } void Lv2Effect::SetAudioInputBuffer(float *left) { - if (GetNumberOfInputAudioPorts() > 1) + if (GetNumberOfInputAudioBuffers() > 1) { SetAudioInputBuffer(0, left); SetAudioInputBuffer(1, left); } - else + else if (GetNumberOfInputAudioBuffers() != 0) { SetAudioInputBuffer(0, left); } @@ -396,11 +433,11 @@ void Lv2Effect::SetAudioInputBuffer(float *left) void Lv2Effect::SetAudioInputBuffers(float *left, float *right) { - if (GetNumberOfInputAudioPorts() == 1) + if (GetNumberOfInputAudioBuffers() == 1) { SetAudioInputBuffer(0, left); } - else + else if (GetNumberOfInputAudioBuffers() > 1) { SetAudioInputBuffer(0, left); SetAudioInputBuffer(1, right); @@ -410,8 +447,15 @@ void Lv2Effect::SetAudioInputBuffers(float *left, float *right) void Lv2Effect::SetAudioOutputBuffer(int index, float *buffer) { this->outputAudioBuffers[index] = buffer; - int pluginIndex = this->outputAudioPortIndices[index]; - lilv_instance_connect_port(pInstance, pluginIndex, buffer); + + if (this->inputAudioPortIndices.size() != 0) // i.e. we're not mixing a zero-input control + { + if ((size_t)index < this->inputAudioPortIndices.size()) + { + int pluginIndex = this->outputAudioPortIndices[index]; + lilv_instance_connect_port(pInstance, pluginIndex, buffer); + } + } } int Lv2Effect::GetControlIndex(const std::string &key) const @@ -452,7 +496,7 @@ void Lv2Effect::Activate() void Lv2Effect::AssignUnconnectedPorts() { - for (int i = 0; i < this->GetNumberOfInputAudioPorts(); ++i) + for (size_t i = 0; i < this->inputAudioPortIndices.size(); ++i) { if (GetAudioInputBuffer(i) == nullptr) { @@ -462,14 +506,16 @@ void Lv2Effect::AssignUnconnectedPorts() lilv_instance_connect_port(pInstance, pluginIndex, buffer); } } - for (int i = 0; i < this->GetNumberOfOutputAudioPorts(); ++i) - { - if (GetAudioOutputBuffer(i) == nullptr) - { - int pluginIndex = this->outputAudioPortIndices[i]; - float *buffer = bufferPool.AllocateBuffer(pHost->GetMaxAudioBufferSize()); - lilv_instance_connect_port(pInstance, pluginIndex, buffer); + if (this->inputAudioPortIndices.size() != 0) // i.e. not using a mix buffer. + { + for (size_t i = 0; i < this->outputAudioPortIndices.size(); ++i) + { + if (GetAudioOutputBuffer(i) == nullptr) + { + float *buffer = bufferPool.AllocateBuffer(pHost->GetMaxAudioBufferSize()); + int pluginIndex = this->outputAudioPortIndices[i]; + } } } for (int i = 0; i < this->GetNumberOfInputAtomPorts(); ++i) @@ -529,6 +575,61 @@ void Lv2Effect::Run(uint32_t samples, RealtimeRingBufferWriter *realtimeRingBuff // relay worker response worker->EmitResponses(); } + // for zero-input plugins, mix the plugin output with the input signal. + if (this->inputAudioPortIndices.size() == 0) + { + + // mix a zero input controls into the output buffer using a triangular mix curve. + float pluginLevel = std::max(1.0f, this->zeroInputMix * 2); + float inputLevel = std::max(1.0f, (1 - this->zeroInputMix) * 2); + + // case + // 1 plugin output into 1 output. + // 2 plugin outputs into 2 outputs. + if (this->outputAudioBuffers.size() == this->outputMixBuffers.size()) + { + for (size_t i = 0; i < this->outputMixBuffers.size(); ++i) + { + float *__restrict input; + if (i >= this->inputAudioBuffers.size()) { + if (this->inputAudioBuffers.size() == 0) + { + break; + } + input = this->inputAudioBuffers[0]; + } else { + input = this->inputAudioBuffers[i]; + } + float *__restrict pluginOutput = this->outputMixBuffers[i].data(); + float *__restrict finalOutput = this->outputAudioBuffers[i]; + + for (uint32_t i = 0; i < samples; ++i) + { + finalOutput[i] = input[i] * inputLevel + pluginOutput[i] * pluginLevel; + } + } + } + else if (this->outputAudioPortIndices.size() == 1 && this->outputAudioBuffers.size() == 2) + { + // 1 plugin output into 2 outputs. + float *__restrict pluginOutput = this->outputMixBuffers[0].data(); + for (size_t i = 0; i < this->outputMixBuffers.size(); ++i) + { + float *__restrict input = this->inputAudioBuffers[i]; + float *__restrict finalOutput = this->outputAudioBuffers[i]; + + for (uint32_t i = 0; i < samples; ++i) + { + finalOutput[i] = input[i] * inputLevel + pluginOutput[i] * pluginLevel; + } + } + } + else + { + // e.g. 2 plugin outputs into 1 output (should never happen) + std::runtime_error("Internal error 0xEA48"); + } + } // do soft bypass. if (this->bypassSamplesRemaining == 0) diff --git a/src/Lv2Effect.hpp b/src/Lv2Effect.hpp index a6d5417..bfb715b 100644 --- a/src/Lv2Effect.hpp +++ b/src/Lv2Effect.hpp @@ -96,6 +96,7 @@ namespace pipedal uint64_t maxInputControlPort = 0; std::vector isInputControlPort; std::vector defaultInputControlValues; + std::vector isInputTriggerControlPort;; virtual std::string GetUri() const { return info->uri(); } @@ -193,9 +194,12 @@ namespace pipedal bool requestStateChangedNotification = false; + float zeroInputMix = 0.5f; + int actualAudioInputs = 0; + int actualAudioOutputs = 0; + std::vector> outputMixBuffers; void BypassTo(float value); - public: // non RT-thread use only. @@ -242,18 +246,29 @@ namespace pipedal bool HasErrorMessage() const { return this->hasErrorMessage; } const char*TakeErrorMessage() { this->hasErrorMessage = false; return this->errorMessage; } + virtual void PrepareNoInputEffect(int numberOfInputs,size_t maxBufferSize) override; + + virtual void ResetAtomBuffers(); virtual uint64_t GetInstanceId() const { return instanceId; } virtual int GetNumberOfInputAudioPorts() const { return inputAudioPortIndices.size(); } virtual int GetNumberOfOutputAudioPorts() const { return outputAudioPortIndices.size(); } + virtual int GetNumberOfInputAtomPorts() const { return inputAtomPortIndices.size(); } + virtual int GetNumberOfOutputAtomPorts() const { return outputAtomPortIndices.size(); } virtual int GetNumberOfMidiInputPorts() const { return inputMidiPortIndices.size(); } virtual int GetNumberOfMidiOutputPorts() const { return outputMidiPortIndices.size(); } + + + virtual int GetNumberOfInputAudioBuffers() const { return this->inputAudioBuffers.size(); } + virtual int GetNumberOfOutputAudioBuffers() const {return this->outputAudioBuffers.size(); } + virtual void SetAudioInputBuffer(int index, float *buffer); virtual float *GetAudioInputBuffer(int index) const { return this->inputAudioBuffers[index]; } + virtual void SetAudioInputBuffer(float *buffer); virtual void SetAudioInputBuffers(float *left, float *right); diff --git a/src/Lv2Pedalboard.cpp b/src/Lv2Pedalboard.cpp index 44d8697..2aa7806 100644 --- a/src/Lv2Pedalboard.cpp +++ b/src/Lv2Pedalboard.cpp @@ -121,6 +121,7 @@ std::vector Lv2Pedalboard::PrepareItems( if (pLv2Effect) { + if (pLv2Effect->HasErrorMessage()) { std::string error = pLv2Effect->TakeErrorMessage(); @@ -131,14 +132,15 @@ std::vector Lv2Pedalboard::PrepareItems( pEffect = pLv2Effect; uint64_t instanceId = pEffect->GetInstanceId(); + pLv2Effect->PrepareNoInputEffect(inputBuffers.size(),pHost->GetMaxAudioBufferSize()); if (inputBuffers.size() == 1) { - if (pLv2Effect->GetNumberOfInputAudioPorts() == 1) + if (pLv2Effect->GetNumberOfInputAudioBuffers() == 1) { pLv2Effect->SetAudioInputBuffer(0, inputBuffers[0]); } - else + else if (pLv2Effect->GetNumberOfInputAudioBuffers() >= 2) { pLv2Effect->SetAudioInputBuffer(0, inputBuffers[0]); pLv2Effect->SetAudioInputBuffer(1, inputBuffers[0]); @@ -146,13 +148,13 @@ std::vector Lv2Pedalboard::PrepareItems( } else { - if (pLv2Effect->GetNumberOfInputAudioPorts() == 1) + if (pLv2Effect->GetNumberOfInputAudioBuffers() == 1) { pLv2Effect->SetAudioInputBuffer(0, inputBuffers[0]); auto inputBuffer = inputBuffers[0]; } - else + else if (pLv2Effect->GetNumberOfInputAudioBuffers() >= 2) { pLv2Effect->SetAudioInputBuffer(0, inputBuffers[0]); pLv2Effect->SetAudioInputBuffer(1, inputBuffers[1]); @@ -167,6 +169,33 @@ std::vector Lv2Pedalboard::PrepareItems( { pLv2Effect->Run(frames, this->ringBufferWriter); }); + + // Reset any trigger controls to default state after processing + if (pLv2Effect->IsLv2Effect()) + { + Lv2Effect*lv2Effect = (Lv2Effect*)pLv2Effect; + auto pluginInfo = pHost->GetPluginInfo(item.uri()); + if (pluginInfo) { + for (auto control: pluginInfo->ports()) + { + if (control->trigger_property() && control->is_input() && control->is_control_port()) + { + int controlIndex = lv2Effect->GetControlIndex(control->symbol()); + if (controlIndex >= 0) + { + float defaultValue = control->default_value(); + this->processActions.push_back( + [pLv2Effect,controlIndex,defaultValue](int32_t frames) { + pLv2Effect->SetControl(controlIndex,defaultValue); + } + ); + } + + } + } + } + + } } } if (pEffect) @@ -176,38 +205,16 @@ std::vector Lv2Pedalboard::PrepareItems( std::vector effectOutput; -#ifdef RECYCLE_AUDIO_BUFFERS - // can't do this anymore if we're going to do pop-less bypbass. - if (pEffect->GetNumberOfOutputAudioPorts() == 1) - { - float *pLeft = inputBuffers[0]; - effectOutput.push_back(pLeft); - } - else - { - if (inputBuffers.size() == 1) - { - effectOutput.push_back(inputBuffers[0]); - effectOutput.push_back(CreateNewAudioBuffer()); - } - else - { - effectOutput.push_back(inputBuffers[0]); - effectOutput.push_back(inputBuffers[1]); - } - } -#else - if (pEffect->GetNumberOfOutputAudioPorts() == 1) + if (pEffect->GetNumberOfOutputAudioBuffers() == 1) { effectOutput.push_back(CreateNewAudioBuffer()); } - else + else if (pEffect->GetNumberOfOutputAudioBuffers() >= 2) { effectOutput.push_back(CreateNewAudioBuffer()); effectOutput.push_back(CreateNewAudioBuffer()); } -#endif - for (size_t i = 0; i < effectOutput.size(); ++i) + for (size_t i = 0; i < effectOutput.size(); ++i) { pEffect->SetAudioOutputBuffer(i, effectOutput[i]); } @@ -307,13 +314,21 @@ void Lv2Pedalboard::PrepareMidiMap(const PedalboardItem &pedalboardItem) mapping.controlIndex = controlIndex; mapping.midiBinding = binding; mapping.instanceId = pedalboardItem.instanceId(); - if (pPortInfo->IsSwitch()) + + if (pPortInfo->trigger_property()) { - mapping.mappingType = binding.switchControlType() == LATCH_CONTROL_TYPE ? MappingType::Latched : MappingType::Momentary; + mapping.mappingType = MidiControlType::Trigger; + } else if (pPortInfo->IsSwitch()) + { + mapping.mappingType = MidiControlType::Toggle; } - else + else if (pPortInfo->enumeration_property()) { - mapping.mappingType = binding.linearControlType() == LATCH_CONTROL_TYPE ? MappingType::Linear : MappingType::Circular; + mapping.mappingType = MidiControlType::Select; + } + else + { + mapping.mappingType = MidiControlType::Dial; } if (binding.bindingType() == BINDING_TYPE_NOTE) { @@ -473,21 +488,21 @@ void Lv2Pedalboard::ComputeVus(RealtimeVuBuffers *vuConfiguration, uint32_t samp { auto effect = this->realtimeEffects[index]; - if (effect->GetNumberOfInputAudioPorts() == 1) + if (effect->GetNumberOfInputAudioBuffers() == 1) { pUpdate->AccumulateInputs(effect->GetAudioInputBuffer(0), samples); } - else + else if (effect->GetNumberOfInputAudioBuffers() >= 2) { pUpdate->AccumulateInputs( effect->GetAudioInputBuffer(0), effect->GetAudioInputBuffer(1), samples); } - if (effect->GetNumberOfOutputAudioPorts() == 1) + if (effect->GetNumberOfOutputAudioBuffers() == 1) { pUpdate->AccumulateOutputs(effect->GetAudioOutputBuffer(0), samples); } - else + else if (effect->GetNumberOfOutputAudioBuffers() >= 2) { pUpdate->AccumulateOutputs( effect->GetAudioOutputBuffer(0), @@ -671,46 +686,108 @@ void Lv2Pedalboard::OnMidiMessage(size_t size, uint8_t *message, { switch (mapping.mappingType) { - case MappingType::Circular: - case MappingType::Linear: + case MidiControlType::Trigger: { - float thisRange = (mapping.midiBinding.maxValue() - mapping.midiBinding.minValue()) * range + mapping.midiBinding.minValue(); - float value = mapping.pPortInfo->rangeToValue(thisRange); - this->SetControlValue(mapping.effectIndex, mapping.controlIndex, value); - pfnCallback(callbackHandle, mapping.instanceId, mapping.pPortInfo->index(), value); - break; - } - case MappingType::Latched: - { - range = std::round(range); - - if (!mapping.hasLastValue) + bool triggered = false; + if (mapping.midiBinding.switchControlType() == SwitchControlTypeT::TRIGGER_ON_RISING_EDGE + || mapping.midiBinding.bindingType() == BINDING_TYPE_NOTE + ) { - mapping.lastValue = 0; - mapping.hasLastValue = true; + if (mapping.lastValue < range) + { + if (!mapping.lastValueIncreasing) { + triggered = true; + } + mapping.lastValueIncreasing = true; + mapping.lastValue = range; + } else { + mapping.lastValueIncreasing = false; + mapping.lastValue = range; + } + } else { + triggered = true; } - if (range != mapping.lastValue && range == 1) + if (triggered) { IEffect *pEffect = this->realtimeEffects[mapping.effectIndex]; + float value = mapping.pPortInfo->max_value(); + if (value == mapping.pPortInfo->default_value()) + { + value = mapping.pPortInfo->min_value(); + } + this->SetControlValue(mapping.effectIndex, mapping.controlIndex, value); + // do NOT notify anyone! + } + break; + } + case MidiControlType::Toggle: + { + bool triggered = false; + + range = std::round(range); + + if (mapping.midiBinding.switchControlType() == SwitchControlTypeT::TOGGLE_ON_RISING_EDGE) + { + if (range > mapping.lastValue) + { + if (!mapping.lastValueIncreasing) { + triggered = true; + } + mapping.lastValueIncreasing = true; + mapping.lastValue = range; + } else { + mapping.lastValueIncreasing = false; + mapping.lastValue = range; + } + if (triggered) + { + IEffect *pEffect = this->realtimeEffects[mapping.effectIndex]; + float currentValue = pEffect->GetControlValue(mapping.controlIndex); + + currentValue = currentValue == 0 ? 1 : 0; + pEffect->SetControl(mapping.controlIndex, currentValue); + pfnCallback(callbackHandle, mapping.instanceId, mapping.pPortInfo->index(), currentValue); + } + } else if (mapping.midiBinding.switchControlType() == SwitchControlTypeT::TOGGLE_ON_VALUE) + { + triggered = true; + mapping.lastValue = range; + IEffect *pEffect = this->realtimeEffects[mapping.effectIndex]; float currentValue = pEffect->GetControlValue(mapping.controlIndex); - currentValue = currentValue == 0 ? 1 : 0; + if (currentValue != range) + { + pEffect->SetControl(mapping.controlIndex, range); + pfnCallback(callbackHandle, mapping.instanceId, mapping.pPortInfo->index(), range); + } + + } else { + // any control value toggles. + triggered = true; + mapping.lastValue = range; + IEffect *pEffect = this->realtimeEffects[mapping.effectIndex]; + float currentValue = pEffect->GetControlValue(mapping.controlIndex); + currentValue = currentValue == 0 ? 1: 0; pEffect->SetControl(mapping.controlIndex, currentValue); pfnCallback(callbackHandle, mapping.instanceId, mapping.pPortInfo->index(), currentValue); } - mapping.lastValue = range; break; } - case MappingType::Momentary: + case MidiControlType::Select: + case MidiControlType::Dial: { IEffect *pEffect = this->realtimeEffects[mapping.effectIndex]; - float value = mapping.pPortInfo->rangeToValue(range); - if (pEffect->GetControlValue(mapping.controlIndex) != value) + range = mapping.midiBinding.adjustRange(range); + float currentValue = mapping.pPortInfo->rangeToValue(range); + if (pEffect->GetControlValue(mapping.controlIndex) != currentValue) { - this->SetControlValue(mapping.effectIndex, mapping.controlIndex, value); - pfnCallback(callbackHandle, mapping.instanceId, mapping.pPortInfo->index(), value); + this->SetControlValue(mapping.effectIndex, mapping.controlIndex,currentValue); + pfnCallback(callbackHandle, mapping.instanceId, mapping.pPortInfo->index(), currentValue); } break; } + case MidiControlType::None: + default: + break; } } } diff --git a/src/Lv2Pedalboard.hpp b/src/Lv2Pedalboard.hpp index ee949f8..3ddcf29 100644 --- a/src/Lv2Pedalboard.hpp +++ b/src/Lv2Pedalboard.hpp @@ -72,12 +72,13 @@ namespace pipedal RealtimeRingBufferWriter *ringBufferWriter; - enum class MappingType + enum class MidiControlType { - Linear, - Circular, - Momentary, - Latched, + None, + Select, + Dial, + Toggle, + Trigger }; class MidiMapping { @@ -89,8 +90,9 @@ namespace pipedal int controlIndex = -1; int key; // key to the note or control. internal use only. bool hasLastValue = false; - float lastValue = -1; - MappingType mappingType; + bool lastValueIncreasing = false; + float lastValue = 0; + MidiControlType mappingType; MidiBinding midiBinding; }; diff --git a/src/Lv2PluginChangeMonitor.cpp b/src/Lv2PluginChangeMonitor.cpp index b4b57f3..ea27e4a 100644 --- a/src/Lv2PluginChangeMonitor.cpp +++ b/src/Lv2PluginChangeMonitor.cpp @@ -44,7 +44,7 @@ void Lv2PluginChangeMonitor::Shutdown() { terminateThread = true; uint64_t val = 1; - write(shutdown_eventfd,(void*)&val, sizeof(val)); + auto _ = write(shutdown_eventfd,(void*)&val, sizeof(val)); monitorThread->join(); monitorThread = nullptr; close(shutdown_eventfd); diff --git a/src/MidiBinding.cpp b/src/MidiBinding.cpp index c234e4a..cf29f1b 100644 --- a/src/MidiBinding.cpp +++ b/src/MidiBinding.cpp @@ -17,12 +17,41 @@ // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -#include "pch.h" #include "MidiBinding.hpp" +#include "MapFeature.hpp" using namespace pipedal; +MidiChannelBinding MidiChannelBinding::DefaultForMissingValue() +{ + MidiChannelBinding result {}; + + return result; +} + + +void MidiChannelBinding::Prepare(MapFeature &mapFeature) +{ + midiDeviceUrids.resize(0); + midiDeviceUrids.reserve(midiDevices_.size()); + + for (const auto&midiDevice: midiDevices_) + { + midiDeviceUrids.push_back(mapFeature.GetUrid(midiDevice.c_str())); + } +} + + +JSON_MAP_BEGIN(MidiChannelBinding) + JSON_MAP_REFERENCE(MidiChannelBinding,deviceSelection) + JSON_MAP_REFERENCE(MidiChannelBinding,midiDevices) + JSON_MAP_REFERENCE(MidiChannelBinding,channel) + JSON_MAP_REFERENCE(MidiChannelBinding,acceptProgramChanges) + JSON_MAP_REFERENCE(MidiChannelBinding,acceptCommonMessages) +JSON_MAP_END() + + JSON_MAP_BEGIN(MidiBinding) JSON_MAP_REFERENCE(MidiBinding,channel) JSON_MAP_REFERENCE(MidiBinding,symbol) diff --git a/src/MidiBinding.hpp b/src/MidiBinding.hpp index 6aa0256..f66c14e 100644 --- a/src/MidiBinding.hpp +++ b/src/MidiBinding.hpp @@ -20,10 +20,16 @@ #pragma once #include "json.hpp" +#include +#include +#include +#include + namespace pipedal { +class MapFeature; #define GETTER_SETTER_REF(name) \ const decltype(name##_)& name() const { return name##_;} \ @@ -33,6 +39,9 @@ namespace pipedal { decltype(name##_)& name() { return name##_;} \ const decltype(name##_)& name() const { return name##_;} + //void name(decltype(const name##_) &value) { name##_ = value; } + //void name(decltype(const name##_) &&value) { name##_ = std::move(value); } + #define GETTER_SETTER(name) \ @@ -48,10 +57,20 @@ namespace pipedal { const int LINEAR_CONTROL_TYPE = 0; const int CIRCULAR_CONTROL_TYPE = 1; - const int LATCH_CONTROL_TYPE = 0; - const int MOMENTARY_CONTROL_TYPE = 1; +enum class SwitchControlTypeT { + TRIGGER_ON_RISING_EDGE = 0, + TRIGGER_ON_ANY = 2, + TOGGLE_ON_RISING_EDGE = 0, + TOGGLE_ON_VALUE = 1, + TOGGLE_ON_ANY = 2, + + LATCH_CONTROL_TYPE = 0, + MOMENTARY_CONTROL_TYPE = 1, + +}; + class MidiBinding { public: @@ -65,7 +84,7 @@ private: float maxValue_ = 1; float rotaryScale_ = 1; int linearControlType_ = LINEAR_CONTROL_TYPE; - int switchControlType_ = LATCH_CONTROL_TYPE; + int switchControlType_ = (int)SwitchControlTypeT::LATCH_CONTROL_TYPE; public: static MidiBinding SystemBinding(const std::string&symbol) { @@ -96,12 +115,98 @@ public: GETTER_SETTER(maxValue); GETTER_SETTER(rotaryScale); GETTER_SETTER(linearControlType); - GETTER_SETTER(switchControlType); + SwitchControlTypeT switchControlType() const { return (SwitchControlTypeT)switchControlType_; } + void switchControlType(SwitchControlTypeT value) { switchControlType_ = (int)value; } + + + float adjustRange(float range) + { + return maxValue_*range+minValue_*(1.0f-range); + } DECLARE_JSON_MAP(MidiBinding); }; + +enum class MidiDeviceSelection { + DeviceAny = 0, + DeviceNone = 1, + DeviceList = 2 +}; + +class MidiChannelBinding { +public: + static constexpr std::int32_t CHANNEL_OMNI = -1; +private: + int32_t deviceSelection_ = (int32_t)(MidiDeviceSelection::DeviceAny); + + std::vector midiDevices_; + + std::vector midiDeviceUrids; + + std::int32_t channel_ = CHANNEL_OMNI; + bool acceptProgramChanges_ = true; + bool acceptCommonMessages_ = true; +public: + MidiDeviceSelection deviceSelection() const { return (MidiDeviceSelection)deviceSelection_; } + void deviceSelection(MidiDeviceSelection value) { deviceSelection_ = (int32_t)value; } + GETTER_SETTER_VEC(midiDevices); + GETTER_SETTER(channel); + GETTER_SETTER(acceptProgramChanges); + GETTER_SETTER(acceptCommonMessages); + + void Prepare(MapFeature &mapFeature); + + static MidiChannelBinding DefaultForMissingValue(); + + bool WantsMidiMessage(uint8_t midi_cc0,uint8_t midi_cc1, uint8_t midi_cc2); + bool WantProgramChange(uint8_t midi_cc0,uint8_t midi_cc1); + + // must call Prepare first. + bool WantsDevice(LV2_URID deviceUrid); + + + DECLARE_JSON_MAP(MidiChannelBinding); + +}; +/////////////////////////////////////// + +inline bool MidiChannelBinding::WantsMidiMessage(uint8_t midi_cc0,uint8_t midi_cc1, uint8_t midi_cc2) +{ + if (midi_cc0 < 0xF0) + { + if (channel_ < 0) return true; + + return midi_cc0 & 0x0F == channel_; + } else { + return acceptCommonMessages_; + } +} + +inline bool MidiChannelBinding::WantProgramChange(uint8_t midi_cc0,uint8_t midi_cc1) +{ + if (!acceptProgramChanges_) + { + return false; + } + if (channel_ < 0) return true; + return midi_cc0 & 0x0F == channel_; +} + +inline bool MidiChannelBinding::WantsDevice(LV2_URID deviceUrid) +{ + if (this->midiDeviceUrids.size() == 0) return true; + for (LV2_URID urid: midiDeviceUrids) + { + if (urid == deviceUrid) return true; + } + return false; +} + +////////////////////////////////////////// + + #undef GETTER_SETTER_REF #undef GETTER_SETTER_VEC #undef GETTER_SETTER diff --git a/src/MimeTypes.cpp b/src/MimeTypes.cpp index 12adde9..702580d 100644 --- a/src/MimeTypes.cpp +++ b/src/MimeTypes.cpp @@ -20,99 +20,22 @@ #include "MimeTypes.hpp" #include "ss.hpp" +#include +#include using namespace pipedal; -void MimeTypes::MaybeInitialize() -{ - if (!initialized) - { - initialized = true; - AddMimeType("MP3", "audio/mpeg"); - AddMimeType("MPGA", "audio/mpeg"); - AddMimeType("M4A", "audio/mp4"); - AddMimeType("WAV", "audio/x-wav"); - AddMimeType("WAV", "audio/wav"); - AddMimeType("AMR", "audio/amr"); - AddMimeType("AWB", "audio/amr-wb"); - AddMimeType("WMA", "audio/x-ms-wma"); - AddMimeType("OGG", "audio/ogg"); - AddMimeType("OGG", "application/ogg"); - AddMimeType("OGA", "application/ogg"); - AddMimeType("AAC", "audio/aac"); - AddMimeType("AAC", "audio/aac-adts"); - AddMimeType("MKA", "audio/x-matroska"); - AddMimeType("MID", "audio/midi"); - AddMimeType("MIDI", "audio/midi"); - AddMimeType("XMF", "audio/midi"); - AddMimeType("RTTTL", "audio/midi"); - AddMimeType("SMF", "audio/sp-midi"); - AddMimeType("IMY", "audio/imelody"); - AddMimeType("RTX", "audio/midi"); - AddMimeType("OTA", "audio/midi"); - AddMimeType("MXMF", "audio/midi"); - - AddMimeType("MPEG", "video/mpeg"); - AddMimeType("MPG", "video/mpeg"); - AddMimeType("MP4", "video/mp4"); - AddMimeType("M4V", "video/mp4"); - AddMimeType("3GP", "video/3gpp"); - AddMimeType("3GPP", "video/3gpp"); - AddMimeType("3G2", "video/3gpp2"); - AddMimeType("3GPP2", "video/3gpp2"); - AddMimeType("MKV", "video/x-matroska"); - AddMimeType("WEBM", "video/webm"); - AddMimeType("TS", "video/mp2ts"); - AddMimeType("AVI", "video/avi"); - AddMimeType("WMV", "video/x-ms-wmv"); - AddMimeType("ASF", "video/x-ms-asf"); - AddMimeType("JPG", "image/jpeg"); - AddMimeType("JPEG", "image/jpeg"); - AddMimeType("GIF", "image/gif"); - AddMimeType("PNG", "image/png"); - AddMimeType("BMP", "image/x-ms-bmp"); - AddMimeType("WBMP", "image/vnd.wap.wbmp"); - AddMimeType("WEBP", "image/webp"); - - AddMimeType("M3U", "audio/x-mpegurl"); - AddMimeType("M3U", "application/x-mpegurl"); - AddMimeType("PLS", "audio/x-scpls"); - AddMimeType("WPL", "application/vnd.ms-wpl"); - AddMimeType("M3U8", "application/vnd.apple.mpegurl"); - AddMimeType("M3U8", "audio/mpegurl"); - AddMimeType("M3U8", "audio/x-mpegurl"); - AddMimeType("FL", "application/x-android-drm-fl"); - AddMimeType("TXT", "text/plain"); - AddMimeType("HTM", "text/html"); - AddMimeType("HTML", "text/html"); - AddMimeType("PDF", "application/pdf"); - AddMimeType("DOC", "application/msword"); - AddMimeType("XLS", "application/vnd.ms-excel"); - AddMimeType("PPT", "application/mspowerpoint"); - AddMimeType("FLAC", "audio/x-flac"); - AddMimeType("FLAC", "audio/flac"); - AddMimeType("ZIP", "application/zip"); - AddMimeType("MPG", "video/mp2p"); - AddMimeType("MPEG", "video/mp2p"); - - } -} - -static MimeTypes staticContruct; - static std::string empty; -const std::string& MimeTypes::MimeTypeFromExtension(const std::string &extension) +const std::string& MimeTypes::MimeTypeFromExtension(const std::string &extension) const { - MaybeInitialize(); auto iter = extensionToMimeType.find(extension); if (iter == extensionToMimeType.end()) return empty; return iter->second; } -const std::string& MimeTypes::ExtensionFromMimeType(const std::string &mimeType) +const std::string& MimeTypes::ExtensionFromMimeType(const std::string &mimeType) const { - MaybeInitialize(); auto iter = mimeTypeToExtension.find(mimeType); if (iter == mimeTypeToExtension.end()) return empty; return iter->second; @@ -135,27 +58,132 @@ static std::string toLower(const std::string&value) return result; } -void MimeTypes::AddMimeType(const std::string&extension_, const std::string&mimeType) +void MimeTypes::AddMimeType(const std::string&extension_, const std::string&mimeType) { std::string extension = SS("." << toLower(extension_)); + mimeTypeToExtensions[mimeType].insert(extension); mimeTypeToExtension[mimeType] = extension; extensionToMimeType[extension] = mimeType; - if (mimeType.starts_with("audio/")) + if (mimeType.starts_with("audio/midi")) { + midiExtensions.insert(extension); + } else if (mimeType.starts_with("audio/")) + { + mimeTypeToExtensions["audio/*"].insert(extension); audioExtensions.insert(extension); } if (mimeType.starts_with("video/")) { + mimeTypeToExtensions["video/*"].insert(extension); videoExtensions.insert(extension); } } -std::map MimeTypes::mimeTypeToExtension; -std::map MimeTypes::extensionToMimeType; -std::set MimeTypes::audioExtensions; -std::set MimeTypes::videoExtensions; -bool MimeTypes::initialized; +const std::set &MimeTypes::AudioExtensions() const +{ + return audioExtensions; + +} +const std::set &MimeTypes::VideoExtensions() const +{ + return videoExtensions; +} +const std::set &MimeTypes::MidiExtensions() const +{ + return midiExtensions; +} + +static std::mutex m_instanceMutex; +static std::unique_ptr m_instance; + + +MimeTypes::MimeTypes() +{ + AddMimeType("MP3", "audio/mpeg"); + AddMimeType("MPGA", "audio/mpeg"); + AddMimeType("M4A", "audio/mp4"); + AddMimeType("WAV", "audio/x-wav"); + AddMimeType("WAV", "audio/wav"); + AddMimeType("AMR", "audio/amr"); + AddMimeType("AWB", "audio/amr-wb"); + AddMimeType("WMA", "audio/x-ms-wma"); + AddMimeType("OGG", "audio/ogg"); + AddMimeType("OGG", "application/ogg"); + AddMimeType("OGA", "application/ogg"); + AddMimeType("AAC", "audio/aac"); + AddMimeType("AAC", "audio/aac-adts"); + AddMimeType("MKA", "audio/x-matroska"); + AddMimeType("MID", "audio/midi"); + AddMimeType("MIDI", "audio/midi"); + AddMimeType("XMF", "audio/midi"); + AddMimeType("RTTTL", "audio/midi"); + AddMimeType("SMF", "audio/sp-midi"); + AddMimeType("IMY", "audio/imelody"); + AddMimeType("RTX", "audio/midi"); + AddMimeType("OTA", "audio/midi"); + AddMimeType("MXMF", "audio/midi"); + + AddMimeType("MPEG", "video/mpeg"); + AddMimeType("MPG", "video/mpeg"); + AddMimeType("MP4", "video/mp4"); + AddMimeType("M4V", "video/mp4"); + AddMimeType("3GP", "video/3gpp"); + AddMimeType("3GPP", "video/3gpp"); + AddMimeType("3G2", "video/3gpp2"); + AddMimeType("3GPP2", "video/3gpp2"); + AddMimeType("MKV", "video/x-matroska"); + AddMimeType("WEBM", "video/webm"); + AddMimeType("TS", "video/mp2ts"); + AddMimeType("AVI", "video/avi"); + AddMimeType("WMV", "video/x-ms-wmv"); + AddMimeType("ASF", "video/x-ms-asf"); + AddMimeType("JPG", "image/jpeg"); + AddMimeType("JPEG", "image/jpeg"); + AddMimeType("GIF", "image/gif"); + AddMimeType("PNG", "image/png"); + AddMimeType("BMP", "image/x-ms-bmp"); + AddMimeType("WBMP", "image/vnd.wap.wbmp"); + AddMimeType("WEBP", "image/webp"); + + AddMimeType("M3U", "audio/x-mpegurl"); + AddMimeType("M3U", "application/x-mpegurl"); + AddMimeType("PLS", "audio/x-scpls"); + AddMimeType("WPL", "application/vnd.ms-wpl"); + AddMimeType("M3U8", "application/vnd.apple.mpegurl"); + AddMimeType("M3U8", "audio/mpegurl"); + AddMimeType("M3U8", "audio/x-mpegurl"); + AddMimeType("FL", "application/x-android-drm-fl"); + AddMimeType("TXT", "text/plain"); + AddMimeType("HTM", "text/html"); + AddMimeType("HTML", "text/html"); + AddMimeType("PDF", "application/pdf"); + AddMimeType("DOC", "application/msword"); + AddMimeType("XLS", "application/vnd.ms-excel"); + AddMimeType("PPT", "application/mspowerpoint"); + AddMimeType("FLAC", "audio/x-flac"); + AddMimeType("FLAC", "audio/flac"); + AddMimeType("ZIP", "application/zip"); + AddMimeType("MPG", "video/mp2p"); + AddMimeType("MPEG", "video/mp2p"); + +} + +const MimeTypes&MimeTypes::instance() +{ + std::lock_guard lock { m_instanceMutex}; + if (!m_instance) { + m_instance = std::unique_ptr(new MimeTypes()); + } + return (*m_instance); +} + +const bool MimeTypes::IsValidExtension(const std::string&mimeType, const std::string&extension) const +{ + auto iter = mimeTypeToExtensions.find(mimeType); + if (iter == mimeTypeToExtensions.end()) return false; + return iter->second.contains(extension); +} diff --git a/src/MimeTypes.hpp b/src/MimeTypes.hpp index d7fd8c9..f38883d 100644 --- a/src/MimeTypes.hpp +++ b/src/MimeTypes.hpp @@ -25,17 +25,26 @@ namespace pipedal { class MimeTypes { - public: - - static const std::string& MimeTypeFromExtension(const std::string &extension); - static const std::string& ExtensionFromMimeType(const std::string &mimeType); private: - static void AddMimeType(const std::string&extension, const std::string&mimeType); - static std::map mimeTypeToExtension; - static std::map extensionToMimeType; - static std::set audioExtensions; - static std::set videoExtensions; - static void MaybeInitialize(); - static bool initialized; + MimeTypes(); + public: + static const MimeTypes&instance(); + + const std::string& MimeTypeFromExtension(const std::string &extension) const; + // the best possible extension if we had to pick one. + const std::string& ExtensionFromMimeType(const std::string &mimeType) const; + // All possible extensions that other people might have picked. + const std::set &AudioExtensions() const; + const std::set &VideoExtensions() const; + const std::set &MidiExtensions() const; + const bool IsValidExtension(const std::string&mimeType, const std::string&extension) const; + private: + void AddMimeType(const std::string&extension, const std::string&mimeType); + std::map> mimeTypeToExtensions; + std::map mimeTypeToExtension; + std::map extensionToMimeType; + std::set audioExtensions; + std::set midiExtensions; + std::set videoExtensions; }; } \ No newline at end of file diff --git a/src/ModFileTypes.cpp b/src/ModFileTypes.cpp index e9c6737..05a24cb 100644 --- a/src/ModFileTypes.cpp +++ b/src/ModFileTypes.cpp @@ -22,34 +22,61 @@ #include #include #include "ss.hpp" +#include "MimeTypes.hpp" using namespace pipedal; -const std::vector ModFileTypes::ModDirectories = + +static std::mutex gModDirectoriesMutex; +static std::unique_ptr< std::vector > gModDirectories; + + +static std::vector *CreateModDirectories() +{ + return new std::vector( { {"audioloop", "shared/audio/Loops", "Loops", {"audio/*"}}, // Audio Loops, meant to be used for looper-style plugins - //"audiorecording","shared/audio/Audio Recordings", {"audio/*"}}, : Audio Recordings, triggered by plugins and stored in the unit + {"audiorecording","shared/audio/Audio Recordings", "Audio Recordings",{"audio/*"}}, // Audio Recordings, triggered by plugins and stored in the unit {"audiosample", "shared/audio/Samples", "Samples", {"audio/*"}}, // One-shot Audio Samples, meant to be used for sampler-style plugins {"audiotrack", "shared/audio/Tracks", "Tracks", {"audio/*"}}, // Audio Tracks, meant to be used as full-performance/song or backtrack {"cabsim", "CabIR", "Cab IRs", {"audio/*"}}, // Speaker Cabinets, meant as small IR audio files - /// - h2drumkit: Hydrogen Drumkits, must use h2drumkit file extension + {"h2drumkit", "shared/h2drumkit", "Hydrogen Drumkits",{".h2drumkit"}}, // Hydrogen Drumkits, must use h2drumkit file extension" {"ir", "ReverbImpulseFiles", "Impulse Responses", {"audio/*"}}, // Impulse Responses {"midiclip", "shared/midiClips", "MIDI Clips", {".mid", ".midi"}}, // MIDI Clips, to be used in sync with host tempo, must have mid or midi file extension {"midisong", "shared/midiSongs", "MIDI Songs", {".mid", ".midi"}}, // MIDI Songs, meant to be used as full-performance/song or backtrack - {"sf2", "shared/sf2", "Sound Fonts", {"sf2", "sf3"}}, // SF2 Instruments, must have sf2 or sf3 file extension - {"sfz", "shared/sfz", "Sfz Files", {"sfz"}}, // SFZ Instruments, must have sfz file extension + {"sf2", "shared/sf2", "Sound Fonts", {".sf2", ".sf3"}}, // SF2 Instruments, must have sf2 or sf3 file extension + {"sfz", "shared/sfz", "Sfz Files", {".sfz"}}, // SFZ Instruments, must have sfz file extension // extensions observed in the field. - {"audio", "shared/audio", "Audio", {"audio/*"}}, // all audio files (Ratatoille) - {"nammodel", "NeuralAmpModels", "Neural Amp Models", {".nam"}}, // Ratatoille, Mike's NAM. - {"aidadspmodel", "shared/aidaaix", "AIDA IAX Models", {".json", ".aidaiax"}}, // Ratatoille + {"audio", "shared/audio", "Audio", {"audio/*"}}, // all audio files (Ratatouille) + {"nammodel", "NeuralAmpModels", "Neural Amp Models", {".nam"}}, // Ratatouille, Mike's NAM. + {"aidadspmodel", "shared/aidaaix", "AIDA IAX Models", {".json", ".aidaiax"}}, // Ratatouille {"mlmodel", "ToobMlModels", "ML Models", {".json"}}, // - // -}; + + + // For plugins that don't secify a modDirectory (allows upload of arbitrary extension) + {"*", "shared/other", "Other", {".*"}}, // + + }); +} + + + +const std::vector&ModFileTypes::ModDirectories() +{ + std::lock_guard lock { gModDirectoriesMutex }; + + if (!gModDirectories) + { + gModDirectories = std::unique_ptr>(CreateModDirectories()); + } + return *gModDirectories; +} + const ModFileTypes::ModDirectory *ModFileTypes::GetModDirectory(const std::string &type) { - for (const ModFileTypes::ModDirectory &modType : ModFileTypes::ModDirectories) + for (const ModFileTypes::ModDirectory &modType : ModFileTypes::ModDirectories()) { if (modType.modType == type) { @@ -74,41 +101,6 @@ ModFileTypes::ModFileTypes(const std::string &fileTypes) fileTypes_.push_back(type); } } - // for Ratatoille.lv2. - // If rootDirectories contains "nammodel" and fileTypes contains "json", add "mlmodel" too. - // if (contains(rootDirectories_,"nammodel") && contains(fileTypes_,"json")) - // { - // if (!contains(rootDirectories_,"mlmodel")) - // { - // rootDirectories_.push_back("mlmodel"); - // } - // } - if (fileTypes_.empty()) - { - for (const auto &type : types) - { - const ModDirectory *wellKnownType = GetModDirectory(type); - if (wellKnownType) - { - for (const std::string &newType : wellKnownType->defaultFileExtensions) - { - bool found = false; - for (const std::string &oldType : fileTypes_) - { - if (newType == oldType) - { - found = true; - break; - } - } - if (!found) - { - fileTypes_.push_back(newType); - } - } - } - } - } } static std::filesystem::path getModDirectoryPath( @@ -128,13 +120,13 @@ void ModFileTypes::CreateDefaultDirectories(const std::filesystem::path &rootDir using namespace std; try { - for (const auto &modType : ModDirectories) + for (const auto &modType : ModDirectories()) { fs::path path = rootDirectory / modType.pipedalPath; fs::create_directories(path); } - + if (!fs::exists(rootDirectory / "shared" / "audio" / "Cab IR Files")) { fs::create_symlink( @@ -154,3 +146,38 @@ void ModFileTypes::CreateDefaultDirectories(const std::filesystem::path &rootDir } } +static std::set makeFileExtensions(const std::vector&fileTypes) +{ + std::set result; + + for (const std::string&fileType: fileTypes) + { + if (fileType.starts_with('.')) { + result.insert(fileType); + } else { + if (fileType == "audio/*") + { + const auto&audioExtensions = MimeTypes::instance().AudioExtensions(); + result.insert(audioExtensions.begin(),audioExtensions.end()); + } else if (fileType == "video/*") + { + const auto&videoExtensions = MimeTypes::instance().VideoExtensions(); + result.insert(videoExtensions.begin(),videoExtensions.end()); + } + } + } + return result; +} + +ModFileTypes::ModDirectory::ModDirectory( + const std::string modType, + const std::string pipedalPath, + const std::string displayName, + const std::vector fileTypes) + :modType(modType), + pipedalPath(pipedalPath), + displayName(displayName), + fileTypesX(fileTypes), + fileExtensions(makeFileExtensions(fileTypes)) +{ +} diff --git a/src/ModFileTypes.hpp b/src/ModFileTypes.hpp index bcf49d9..a0f5673 100644 --- a/src/ModFileTypes.hpp +++ b/src/ModFileTypes.hpp @@ -21,33 +21,45 @@ #include #include #include +#include -namespace pipedal { - class ModFileTypes { +namespace pipedal +{ + class ModFileTypes + { + public: - public: - ModFileTypes(const std::string&fileTypes); - const std::vector &rootDirectories() { return rootDirectories_; } - const std::vector &fileTypes() { return fileTypes_;} + ModFileTypes(const std::string &fileTypes); + const std::vector &rootDirectories() const { return rootDirectories_; } + std::vector &rootDirectories() { return rootDirectories_; } + const std::vector &fileTypes() const { return fileTypes_; } + + static constexpr const char *DEFAULT_FILE_TYPES = "audio,nammodel,mlmodel,sf2,sfz,midisong,midiclip,*"; // (everything) private: std::vector rootDirectories_; std::vector fileTypes_; - public: - class ModDirectory { + class ModDirectory + { public: + ModDirectory( + const std::string modType, + const std::string pipedalPath, + const std::string displayName, + const std::vector defaultFileExtensions); const std::string modType; - const std::string pipedalPath; + const std::filesystem::path pipedalPath; const std::string displayName; - const std::vector defaultFileExtensions; + const std::vector fileTypesX; // mixture of .ext and mime types. Use fileExtensions instead. + const std::set fileExtensions; + }; - const static std::vector ModDirectories; - static const ModDirectory* GetModDirectory(const std::string&modType); - - static void CreateDefaultDirectories(const std::filesystem::path&rootDirectory); + static const std::vector &ModDirectories(); + static const ModDirectory *GetModDirectory(const std::string &modType); + static void CreateDefaultDirectories(const std::filesystem::path &rootDirectory); }; } \ No newline at end of file diff --git a/src/ModFileTypesTest.cpp b/src/ModFileTypesTest.cpp new file mode 100644 index 0000000..e5a5b4d --- /dev/null +++ b/src/ModFileTypesTest.cpp @@ -0,0 +1,162 @@ +// Copyright (c) 2022 Robin Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +#include "pch.h" +#include "catch.hpp" +#include +#include "PiPedalUI.hpp" +#include "ModFileTypes.hpp" + +using namespace pipedal; + +std::set CalculateFileExtensions(const std::string &mod__fileTypes, const std::string &modType) +{ + ModFileTypes modFileTypes(mod__fileTypes); + + auto fileProperty = + std::make_shared( + "Test", "urn:test", modFileTypes); + + return fileProperty->GetPermittedFileExtensions(modType); +} + +bool checkFile(const std::string &mod__FileTypes,const std::filesystem::path&path) +{ + ModFileTypes modFileTypes(mod__FileTypes); + + auto fileProperty = + std::make_shared( + "Test", "urn:test", modFileTypes); + + auto fileModDirectory = fileProperty->getParentModDirectory(path); + return fileProperty->IsValidExtension(path); +} + +TEST_CASE("ModFileTypes Test", "[modFileTypes]") +{ + + REQUIRE(checkFile("audio","shared/audio/Test.wav")); + REQUIRE(checkFile("audio","shared/audio/xxx/Test.flac")); + REQUIRE(!checkFile("audio","shared/audio/xxx/Test.nam")); + + REQUIRE(checkFile("audio,wav","shared/audio/Test.wav")); + REQUIRE(!checkFile("audio,wav","shared/audio/xxx/Test.flac")); + REQUIRE(!checkFile("audio","shared/audio/xxx/Test.nam")); + + REQUIRE(checkFile("cabsim,wav","CabIR/Test.wav")); + REQUIRE(!checkFile("cabsim,wav","CabIR/xxx/Test.flac")); + REQUIRE(!checkFile("cabsim","CabIR/xxx/Test.nam")); + + + + REQUIRE(checkFile("audio,wav","shared/audio/Test.wav")); + REQUIRE(!checkFile("audio,wav","shared/audio/xxx/Test.flac")); + REQUIRE(!checkFile("audio","shared/audio/xxx/Test.nam")); + + + REQUIRE(checkFile("wav","shared/audio/Test.wav")); + REQUIRE(!checkFile("wav","CabIR/Test.flac")); // only one audio directory for this case. + REQUIRE(!checkFile("wav","shared/audio/xxx/Test.nam")); + REQUIRE(!checkFile("wav","shared/midiSongs/xxx/Test.mid")); + REQUIRE(!checkFile("wav","shared/other/xxx/Test.mid")); + + + REQUIRE(checkFile("mid","shared/midiClips/Test.mid")); + REQUIRE(checkFile("mid","shared/midiSongs/Test.mid")); + REQUIRE(!checkFile("mid","CabIR/Test.flac")); // only one audio directory for this case. + + + REQUIRE(checkFile("midisong","shared/midiSongs/Test.mid")); + REQUIRE(checkFile("midisong","shared/midiSongs/xxx/Test.midi")); + REQUIRE(!checkFile("midisong","shared/midiClips/xxx/Test.nam")); + + + REQUIRE(checkFile("","shared/audio/Test.wav")); + REQUIRE(checkFile("","shared/audio/xxx/Test.flac")); + REQUIRE(!checkFile("","shared/audio/xxx/Test.nam")); + REQUIRE(!checkFile("","ToobMlModels/Test.nam")); + REQUIRE(checkFile("","ToobMlModels/Test.json")); + REQUIRE(checkFile("","ToobMlModels/a/b/c/Test.json")); + REQUIRE(checkFile("","shared/other/xxx/Test.xwav")); + REQUIRE(checkFile("","shared/other/xxx/Test")); + + + + + { + std::set result = + CalculateFileExtensions("audio", "audio"); + + REQUIRE(result.contains(".wav")); + REQUIRE(result.contains(".flac")); + + } + + { + std::set result = + CalculateFileExtensions("wav", "audio"); + + REQUIRE(result.size() == 1); + REQUIRE(result.contains(".wav")); + REQUIRE(!result.contains(".flac")); + } + { + std::set result = + CalculateFileExtensions("nam", "audio"); + + REQUIRE(result.size() == 0); + REQUIRE(!result.contains(".flac")); + REQUIRE(!result.contains(".nam")); + } + { + // extensions specified, but no modDirectory. + ModFileTypes modFileTypes("mid,midi"); + + auto fileProperty = + std::make_shared( + "Test", "urn:test", modFileTypes); + + REQUIRE(fileProperty->modDirectories().size() == 2); + for (const auto&modDirectory: fileProperty->modDirectories()) + { + auto fileExtensions = fileProperty->GetPermittedFileExtensions(modDirectory); + REQUIRE(fileExtensions.size() == 2); + REQUIRE(fileExtensions.contains(".mid")); + REQUIRE(fileExtensions.contains(".midi")); + } + } + { + // Custom directory, custom extensions. + // actually simulating a PiPedalUI::UiFileProperty load from ttl. + ModFileTypes modFileTypes("wavx"); + + modFileTypes.rootDirectories().push_back("CustomDirectory"); + + auto fileProperty = + std::make_shared( + "Test", "urn:test", modFileTypes); + + REQUIRE(fileProperty->modDirectories().size() == 1); + auto fileExtensions = fileProperty->GetPermittedFileExtensions("CustomDirectory"); + + REQUIRE(fileProperty->modDirectories().size() == 1); + REQUIRE(fileExtensions.size() == 1); + REQUIRE(fileExtensions.contains(".wavx")); + + } +} diff --git a/src/Pedalboard.hpp b/src/Pedalboard.hpp index 9ae3565..867ddc3 100644 --- a/src/Pedalboard.hpp +++ b/src/Pedalboard.hpp @@ -92,6 +92,7 @@ public: std::vector topChain_; std::vector bottomChain_; std::vector midiBindings_; + std::optional midiChannelBinding_; std::string vstState_; uint32_t stateUpdateCount_ = 0; Lv2PluginState lv2State_; @@ -122,6 +123,7 @@ public: GETTER_SETTER_VEC(topChain) GETTER_SETTER_VEC(bottomChain) GETTER_SETTER_VEC(midiBindings) + GETTER_SETTER_REF(midiChannelBinding) GETTER_SETTER(stateUpdateCount) GETTER_SETTER_REF(lv2State) Lv2PluginState&lv2State() { return lv2State_; } // non-const version. diff --git a/src/PiLatencyMain.cpp b/src/PiLatencyMain.cpp index b6f12e6..97c8a73 100644 --- a/src/PiLatencyMain.cpp +++ b/src/PiLatencyMain.cpp @@ -350,7 +350,7 @@ public: Oscillator oscillator; LatencyMonitor latencyMonitor; - virtual void OnAudioStopped() + virtual void OnAlsaDriverStopped() { } virtual void OnAudioTerminated() diff --git a/src/PiPedalModel.cpp b/src/PiPedalModel.cpp index 260e7ea..deb1109 100644 --- a/src/PiPedalModel.cpp +++ b/src/PiPedalModel.cpp @@ -50,6 +50,7 @@ #endif /* NO_MLOCK */ using namespace pipedal; +namespace fs = std::filesystem; template T &constMutex(const T &mutex) @@ -138,6 +139,8 @@ void PiPedalModel::Close() } closed = true; + CancelAudioRetry(); + if (avahiService) { this->avahiService = nullptr; // and close. @@ -1301,6 +1304,10 @@ void PiPedalModel::RestartAudio(bool useDummyAudioDriver) { try { + if (useDummyAudioDriver) + { + CancelAudioRetry(); + } if (this->audioHost->IsOpen()) { @@ -1380,6 +1387,8 @@ void PiPedalModel::SetJackChannelSelection(int64_t clientId, const JackChannelSe this->storage.SetJackChannelSelection(channelSelection); this->pluginHost.OnConfigurationChanged(jackConfiguration, channelSelection); + + CancelAudioRetry(); } RestartAudio(); // no lock to avoid mutex deadlock when reader thread is sending notifications.. @@ -1791,6 +1800,8 @@ void PiPedalModel::SetJackServerSettings(const JackServerSettings &jackServerSet FireJackConfigurationChanged(this->jackConfiguration); + CancelAudioRetry(); + guard.unlock(); RestartAudio(); @@ -1866,6 +1877,18 @@ void PiPedalModel::UpdateDefaults(PedalboardItem *pedalboardItem, std::unordered } if (pPlugin) { + if (pPlugin->hasMidiInput()) + { + if (!pedalboardItem->midiChannelBinding()) + { + pedalboardItem->midiChannelBinding(MidiChannelBinding::DefaultForMissingValue()); + } + } else { + if (pedalboardItem->midiChannelBinding()) + { + pedalboardItem->midiChannelBinding(std::optional()); // clear it. + } + } for (size_t i = 0; i < pPlugin->ports().size(); ++i) { auto port = pPlugin->ports()[i]; @@ -2287,22 +2310,46 @@ void PiPedalModel::SetSystemMidiBindings(std::vector &bindings) } } -std::vector PiPedalModel::GetFileList(const UiFileProperty &fileProperty) +PedalboardItem*PiPedalModel::GetPedalboardItemForFileProperty(const UiFileProperty& fileProperty) { - try + for (PedalboardItem*pedalboardItem: this->pedalboard.GetAllPlugins()) { - return this->storage.GetFileList(fileProperty); - } - catch (const std::exception &e) - { - Lv2Log::warning("GetFileList() failed: (%s)", e.what()); - return std::vector(); // don't disclose to users what the problem is. + if (pedalboardItem->pathProperties_.contains(fileProperty.patchProperty())) + { + return pedalboardItem; + } } + return nullptr; } -FileRequestResult PiPedalModel::GetFileList2(const std::string &relativePath, const UiFileProperty &fileProperty) +FileRequestResult PiPedalModel::GetFileList2(const std::string &relativePath_, const UiFileProperty &fileProperty) { + std::string relativePath = relativePath_; try { + if (!storage.IsInUploadsDirectory(relativePath)) + { + // if relativePath is in a resource directory of the plugin, then we have loaded a factory preset or are using a default property. + // map the resource path to the corresponding file in the uploads directory. + // :-( + PedalboardItem *pedalboardItem = GetPedalboardItemForFileProperty(fileProperty); + if (pedalboardItem) + { + auto pluginInfo = GetPluginInfo(pedalboardItem->uri()); + if (pluginInfo) { + std::filesystem::path resourcePath = fs::path(pluginInfo->bundle_path()) + / fileProperty.resourceDirectory(); + if (IsSubdirectory(relativePath,resourcePath)) + { + fs::path t = MakeRelativePath(relativePath,resourcePath); + t = fileProperty.directory() / t; + if (fs::exists(t)) + { + relativePath = t; + } + } + } + } + } return this->storage.GetFileList2(relativePath, fileProperty); } catch (const std::exception &e) @@ -2332,15 +2379,44 @@ std::string PiPedalModel::CreateNewSampleDirectory(const std::string &relativePa std::lock_guard lock(mutex); return storage.CreateNewSampleDirectory(relativePath, uiFileProperty); } -FilePropertyDirectoryTree::ptr PiPedalModel::GetFilePropertydirectoryTree(const UiFileProperty &uiFileProperty) +FilePropertyDirectoryTree::ptr PiPedalModel::GetFilePropertydirectoryTree(const UiFileProperty &uiFileProperty,const std::string&selectedPath) { std::lock_guard lock(mutex); - return storage.GetFilePropertydirectoryTree(uiFileProperty); + return storage.GetFilePropertydirectoryTree(uiFileProperty,selectedPath); } -std::string PiPedalModel::UploadUserFile(const std::string &directory, const std::string &patchProperty, const std::string &filename, std::istream &stream, size_t contentLength) +UiFileProperty::ptr PiPedalModel::FindLoadedPatchProperty(int64_t instanceId,const std::string&patchPropertyUri) { - return storage.UploadUserFile(directory, patchProperty, filename, stream, contentLength); + + auto pedalboardItems = pedalboard.GetAllPlugins(); + + for (const auto&pedalboardItem: pedalboardItems) { + if (pedalboardItem->instanceId() == instanceId) + { + Lv2PluginInfo::ptr pluginInfo = GetPluginInfo(pedalboardItem->uri()); + if (pluginInfo && pluginInfo->piPedalUI()) + { + for (const auto&fileProperty: pluginInfo->piPedalUI()->fileProperties()) + if (fileProperty->patchProperty() == patchPropertyUri) + { + return fileProperty; + } + } + } + } + return nullptr; + throw std::runtime_error("Permission denied. Plugin not currently loaded."); +} + +std::string PiPedalModel::UploadUserFile(const std::string &directory, int64_t instanceId,const std::string &patchProperty, const std::string &filename, std::istream &stream, size_t contentLength) +{ + UiFileProperty::ptr fileProperty = FindLoadedPatchProperty(instanceId,patchProperty); + if (!fileProperty) + { + Lv2Log::error(SS("Upload fle: Permission denied. No currently-loaded plugin provides that patch property: " << patchProperty)); + throw std::runtime_error("Permission denied."); + } + return storage.UploadUserFile(directory, fileProperty, filename, stream, contentLength); } uint64_t PiPedalModel::CreateNewPreset() @@ -2735,4 +2811,71 @@ std::map PiPedalModel::GetWifiRegulatoryDomains() Lv2Log::warning(SS("Unable to query Wifi Regulatory domains. " << e.what())); } return result; -} \ No newline at end of file +} + +void PiPedalModel::CancelAudioRetry() { + std::lock_guard lock(mutex); + if (audioRetryPostHandle) + { + // don't think this can ever happen, but if it did, it would be bad. + this->CancelPost(audioRetryPostHandle); + audioRetryPostHandle = 0; + } + +} +void PiPedalModel::OnAlsaDriverTerminatedAbnormally() { + // notification from the realtime thread, via the audiohost that the + // ALSA stream has broken. We want to restart. + + // get off the service thread as promptly as possible + this->Post([&]() { + std::lock_guard lock(mutex); + if (closed) return; + + auto now = clock::now(); + clock::duration timeSinceLastRetry = now-this->lastRestartTime; + this->lastRestartTime = now; + if (timeSinceLastRetry > std::chrono::duration_cast(std::chrono::milliseconds(1000))) { + audioRestartRetries = 0; + } + CancelAudioRetry(); + + if (audioRestartRetries == 0) + { + this->audioRetryPostHandle = this->Post( + // No lock to avoid deadlocks! + [this]() { + Lv2Log::info("Restarting audio."); + this->RestartAudio(); + }); + ++audioRestartRetries; + } else if (audioRestartRetries < 3) + { + this->audioRetryPostHandle = this->PostDelayed( + std::chrono::milliseconds(100 * audioRestartRetries), + [this]() { + if (closed) { + return; + } + Lv2Log::info(SS("Restarting audio. (retry " << audioRestartRetries << ")")); + + RestartAudio(); + }); + ++audioRestartRetries; + } else if (audioRestartRetries == 3) // one attempt to start the dummy driver. + { + { + this->audioRetryPostHandle = this->Post( + // No lock to avoid deadlocks! + [this]() { + Lv2Log::info(SS("Switching to dummy driver.")); + RestartAudio(true); // switch to the dummy driver. + }); + } + ++audioRestartRetries; + } else { + Lv2Log::error(SS("Unable to reastart audio.")); + + } + }); +} diff --git a/src/PiPedalModel.hpp b/src/PiPedalModel.hpp index ac5428c..ffb016f 100644 --- a/src/PiPedalModel.hpp +++ b/src/PiPedalModel.hpp @@ -109,6 +109,13 @@ namespace pipedal using NetworkChangedListener = std::function; private: + PedalboardItem* GetPedalboardItemForFileProperty(const UiFileProperty& fileProperty); + + void CancelAudioRetry(); + clock::time_point lastRestartTime = clock::time_point::min(); + int audioRestartRetries = 0; + PostHandle audioRetryPostHandle = 0; + bool hasWifi = false; void SetHasWifi(bool hasWifi); @@ -230,6 +237,7 @@ namespace pipedal virtual void OnPatchSetReply(uint64_t instanceId, LV2_URID patchSetProperty, const LV2_Atom *atomValue) override; virtual void OnNotifyMidiRealtimeEvent(RealtimeMidiEventType eventType) override; virtual void OnNotifyMidiRealtimeSnapshotRequest(int32_t snapshotIndex,int64_t snapshotRequestId) override; + virtual void OnAlsaDriverTerminatedAbnormally() override; void OnNotifyPathPatchPropertyReceived( int64_t instanceId, @@ -252,6 +260,7 @@ namespace pipedal PiPedalConfiguration configuration; void CheckForResourceInitialization(Pedalboard &pedalboard); + UiFileProperty::ptr FindLoadedPatchProperty(int64_t instanceId,const std::string&patchPropertyUri); public: PiPedalModel(); @@ -440,15 +449,14 @@ namespace pipedal void SetFavorites(const std::map &favorites); void SetUpdatePolicy(UpdatePolicyT updatePolicy); void ForceUpdateCheck(); - std::vector GetFileList(const UiFileProperty &fileProperty); FileRequestResult GetFileList2(const std::string &relativePath, const UiFileProperty &fileProperty); void DeleteSampleFile(const std::filesystem::path &fileName); std::string CreateNewSampleDirectory(const std::string &relativePath, const UiFileProperty &uiFileProperty); std::string RenameFilePropertyFile(const std::string &oldRelativePath, const std::string &newRelativePath, const UiFileProperty &uiFileProperty); - FilePropertyDirectoryTree::ptr GetFilePropertydirectoryTree(const UiFileProperty &uiFileProperty); + FilePropertyDirectoryTree::ptr GetFilePropertydirectoryTree(const UiFileProperty &uiFileProperty,const std::string&selectedPath); - std::string UploadUserFile(const std::string &directory, const std::string &patchProperty, const std::string &filename, std::istream &inputStream, size_t streamLength); + std::string UploadUserFile(const std::string &directory, int64_t instanceId, const std::string &patchProperty, const std::string &filename, std::istream &inputStream, size_t streamLength); uint64_t CreateNewPreset(); bool LoadCurrentPedalboard(); diff --git a/src/PiPedalSocket.cpp b/src/PiPedalSocket.cpp index f1358cb..25cb8d1 100644 --- a/src/PiPedalSocket.cpp +++ b/src/PiPedalSocket.cpp @@ -102,6 +102,23 @@ JSON_MAP_REFERENCE(RenameSampleFileArgs, newRelativePath) JSON_MAP_REFERENCE(RenameSampleFileArgs, uiFileProperty) JSON_MAP_END() +class GetFilePropertyDirectoryTreeArgs +{ +public: + UiFileProperty fileProperty_; + std::string selectedPath_; + + DECLARE_JSON_MAP(GetFilePropertyDirectoryTreeArgs); +}; + + +JSON_MAP_BEGIN(GetFilePropertyDirectoryTreeArgs) +JSON_MAP_REFERENCE(GetFilePropertyDirectoryTreeArgs, fileProperty) +JSON_MAP_REFERENCE(GetFilePropertyDirectoryTreeArgs, selectedPath) +JSON_MAP_END() + + + class Lv2StateChangedBody { public: @@ -1585,10 +1602,7 @@ public: } else if (message == "requestFileList") { - UiFileProperty fileProperty; - pReader->read(&fileProperty); - std::vector list = this->model.GetFileList(fileProperty); - this->Reply(replyTo, "requestFileList", list); + throw std::runtime_error("No longer implemented."); } else if (message == "requestFileList2") { @@ -1628,9 +1642,12 @@ public: } else if (message == "getFilePropertyDirectoryTree") { - UiFileProperty uiFileProperty; - pReader->read(&uiFileProperty); - FilePropertyDirectoryTree::ptr result = model.GetFilePropertydirectoryTree(uiFileProperty); + GetFilePropertyDirectoryTreeArgs args; + pReader->read(&args); + FilePropertyDirectoryTree::ptr result = + model.GetFilePropertydirectoryTree( + args.fileProperty_, + args.selectedPath_); this->Reply(replyTo, "GetFilePropertydirectoryTree", result); } diff --git a/src/PiPedalUI.cpp b/src/PiPedalUI.cpp index 03cb073..abe46f6 100644 --- a/src/PiPedalUI.cpp +++ b/src/PiPedalUI.cpp @@ -27,6 +27,10 @@ #include "ss.hpp" #include "MimeTypes.hpp" #include "AutoLilvNode.hpp" +#include "ModFileTypes.hpp" +#include +#include "util.hpp" +#include "MimeTypes.hpp" using namespace pipedal; @@ -122,17 +126,20 @@ UiFileType::UiFileType(PluginHost *pHost, const LilvNode *node) } if (fileExtension_ == "") { - fileExtension_ = MimeTypes::ExtensionFromMimeType(mimeType_); + fileExtension_ = MimeTypes::instance().ExtensionFromMimeType(mimeType_); } if (mimeType_ == "") { - mimeType_ = MimeTypes::MimeTypeFromExtension(fileExtension_); + mimeType_ = MimeTypes::instance().MimeTypeFromExtension(fileExtension_); if (mimeType_ == "") { mimeType_ = "application/octet-stream"; } } } + + + UiFileProperty::UiFileProperty(PluginHost *pHost, const LilvNode *node, const std::filesystem::path &resourcePath) { auto pWorld = pHost->getWorld(); @@ -182,6 +189,8 @@ UiFileProperty::UiFileProperty(PluginHost *pHost, const LilvNode *node, const st throw std::logic_error("PipedalUI::fileProperty: must specify at least a directory."); } + this->modDirectories_.push_back(directory_); + AutoLilvNode patchProperty = lilv_world_get( pWorld, node, @@ -207,6 +216,8 @@ UiFileProperty::UiFileProperty(PluginHost *pHost, const LilvNode *node, const st this->resourceDirectory_ = resourceDirectory.AsString(); } this->fileTypes_ = UiFileType::GetArray(pHost, node, pHost->lilvUris->pipedalUI__fileTypes); + + PrecalculateFileExtensions(); } std::vector UiFileType::GetArray(PluginHost *pHost, const LilvNode *node, const LilvNode *uri) @@ -271,21 +282,41 @@ bool UiFileProperty::IsDirectoryNameValid(const std::string &value) return true; } -bool UiFileProperty::IsValidExtension(const std::string &extension) const -{ - if (fileTypes_.size() == 0) - { - return true; - } +// bool UiFileProperty::IsValidExtension(const std::filesystem::path&relativePath,const std::string &extension) const +// { +// std::string modDirectory = this->getParentModDirectory(relativePath); +// const auto&validExtensions = GetPermittedFileExtensions(modDirectory); +// return validExtensions.contains(extension); +// } - for (auto &fileType : fileTypes_) +std::string UiFileProperty::GetFileExtension(const std::filesystem::path&path) +{ + if (path.has_extension()) { - if (fileType.fileExtension() == extension) - { - return true; - } + return ToLower(path.extension()); } - return false; + return ""; +} + +bool UiFileProperty::IsValidExtension(const std::filesystem::path&relativePath) const +{ + std::string extension = GetFileExtension(relativePath); + if (this->fileTypes().size() != 0) { + for (const auto&fileType: fileTypes()) + { + UiFileType x; + if (fileType.IsValidExtension(extension)) return true; + } + return false; + } + if (this->modDirectories().size() != 0) + { + std::string modDirectory = this->getParentModDirectory(relativePath); + const auto&validExtensions = GetPermittedFileExtensions(modDirectory); + if (validExtensions.contains(extension)) return true; + return validExtensions.contains(".*"); + } + return true; } UiPortNotification::UiPortNotification(PluginHost *pHost, const LilvNode *node) @@ -343,6 +374,52 @@ UiPortNotification::UiPortNotification(PluginHost *pHost, const LilvNode *node) } } +UiFileProperty::UiFileProperty(const std::string&label, const std::string&patchProperty, const ModFileTypes&modFileTypes) +: label_(label), + patchProperty_(patchProperty), + directory_("") +{ + setModFileTypes(modFileTypes); +} + +void UiFileProperty::setModFileTypes(const ModFileTypes&modFileTypes) +{ + modDirectories_.resize(0); + fileTypes_.resize(0); + for (const std::string &type : modFileTypes.fileTypes()) + { + fileTypes().push_back(UiFileType(SS(type << " file"), SS('.' << type))); + } + + if (modFileTypes.rootDirectories().size() != 0) + { + for (const std::string &rootDirectory : modFileTypes.rootDirectories()) + { + modDirectories().push_back(rootDirectory); + } + } else { + if (fileTypes().size() == 0) + { + // add everything. + for (const auto&modDirectory: split(ModFileTypes::DEFAULT_FILE_TYPES,',')) + { + modDirectories().push_back(modDirectory); + } + } else { + // add only those mod directories that contain one or more of our fileTypes. + for (const auto&modDirectory: split(ModFileTypes::DEFAULT_FILE_TYPES,',')) + { + modDirectories().push_back(modDirectory); + } + } + } + + PrecalculateFileExtensions(); + + +} + + UiFileProperty::UiFileProperty(const std::string &name, const std::string &patchProperty, const std::string &directory) : label_(name), patchProperty_(patchProperty), @@ -362,6 +439,22 @@ PiPedalUI::PiPedalUI( this->fileProperties_ = std::move(fileProperties); } +bool UiFileType::IsValidExtension(const std::string&extension) const { + if (fileExtension_.length() != 0) + { + if (fileExtension_ == ".*") + { + return true; + } + return fileExtension_ == extension; + } + if (mimeType_.length() != 0) + { + return MimeTypes::instance().IsValidExtension(mimeType_,extension); + } + return false; +} + UiFileType::UiFileType(const std::string&label, const std::string &fileType) : label_(label) , fileExtension_(fileType) @@ -369,13 +462,12 @@ UiFileType::UiFileType(const std::string&label, const std::string &fileType) if (fileType.starts_with('.')) { fileExtension_ = fileType; - mimeType_ = MimeTypes::MimeTypeFromExtension(fileType); + mimeType_ = MimeTypes::instance().MimeTypeFromExtension(fileType); if (mimeType_ == "") { mimeType_ = "application/octet-stream"; } } else { - fileExtension_ = MimeTypes::ExtensionFromMimeType(fileType); // (may be blank, esp. for audio/* and video/*. mimeType_ = fileType; } if (mimeType_ == "*") @@ -443,6 +535,157 @@ UiFrequencyPlot::UiFrequencyPlot(PluginHost*pHost, const LilvNode*node, } +static std::set emptySet; + +const std::set& UiFileProperty::GetPermittedFileExtensions(const std::string &modDirectory) const { + auto result = fileExtensionsByModDirectory.find(modDirectory); + if (result != fileExtensionsByModDirectory.end()) + { + return result->second; + } + if (modDirectory == this->directory_) + { + std::set result; + for (auto &x : this->fileTypes_) + { + + } + return emptySet; + } + return emptySet; +} + +void UiFileProperty::PrecalculateFileExtensions() +{ + std::set explicitlySpecifiedExtensions; + bool allAudioTypes = false; + bool allVideoTypes = false; + for (const auto &fileType: this->fileTypes()) + { + if (!fileType.fileExtension().empty()) + { + explicitlySpecifiedExtensions.insert(fileType.fileExtension()); + } else if (fileType.mimeType().length() != 0) + { + if (fileType.mimeType() == "audio/*") + { + allAudioTypes = true; + } else if (fileType.mimeType() == "video/*") + { + allVideoTypes = true; + } else { + // The principle risk being that there is more than one commonly used extension. e.g. midi. + // If the right extension isn't picked, the client should explicitly list which extensions are wanted + // instead of using a mime type. :-/ Not a good implementation, but not a use case that's actually going to + // come up. + std::string extension = MimeTypes::instance().ExtensionFromMimeType(fileType.mimeType()); + if (extension.length() == 0) + { + Lv2Log::warning(SS("Unknown MIME type: " << fileType.mimeType())); + } else { + explicitlySpecifiedExtensions.insert(extension); + } + } + } + } + if (allAudioTypes) + { + const auto&audioExtensions = MimeTypes::instance().AudioExtensions(); + explicitlySpecifiedExtensions.insert( + audioExtensions.begin(),audioExtensions.end() + ); + } + + if (allVideoTypes) + { + const auto&videoExtensions = MimeTypes::instance().VideoExtensions(); + explicitlySpecifiedExtensions.insert( + videoExtensions.begin(),videoExtensions.end() + ); + + } + if (this->modDirectories().size() == 0) // not specified? Add all directories, (and prune later, if we have filetypes). + { + this->modDirectories_ = split(ModFileTypes::DEFAULT_FILE_TYPES,','); + } + if (fileTypes().size() != 0) + { + // delete any modDirectories that do not contain one of the given filetyeps. + auto iter = this->modDirectories_.begin(); + while(iter != this->modDirectories_.end()) + { + const auto *pDirectory = ModFileTypes::GetModDirectory(*iter); + if (pDirectory == nullptr) + { + // a custom directory! How cool is that!? + this->fileExtensionsByModDirectory[*iter] = explicitlySpecifiedExtensions; + ++iter; + } else { + std::set extensions = Intersect(pDirectory->fileExtensions,explicitlySpecifiedExtensions); + if (extensions.size() == 0) + { + iter = modDirectories_.erase(iter); + } else { + this->fileExtensionsByModDirectory[*iter] = std::move(extensions); + ++iter; + } + } + } + } else { + auto iter = this->modDirectories_.begin(); + while(iter != this->modDirectories_.end()) + { + const auto *pDirectory = ModFileTypes::GetModDirectory(*iter); + if (pDirectory) + { + this->fileExtensionsByModDirectory[*iter] = pDirectory->fileExtensions; + } else { + Lv2Log::warning(SS("Unknown Mod Directory: " << *iter)); + } + ++iter; + } + + } +} +// std::set modDirectoryFileTypes = rootModDirectory->fileExtensions; + // if (fileProperty.fileTypes().size() != 0) + // { + // std::set specifiedFileTypes; + + // for (const auto&fileType: fileProperty.fileTypes()) + // { + // if (!fileType.fileExtension().empty()) + // { + + // } + // } + // } + + + +std::string UiFileProperty::getParentModDirectory(const std::filesystem::path&path) const +{ + for (const auto &modDirectory: this->modDirectories_) + { + const auto pModDirectory = ModFileTypes::GetModDirectory(modDirectory); + if (pModDirectory) + { + if (IsChildDirectory(path,pModDirectory->pipedalPath)) + { + return modDirectory; + } + } + } + if (this->directory_.length() != 0) + { + if (IsChildDirectory(path,this->directory_)) + { + return this->directory_; + } + } + return ""; +} + JSON_MAP_BEGIN(UiPortNotification) JSON_MAP_REFERENCE(UiPortNotification, portIndex) diff --git a/src/PiPedalUI.hpp b/src/PiPedalUI.hpp index b6e96a6..bad425a 100644 --- a/src/PiPedalUI.hpp +++ b/src/PiPedalUI.hpp @@ -29,6 +29,8 @@ #include #include "json.hpp" #include +#include +#include "ModFileTypes.hpp" #define PIPEDAL_UI "http://github.com/rerdavies/pipedal/ui" @@ -59,6 +61,8 @@ #define PIPEDAL_UI__yBottom PIPEDAL_UI_PREFIX "yBottom" #define PIPEDAL_UI__width PIPEDAL_UI_PREFIX "width" +#define PIPEDAL_UI__ledColor PIPEDAL_UI_PREFIX "ledColor" + namespace pipedal { @@ -81,7 +85,7 @@ namespace pipedal { const std::string& label() const { return label_;} const std::string &fileExtension() const { return fileExtension_; } const std::string &mimeType() const { return mimeType_; } - + bool IsValidExtension(const std::string&extension) const; public: DECLARE_JSON_MAP(UiFileType); @@ -116,12 +120,19 @@ namespace pipedal { std::string resourceDirectory_; std::vector modDirectories_; bool useLegacyModDirectory_= false; + std::map> fileExtensionsByModDirectory; // non-serialized. + void PrecalculateFileExtensions(); public: using ptr = std::shared_ptr; UiFileProperty() { } UiFileProperty(PluginHost*pHost, const LilvNode*node, const std::filesystem::path&resourcePath); - UiFileProperty(const std::string&name, const std::string&patchProperty,const std::string &directory); + UiFileProperty(const std::string&label, const std::string&patchProperty,const std::string &directory); + UiFileProperty( + const std::string&label, + const std::string&patchProperty, + const ModFileTypes&modFileType); + void setModFileTypes(const ModFileTypes&modFileType); std::vector& modDirectories() { return modDirectories_; } const std::vector& modDirectories() const { return modDirectories_; } @@ -129,7 +140,9 @@ namespace pipedal { bool useLegacyModDirectory() const { return useLegacyModDirectory_; } void useLegacyModDirectory(bool value) { useLegacyModDirectory_ = value; } const std::string &label() const { return label_; } + int32_t index() const { return index_; } + void index(int32_t value) { index_ = value; } const std::string &directory() const { return directory_; } void directory(const std::string &path) { directory_ = path; } @@ -140,11 +153,19 @@ namespace pipedal { std::vector &fileTypes() { return fileTypes_; } const std::string &patchProperty() const { return patchProperty_; } - bool IsValidExtension(const std::string&extension) const; + + bool IsValidExtension(const std::filesystem::path&relativePath) const; + static bool IsDirectoryNameValid(const std::string&value); + static std::string GetFileExtension(const std::filesystem::path&path); + const std::string&resourceDirectory() const { return resourceDirectory_; } + + const std::set& GetPermittedFileExtensions(const std::string &modDirectory) const; + + std::string getParentModDirectory(const std::filesystem::path&path) const; public: DECLARE_JSON_MAP(UiFileProperty); }; @@ -198,6 +219,8 @@ namespace pipedal { return frequencyPlots_; } + + const std::vector &portNotifications() const { return portNotifications_; } const UiFileProperty*GetFileProperty(const std::string &propertyUri) const @@ -211,14 +234,16 @@ namespace pipedal { } return nullptr; } - + bool unsupportedPatchProperty() const { return unsupportedPatchProperty_; } + void unsupportedPatchProperty(bool value) { unsupportedPatchProperty_ = value; } private: + bool unsupportedPatchProperty_ = false; // not serialized. std::vector fileProperties_; std::vector frequencyPlots_; std::vector portNotifications_; }; - // Utiltities for validating file paths received via PiPedalFileProperty-related APIs. + // utilities for validating file paths received via PiPedalFileProperty-related APIs. bool IsAlphaNumeric(const std::string&value); diff --git a/src/PiPedalVersion.cpp b/src/PiPedalVersion.cpp index d8f47f4..150a756 100644 --- a/src/PiPedalVersion.cpp +++ b/src/PiPedalVersion.cpp @@ -93,15 +93,17 @@ PiPedalVersion::PiPedalVersion(PiPedalModel&model) this->webAddresses_.push_back(MakeWebAddress(SS(hostName << ".local"),port)); - std::string ethAddr = GetInterfaceIpv4Address("eth0"); - if (ethAddr.length() != 0) + + auto ethAddresses = GetEthernetIpv4Addresses(); + for (const std::stringðAddress: ethAddresses) { - this->webAddresses_.push_back(MakeWebAddress(ethAddr,port)); + this->webAddresses_.push_back(MakeWebAddress(ethAddress,port)); } - std::string wlanAddr = GetInterfaceIpv4Address("wlan0"); - if (wlanAddr.length() != 0) + // yyx: fix this for ubuntu. + auto wlanAddr = GetWlanIpv4Address(); + if (wlanAddr) { - this->webAddresses_.push_back(MakeWebAddress(wlanAddr,port)); + this->webAddresses_.push_back(MakeWebAddress(*wlanAddr,port)); } std::string p2pAddr = GetInterfaceIpv4Address("p2p-wlan0-0"); diff --git a/src/PluginHost.cpp b/src/PluginHost.cpp index 1d0ae47..8f2c84b 100644 --- a/src/PluginHost.cpp +++ b/src/PluginHost.cpp @@ -150,6 +150,7 @@ void PluginHost::LilvUris::Initialize(LilvWorld *pWorld) pipedalUI__mimeType = lilv_new_uri(pWorld, PIPEDAL_UI__mimeType); pipedalUI__outputPorts = lilv_new_uri(pWorld, PIPEDAL_UI__outputPorts); pipedalUI__text = lilv_new_uri(pWorld, PIPEDAL_UI__text); + pipedalUI__ledColor = lilv_new_uri(pWorld,PIPEDAL_UI__ledColor); pipedalUI__frequencyPlot = lilv_new_uri(pWorld, PIPEDAL_UI__frequencyPlot); pipedalUI__xLeft = lilv_new_uri(pWorld, PIPEDAL_UI__xLeft); @@ -365,7 +366,7 @@ void PluginHost::LoadPluginClassesFromLilv() LILV_FOREACH(plugin_classes, iPluginClass, classes) { const LilvPluginClass *pClass = lilv_plugin_classes_get(classes, iPluginClass); - // Get it to prepopulate the map. + // Get it to pre-populate the map. MakePluginClass(pClass); } for (auto value : classesMap) @@ -430,6 +431,9 @@ void PluginHost::Load(const char *lv2Path) if (pluginInfo->hasCvPorts()) { Lv2Log::debug("Plugin %s (%s) skipped. (Has CV ports).", pluginInfo->name().c_str(), pluginInfo->uri().c_str()); + } else if (pluginInfo->hasUnsupportedPatchProperties()) + { + Lv2Log::debug("Plugin %s (%s) skipped. (Has unsupported patch parameters).", pluginInfo->name().c_str(), pluginInfo->uri().c_str()); } #if !SUPPORT_MIDI else if (pluginInfo->plugin_class() == LV2_MIDI_PLUGIN) @@ -479,10 +483,31 @@ void PluginHost::Load(const char *lv2Path) for (auto plugin : this->plugins_) { + pluginsByUri[plugin->uri()] = plugin; + Lv2PluginUiInfo info(this, plugin.get()); if (plugin->is_valid()) { -#if SUPPORT_MIDI +#if 1 + // no plugins with more than 2 inputs or outputs. + // no zero-input or zero-output plugins (temporarily disables midi plugins) + // no zero output devices (permanent, I think) + if (info.audio_inputs() > 2 || info.audio_outputs() > 2) { + Lv2Log::debug( + "Plugin %s (%s) skipped. %d inputs, %d outputs.", plugin->name().c_str(), plugin->uri().c_str(), + (int)info.audio_inputs(),(int)info.audio_outputs()); + + } + else if (info.audio_inputs() == 0 && info.audio_outputs() == 0 ) + { + Lv2Log::debug("Plugin %s (%s) skipped. No audio i/o.", plugin->name().c_str(), plugin->uri().c_str()); + + } else if (info.audio_inputs() == 0) + { + // temporarily disable this feature. + Lv2Log::debug("Plugin %s (%s) skipped. No inputs.", plugin->name().c_str(), plugin->uri().c_str()); + } +#elif SUPPORT_MIDI if (info.audio_inputs() == 0 && !info.has_midi_input()) { Lv2Log::debug("Plugin %s (%s) skipped. No inputs.", plugin->name().c_str(), plugin->uri().c_str()); @@ -503,6 +528,9 @@ void PluginHost::Load(const char *lv2Path) #endif else { + if (info.audio_inputs() == 0) { + Lv2Log::debug("************* ZERO INPUTS: %s (%s) skipped. No audio outputs.", plugin->name().c_str(), plugin->uri().c_str()); + } ui_plugins_.push_back(std::move(info)); } } @@ -577,7 +605,8 @@ bool Lv2PluginInfo::HasFactoryPresets(PluginHost *lv2Host, const LilvPlugin *plu return result; } -std::shared_ptr Lv2PluginInfo::FindWritablePathProperties(PluginHost *lv2Host, const LilvPlugin *pPlugin) +Lv2PluginInfo::FindWritablePathPropertiesResult +Lv2PluginInfo::FindWritablePathProperties(PluginHost *lv2Host, const LilvPlugin *pPlugin) { // example: @@ -594,6 +623,7 @@ std::shared_ptr Lv2PluginInfo::FindWritablePathProperties(PluginHost std::vector fileProperties; + bool unsupportedPatchProperty = false; LILV_FOREACH(nodes, iNode, patchWritables) { AutoLilvNode propertyUri = lilv_nodes_get(patchWritables, iNode); @@ -605,88 +635,103 @@ std::shared_ptr Lv2PluginInfo::FindWritablePathProperties(PluginHost // rfs:range atom:Path? if (lilv_world_ask(pWorld, propertyUri, lv2Host->lilvUris->rdfs__range, lv2Host->lilvUris->atom__Path)) { + + AutoLilvNode label = lilv_world_get(pWorld, propertyUri, lv2Host->lilvUris->rdfs__label, nullptr); std::string strLabel = label.AsString(); - if (strLabel.length() != 0) + + if (strLabel.length() == 0) { - std::filesystem::path path = this->bundle_path(); - path = path.parent_path(); - std::string lv2DirectoryName = path.filename().string(); - // we have a valid path property! - - auto fileProperty = - std::make_shared( - strLabel, propertyUri.AsUri(), lv2DirectoryName); - - AutoLilvNodes mod__fileTypes = lilv_world_find_nodes(pWorld, propertyUri, lv2Host->lilvUris->mod__fileTypes, nullptr); - LILV_FOREACH(nodes, i, mod__fileTypes) - { - // "nam,nammodel" - AutoLilvNode lilvfileType{lilv_nodes_get(mod__fileTypes, i)}; - std::string fileTypes = lilvfileType.AsString(); - ModFileTypes modFileTypes(fileTypes); - - for (const std::string &rootDirectory : modFileTypes.rootDirectories()) - { - fileProperty->modDirectories().push_back(rootDirectory); - } - for (const std::string &type : modFileTypes.fileTypes()) - { - fileProperty->fileTypes().push_back(UiFileType(SS(type << " file"), SS('.' << type))); - } - // Legacy case: audio_uploads/ exists. - - std::filesystem::path bundleDirectoryName = std::filesystem::path(bundle_path()).parent_path().filename(); - std::filesystem::path legacyUploadPath = lv2Host->MapPath(bundleDirectoryName.string()); - - if (std::filesystem::exists(legacyUploadPath)) - { - if (!std::filesystem::exists(legacyUploadPath / ".migrated")) - { - fileProperty->useLegacyModDirectory(true); - fileProperty->directory(bundleDirectoryName); - } - } - if (fileProperty->modDirectories().size() == 0) - { - fileProperty->directory(bundleDirectoryName); - } - else if (fileProperty->modDirectories().size() == 1 && !fileProperty->useLegacyModDirectory()) // no synthetic root. - { - auto modType = ModFileTypes::GetModDirectory(fileProperty->modDirectories()[0]); - if (modType) - { - fileProperty->directory(modType->pipedalPath); - } - } else { - // handled at request time. - } - } - if (!mod__fileTypes) - { - AutoLilvNodes dc_types = lilv_world_find_nodes(pWorld, propertyUri, lv2Host->lilvUris->dc__format, nullptr); - LILV_FOREACH(nodes, i, dc_types) - { - AutoLilvNode dc_type = lilv_nodes_get(dc_types, i); - std::string fileType = dc_type.AsString(); - std::string label = ""; - fileProperty->fileTypes().push_back(UiFileType(label, fileType)); - } - } - - fileProperties.push_back( - fileProperty); + strLabel = "File"; } + + std::filesystem::path path = this->bundle_path(); + path = path.parent_path(); + std::string lv2DirectoryName = path.filename().string(); + // we have a valid path property! + + auto fileProperty = + std::make_shared( + strLabel, propertyUri.AsUri(), lv2DirectoryName); + + + AutoLilvNode indexNode = lilv_world_get(pWorld, propertyUri, lv2Host->lilvUris->lv2core__index, nullptr); + int32_t index = indexNode.AsInt(-1); + fileProperty->index(index); + + + // if there's a pipedalui_fileTypes node, use that instead. + + + AutoLilvNode mod__fileTypes = lilv_world_get(pWorld, propertyUri, lv2Host->lilvUris->mod__fileTypes, nullptr); + + // default: everything. + std::string fileTypes = ModFileTypes::DEFAULT_FILE_TYPES; + if (mod__fileTypes) + { + // "nam,nammodel" + fileTypes = mod__fileTypes.AsString(); + } + ModFileTypes modFileTypes(fileTypes); + + + + // Legacy case: audio_uploads/ exists. + + std::filesystem::path bundleDirectoryName = std::filesystem::path(bundle_path()).parent_path().filename(); + std::filesystem::path legacyUploadPath = lv2Host->MapPath(bundleDirectoryName.string()); + + fileProperty->setModFileTypes(modFileTypes); + + fileProperty->directory(bundleDirectoryName); + + if (std::filesystem::exists(legacyUploadPath) + && !std::filesystem::exists(legacyUploadPath / ".migrated")) + { + fileProperty->useLegacyModDirectory(true); + fileProperty->directory(bundleDirectoryName); + modFileTypes.rootDirectories().push_back(bundleDirectoryName.filename()); // push the private directory! + } else { + if (modFileTypes.rootDirectories().size() == 1) + { + std::string modName = modFileTypes.rootDirectories()[0]; + auto modDirectory = modFileTypes.GetModDirectory(modName); + fileProperty->directory(modDirectory->pipedalPath); + } + } + + + fileProperties.push_back(fileProperty); + } else { + unsupportedPatchProperty = true; } } } } + FindWritablePathPropertiesResult result; + + + if (fileProperties.size() != 0) { - return std::make_shared(std::move(fileProperties)); - } + std::sort(fileProperties.begin(),fileProperties.end(),[](const UiFileProperty::ptr& left,const UiFileProperty::ptr&right) { + // properies with indexes first. + int32_t indexL = left->index(); + if (indexL < 0) indexL = std::numeric_limits::max(); + int32_t indexR = right->index(); + if (indexR < 0) indexR = std::numeric_limits::max(); + if (indexL < indexR) return true; + if (indexL > indexR) return false; - return std::shared_ptr(); + // there is no natural order. TTL indexing means that the order we see them in is random. + // We can't order them sensibly. Let's at least order them consistently. + return left->label() < right->label(); + + }); + result.pipedalUi = std::make_shared(std::move(fileProperties)); + } + result.hasUnsupportedPatchProperties = unsupportedPatchProperty; + return result; } Lv2PluginInfo::Lv2PluginInfo(PluginHost *lv2Host, LilvWorld *pWorld, const LilvPlugin *pPlugin) @@ -800,7 +845,9 @@ Lv2PluginInfo::Lv2PluginInfo(PluginHost *lv2Host, LilvWorld *pWorld, const LilvP else { // look for - this->piPedalUI_ = FindWritablePathProperties(lv2Host, pPlugin); + auto result = FindWritablePathProperties(lv2Host, pPlugin); + this->piPedalUI_ = result.pipedalUi; + this->hasUnsupportedPatchProperties_ = result.hasUnsupportedPatchProperties; } int nInputs = 0; @@ -961,6 +1008,15 @@ Lv2PortInfo::Lv2PortInfo(PluginHost *host, const LilvPlugin *plugin, const LilvP this->connection_optional_ = lilv_port_has_property(plugin, pPort, host->lilvUris->core__connectionOptional); this->trigger_property_ = lilv_port_has_property(plugin, pPort, host->lilvUris->portprops__trigger); + AutoLilvNode port_ledColor = lilv_port_get(plugin,pPort,host->lilvUris->pipedalUI__ledColor); + if (port_ledColor) + { + auto value = lilv_node_as_string(port_ledColor); + if (value) { + this->pipedal_ledColor_ = value; + } + } + LilvScalePoints *pScalePoints = lilv_port_get_scale_points(plugin, pPort); LILV_FOREACH(scale_points, iSP, pScalePoints) { @@ -1174,14 +1230,12 @@ std::shared_ptr PluginHost::GetLv2PluginClass() const std::shared_ptr PluginHost::GetPluginInfo(const std::string &uri) const { - for (auto i = this->plugins_.begin(); i != this->plugins_.end(); ++i) + auto ff = pluginsByUri.find(uri); + if (ff == pluginsByUri.end()) { - if ((*i)->uri() == uri) - { - return (*i); - } + return nullptr; } - return nullptr; + return ff->second; } Lv2Pedalboard *PluginHost::CreateLv2Pedalboard(Pedalboard &pedalboard, Lv2PedalboardErrorList &errorMessages) @@ -1493,6 +1547,20 @@ static void createTargetLinks(const std::filesystem::path &sourceDirectory, cons } } } + +std::string PluginHost::MapResourcePath(const std::string&pluginUri, const std::string&filePath) +{ + auto plugin = GetPluginInfo(pluginUri); + if (plugin) { + + return filePath; + } + + + return filePath; + +} + void PluginHost::CheckForResourceInitialization(const std::string &pluginUri, const std::filesystem::path &pluginUploadDirectory) { @@ -1632,6 +1700,8 @@ json_map::storage_type Lv2PortInfo::jmap{ MAP_REF(Lv2PortInfo, not_on_gui), MAP_REF(Lv2PortInfo, buffer_type), MAP_REF(Lv2PortInfo, port_group), + MAP_REF(Lv2PortInfo, pipedal_ledColor), + json_map::enum_reference("units", &Lv2PortInfo::units_, get_units_enum_converter()), MAP_REF(Lv2PortInfo, comment)}}; @@ -1697,6 +1767,7 @@ json_map::storage_type Lv2PluginUiPort::jmap{{ MAP_REF(Lv2PluginUiPort, trigger_property), MAP_REF(Lv2PluginUiPort, scale_points), MAP_REF(Lv2PluginUiPort, port_group), + MAP_REF(Lv2PluginUiPort, pipedal_ledColor), json_map::enum_reference("units", &Lv2PluginUiPort::units_, get_units_enum_converter()), MAP_REF(Lv2PluginUiPort, comment), diff --git a/src/PluginHost.hpp b/src/PluginHost.hpp index 5fa685d..c018ad3 100644 --- a/src/PluginHost.hpp +++ b/src/PluginHost.hpp @@ -227,6 +227,7 @@ namespace pipedal std::string comment_; PiPedalUI::ptr piPedalUI_; + std::string pipedal_ledColor_; public: bool IsSwitch() const @@ -293,6 +294,7 @@ namespace pipedal LV2_PROPERTY_GETSET(port_group); LV2_PROPERTY_GETSET(comment); LV2_PROPERTY_GETSET_SCALAR(units); + LV2_PROPERTY_GETSET(pipedal_ledColor); LV2_PROPERTY_GETSET(buffer_type); @@ -344,7 +346,11 @@ namespace pipedal bool isSplit() const ; private: - std::shared_ptr FindWritablePathProperties(PluginHost *lv2Host, const LilvPlugin *pPlugin); + struct FindWritablePathPropertiesResult { + std::shared_ptr pipedalUi; + bool hasUnsupportedPatchProperties = false; + }; + FindWritablePathPropertiesResult FindWritablePathProperties(PluginHost *lv2Host, const LilvPlugin *pPlugin); bool HasFactoryPresets(PluginHost *lv2Host, const LilvPlugin *plugin); std::string bundle_path_; @@ -367,6 +373,7 @@ namespace pipedal std::vector> port_groups_; bool is_valid_ = false; PiPedalUI::ptr piPedalUI_; + bool hasUnsupportedPatchProperties_ = false; bool IsSupportedFeature(const std::string &feature) const; @@ -389,6 +396,7 @@ namespace pipedal LV2_PROPERTY_GETSET(port_groups) LV2_PROPERTY_GETSET(has_factory_presets) LV2_PROPERTY_GETSET(piPedalUI) + LV2_PROPERTY_GETSET(hasUnsupportedPatchProperties) const Lv2PortInfo &getPort(const std::string &symbol) { @@ -430,6 +438,7 @@ namespace pipedal return true; } } + return false; } bool hasMidiOutput() const { @@ -497,6 +506,7 @@ namespace pipedal is_logarithmic_(pPort->is_logarithmic()), integer_property_(pPort->integer_property()), enumeration_property_(pPort->enumeration_property()), toggled_property_(pPort->toggled_property()), not_on_gui_(pPort->not_on_gui()), scale_points_(pPort->scale_points()), trigger_property_(pPort->trigger_property()), + pipedal_ledColor_(pPort->pipedal_ledColor()), comment_(pPort->comment()), units_(pPort->units()), connection_optional_(pPort->connection_optional()) { @@ -540,6 +550,7 @@ namespace pipedal bool trigger_property_ = false; std::vector scale_points_; std::string port_group_; + std::string pipedal_ledColor_; Units units_ = Units::none; std::string comment_; @@ -572,6 +583,7 @@ namespace pipedal LV2_PROPERTY_GETSET_SCALAR(is_program_controller); LV2_PROPERTY_GETSET(custom_units); LV2_PROPERTY_GETSET(connection_optional); + LV2_PROPERTY_GETSET(pipedal_ledColor); public: static json_map::storage_type jmap; @@ -707,6 +719,8 @@ namespace pipedal AutoLilvNode pipedalUI__outputPorts; AutoLilvNode pipedalUI__text; + AutoLilvNode pipedalUI__ledColor; + AutoLilvNode time_Position; AutoLilvNode time_barBeat; AutoLilvNode time_beatsPerMinute; @@ -717,6 +731,7 @@ namespace pipedal AutoLilvNode ui__portNotification; AutoLilvNode ui__plugin; + AutoLilvNode ui__ledColor; AutoLilvNode ui__protocol; AutoLilvNode ui__floatProtocol; AutoLilvNode ui__peakProtocol; @@ -735,6 +750,7 @@ namespace pipedal AutoLilvNode dc__format; AutoLilvNode mod__fileTypes; + AutoLilvNode pipedalui__fileTypes; }; @@ -769,6 +785,7 @@ namespace pipedal void free_world(); std::vector> plugins_; + std::map> pluginsByUri; std::vector ui_plugins_; std::map> classesMap; @@ -821,6 +838,9 @@ namespace pipedal public: virtual MapFeature &GetMapFeature() { return this->mapFeature; } void CheckForResourceInitialization(const std::string& pluginUri,const std::filesystem::path& pluginUploadDirectory); + + std::string MapResourcePath(const std::string&uri, const std::string&relativePath); + void ReloadPlugins(); // equivalent to LV2 MapPath AbstractPath features. diff --git a/src/PresetBundle.hpp b/src/PresetBundle.hpp index 84c37ce..b766ff9 100644 --- a/src/PresetBundle.hpp +++ b/src/PresetBundle.hpp @@ -20,6 +20,7 @@ #pragma once #include +#include namespace pipedal { class PiPedalModel; diff --git a/src/PrettyPrinter.hpp b/src/PrettyPrinter.hpp index 284f21e..e8c12f1 100644 --- a/src/PrettyPrinter.hpp +++ b/src/PrettyPrinter.hpp @@ -183,7 +183,12 @@ namespace pipedal { ++startOfOverflow; } - std::string overflow = string(&lineBuffer[startOfOverflow], lineBuffer.size() - startOfOverflow); + + std::string overflow; + size_t extra = lineBuffer.size() - startOfOverflow; + if (extra) { + overflow = std::string(&lineBuffer[startOfOverflow], extra); + } lineBuffer.resize(breakPos); WriteLine(); diff --git a/src/RingBufferReader.hpp b/src/RingBufferReader.hpp index 30f0181..25e6dd0 100644 --- a/src/RingBufferReader.hpp +++ b/src/RingBufferReader.hpp @@ -38,7 +38,8 @@ namespace pipedal EffectReplaced, SetValue, SetBypass, - AudioStopped, + //AudioStopped, + AudioTerminatedAbnormally, // specifically for an ALSA loss of connection. SetVuSubscriptions, FreeVuSubscriptions, @@ -507,10 +508,10 @@ namespace pipedal write(RingBufferCommand::ReplaceEffect, pedalboard); } - void AudioStopped() + void AudioTerminatedAbnormally() { AudioStoppedBody body; - write(RingBufferCommand::AudioStopped, body); + write(RingBufferCommand::AudioTerminatedAbnormally, body); } void EffectReplaced(Lv2Pedalboard *pedalboard) diff --git a/src/SchedulerPriority.cpp b/src/SchedulerPriority.cpp index 5b64d44..0eb5194 100644 --- a/src/SchedulerPriority.cpp +++ b/src/SchedulerPriority.cpp @@ -24,25 +24,22 @@ #include "ss.hpp" #include -#ifdef __linux__ -#include "unistd.h" // for nice()` -#endif +#include // for nice(). + using namespace pipedal; -static constexpr int EXPECTED_RT_THREAD_PRIORITY_MAX = 81; +static constexpr int EXPECTED_RT_THREAD_PRIORITY_MAX = 95; -static constexpr int RT_AUDIO_THREAD_PRIORITY = 80; -static constexpr int NICE_AUDIO_THREAD_PRIORITY = -19; +static constexpr int RT_AUDIO_THREAD_PRIORITY = 90; // one above pipewire. -static constexpr int RT_AUDIOSERVICE_THREAD_PRIORITY = 10; -static constexpr int NICE_AUDIOSERVICE_THREAD_PRIORITY = -17; +static constexpr int RT_AUDIOSERVICE_THREAD_PRIORITY = 85; // one above pipewire service thread -static constexpr int RT_LV2SCHEDULER_THREAD_PRIORITY = -1; -static constexpr int NICE_LV2SCHEDULER_THREAD_PRIORITY = 2; // nice(2): don't let plugins screw things up by pinning the CPU +static constexpr int RT_LV2SCHEDULER_THREAD_PRIORITY = 5; static constexpr int RT_WEBSERVER_THREAD_PRIORITY = -1; -static constexpr int NICE_WEBSERVER_THREAD_PRIORITY = -2; // don't get bogged down by UI threads. + +static constexpr int NICE_WEBSERVER_PROCESS_PRIORITY = -9; // above chrome renderer, below pipewire.. bool pipedal::IsRtPreemptKernel(SchedulerPriority priority) { @@ -71,7 +68,7 @@ bool pipedal::IsRtPreemptKernel(SchedulerPriority priority) #endif } -static void SetPriority(int realtimePriority, int nicePriority, const char *priorityName) +static void SetPriority(int realtimePriority, const char *priorityName) { if (realtimePriority != -1) @@ -79,12 +76,20 @@ static void SetPriority(int realtimePriority, int nicePriority, const char *prio int initialPriority = realtimePriority; int min = sched_get_priority_min(SCHED_RR); int max = sched_get_priority_max(SCHED_RR); + if (max > EXPECTED_RT_THREAD_PRIORITY_MAX) + { + max = EXPECTED_RT_THREAD_PRIORITY_MAX; + } if (realtimePriority > max) { realtimePriority = max + EXPECTED_RT_THREAD_PRIORITY_MAX-realtimePriority; } if (realtimePriority < min) { realtimePriority = min; } + if (realtimePriority < 1) + { + realtimePriority = 1; + } if (initialPriority != realtimePriority) { Lv2Log::warning( @@ -104,15 +109,9 @@ static void SetPriority(int realtimePriority, int nicePriority, const char *prio } else { - Lv2Log::debug(SS("Failed to set RT thread priority for " << priorityName << " (" << strerror(result) << ")")); + Lv2Log::warning(SS("Failed to set RT thread priority for " << priorityName << " (" << strerror(result) << ")")); } } - // If the RT scheduler isn't working, fall back to using NICE priority. - int result = nice(nicePriority); - if (result == -1) - { - Lv2Log::error(SS("Failed Failed to set thread priority. (" << priorityName << ")")); - } } void pipedal::SetThreadPriority(SchedulerPriority priority) @@ -122,16 +121,27 @@ void pipedal::SetThreadPriority(SchedulerPriority priority) switch (priority) { case SchedulerPriority::RealtimeAudio: - SetPriority(RT_AUDIO_THREAD_PRIORITY, NICE_AUDIO_THREAD_PRIORITY, "RealtimeAudio"); + SetPriority(RT_AUDIO_THREAD_PRIORITY, "RealtimeAudio"); break; case SchedulerPriority::AudioService: - SetPriority(RT_AUDIOSERVICE_THREAD_PRIORITY, NICE_AUDIOSERVICE_THREAD_PRIORITY, "AudioService"); + SetPriority(RT_AUDIOSERVICE_THREAD_PRIORITY, "AudioService"); break; case SchedulerPriority::Lv2Scheduler: - SetPriority(RT_LV2SCHEDULER_THREAD_PRIORITY, NICE_LV2SCHEDULER_THREAD_PRIORITY, "Lv2Scheduler"); + SetPriority(RT_LV2SCHEDULER_THREAD_PRIORITY, "Lv2Scheduler"); break; case SchedulerPriority::WebServerThread: - SetPriority(RT_WEBSERVER_THREAD_PRIORITY, NICE_WEBSERVER_THREAD_PRIORITY, "Lv2Scheduler"); + { + // do this by boosting the process priority + int currentNiceValue = nice(0); + if (currentNiceValue != NICE_WEBSERVER_PROCESS_PRIORITY) + { + errno = 0; + int ret = nice(NICE_WEBSERVER_PROCESS_PRIORITY-currentNiceValue); + if (ret == -1 && errno != 0) { + Lv2Log::error("Failed to set process nice value."); + } + } + } break; default: Lv2Log::error("Invalid scheduler priority."); diff --git a/src/SplitEffect.hpp b/src/SplitEffect.hpp index b85fdc2..6ed253b 100644 --- a/src/SplitEffect.hpp +++ b/src/SplitEffect.hpp @@ -370,6 +370,9 @@ namespace pipedal virtual void RequestAllPathPatchProperties() {} + virtual void PrepareNoInputEffect(int numberOfInputs,size_t maxBufferSize) override { + // do nothing. + } virtual int GetNumberOfOutputAudioPorts() const { return numberOfOutputPorts; @@ -378,10 +381,15 @@ namespace pipedal { return (int)this->inputs.size(); } + virtual int GetNumberOfInputAudioBuffers() const { return this->inputs.size(); } + virtual float *GetAudioInputBuffer(int index) const { return inputs[index]; } + + virtual int GetNumberOfOutputAudioBuffers() const {return this->outputBuffers.size(); } + virtual float *GetAudioOutputBuffer(int index) const { return this->outputBuffers[index]; diff --git a/src/StateInterface.cpp b/src/StateInterface.cpp index ecf8cdb..83fe213 100644 --- a/src/StateInterface.cpp +++ b/src/StateInterface.cpp @@ -199,7 +199,7 @@ const void *StateInterface::StateRetrieveFunction( *size = entry.value_.size(); *type = map.GetUrid(entry.atomType_.c_str()); *flags = entry.flags_; - return (void*)&entry.value_[0]; + return entry.value_.data(); } diff --git a/src/Storage.cpp b/src/Storage.cpp index f60201f..8fa628f 100644 --- a/src/Storage.cpp +++ b/src/Storage.cpp @@ -34,6 +34,9 @@ #include "ss.hpp" #include "ofstream_synced.hpp" #include "ModFileTypes.hpp" +#include +#include +#include "util.hpp" using namespace pipedal; namespace fs = std::filesystem; @@ -43,32 +46,6 @@ const char *BANKS_FILENAME = "index.banks"; #define USER_SETTINGS_FILENAME "userSettings.json"; -static bool isSubdirectory(const fs::path &path, const fs::path &basePath) -{ - auto iPath = path.begin(); - for (auto i = basePath.begin(); i != basePath.end(); ++i) - { - if (iPath == path.end()) - { - return false; - } - - if ((*i) != (*iPath)) - { - return false; - } - ++iPath; - } - while (iPath != path.end()) - { - if (iPath->string() == "..") - { - return false; - } - ++iPath; - } - return true; -} static bool hasSyntheticModRoot(const UiFileProperty &fileProperty) { @@ -1388,7 +1365,7 @@ uint64_t Storage::SavePluginPreset( void Storage::UpdatePluginPresets(const PluginUiPresets &pluginPresets) { // handles deletions, renaming, and reordering only. - // If you need to add a preset, you neet to call SavePluginPreset or DulicatePluginPreset instead. + // If you need to add a preset, you need to call SavePluginPreset or DuplicatePluginPreset instead. PluginPresets presets = this->GetPluginPresets(pluginPresets.pluginUri_); PluginPresets newPresets; @@ -1623,51 +1600,6 @@ static void ThrowPermissionDeniedError() throw std::logic_error("Permission denied."); } -std::vector Storage::GetFileList(const UiFileProperty &fileProperty) -{ - if (!UiFileProperty::IsDirectoryNameValid(fileProperty.directory())) - { - ThrowPermissionDeniedError(); - } - - std::vector result; - - // if fileProperty has a user-accessible directory, push the entire file path. - if (fileProperty.directory().size() != 0) - { - std::filesystem::path audioFileDirectory = this->GetPluginUploadDirectory() / fileProperty.directory(); - try - { - for (auto const &dir_entry : std::filesystem::directory_iterator(audioFileDirectory)) - { - if (dir_entry.is_regular_file()) - { - auto &path = dir_entry.path(); - auto name = path.filename().string(); - if (name.length() > 0 && name[0] != '.') // don't show hidden files. - { - if (fileProperty.IsValidExtension(path.extension().string())) - { - // a relative path! - result.push_back(path); - } - } - } - } - } - catch (const std::exception &error) - { - throw std::logic_error("GetFileList failed. Directory not found: " + audioFileDirectory.string()); - } - } - - // sort lexicographically - auto collator = Locale::GetInstance()->GetCollator(); - - std::sort(result.begin(), result.end(), [&collator](const std::string &left, const std::string &right) - { return collator->Compare(left, right) < 0; }); - return result; -} static bool ensureNoDotDot(const std::filesystem::path &path) { @@ -1695,8 +1627,10 @@ static bool ensureNoDotDot(const std::filesystem::path &path) return true; } + static void AddFilesToResult( FileRequestResult &result, + const ModFileTypes::ModDirectory *modDirectoryInfo, //yyx const UiFileProperty &fileProperty, const fs::path &rootPath) { @@ -1705,7 +1639,12 @@ static void AddFilesToResult( return; // silently without error. } auto &resultFiles = result.files_; - try + + std::set validExtensions = fileProperty.GetPermittedFileExtensions( + modDirectoryInfo? modDirectoryInfo->modType: ""); + + + try { for (auto const &dir_entry : std::filesystem::directory_iterator(rootPath)) { @@ -1713,9 +1652,15 @@ static void AddFilesToResult( auto name = path.filename().string(); if (dir_entry.is_regular_file()) { + std::string extension = UiFileProperty::GetFileExtension(path); + + bool match = false; if (name.length() > 0 && name[0] != '.') // don't show hidden files. { - if (fileProperty.IsValidExtension(path.extension().string())) + bool match = validExtensions.size() == 0 || validExtensions.contains(extension) + || validExtensions.contains(".*"); + + if (match) { resultFiles.push_back( FileEntry(path, name, false, false)); @@ -1778,13 +1723,15 @@ FileRequestResult Storage::GetModFileList2(const std::string &relativePath, cons result.breadcrumbs_.push_back({"", "Home"}); fs::path fsRelativePath{relativePath}; + const ModFileTypes::ModDirectory *rootModDirectory = nullptr; for (const auto &modDirectory : fileProperty.modDirectories()) { const ModFileTypes::ModDirectory *modDirectoryInfo = ModFileTypes::GetModDirectory(modDirectory); if (modDirectoryInfo) { - if (isSubdirectory(fsRelativePath, uploadsDirectory / modDirectoryInfo->pipedalPath)) + if (IsSubdirectory(fsRelativePath, uploadsDirectory / modDirectoryInfo->pipedalPath)) { + rootModDirectory = modDirectoryInfo; modDirectoryPath = uploadsDirectory / modDirectoryInfo->pipedalPath; result.breadcrumbs_.push_back({modDirectoryPath.string(), modDirectoryInfo->displayName}); break; @@ -1793,7 +1740,7 @@ FileRequestResult Storage::GetModFileList2(const std::string &relativePath, cons } if (modDirectoryPath.empty() && fileProperty.useLegacyModDirectory()) { - if (isSubdirectory(fsRelativePath, uploadsDirectory / fileProperty.directory())) + if (IsSubdirectory(fsRelativePath, uploadsDirectory / fileProperty.directory())) { modDirectoryPath = uploadsDirectory / fileProperty.directory(); result.breadcrumbs_.push_back({modDirectoryPath.string(), fs::path(fileProperty.directory()).filename().string()}); @@ -1804,12 +1751,12 @@ FileRequestResult Storage::GetModFileList2(const std::string &relativePath, cons } } - // add remaing path segements as breadcrumbs. + // add reaming path segments as breadcrumbs. { fs::path modPath{modDirectoryPath}; fs::path rp{relativePath}; auto iRp = rp.begin(); - // skip past one or more segments in the modDiretoryPath. + // skip past one or more segments in the modDirectoryPath. for (auto iModPath = modPath.begin(); iModPath != modPath.end(); ++iModPath) { if (iRp != rp.end()) @@ -1824,7 +1771,8 @@ FileRequestResult Storage::GetModFileList2(const std::string &relativePath, cons } } - AddFilesToResult(result, fileProperty, relativePath); + + AddFilesToResult(result,rootModDirectory, fileProperty, relativePath); result.currentDirectory_ = relativePath; return result; } @@ -1907,11 +1855,18 @@ FileRequestResult Storage::GetFileList2(const std::string &relativePath_, const ++iAbsolutePath; } } - if (!isSubdirectory(absolutePath, pluginRootDirectory)) + if (!IsSubdirectory(absolutePath, pluginRootDirectory)) { throw std::runtime_error(SS("Improper location. " << absolutePath)); } - AddFilesToResult(result, fileProperty, absolutePath); + + const ModFileTypes::ModDirectory*pModDirectory = nullptr; + if (fileProperty.modDirectories().size() > 0) + { + pModDirectory = ModFileTypes::GetModDirectory(fileProperty.modDirectories()[0]); + } + + AddFilesToResult(result,pModDirectory, fileProperty, absolutePath); return result; } @@ -2005,7 +1960,10 @@ std::filesystem::path Storage::MakeUserFilePath(const std::string &directory, co } return result; } -std::string Storage::UploadUserFile(const std::string &directory, const std::string &patchProperty, const std::string &filename, std::istream &stream, size_t contentLength) +std::string Storage::UploadUserFile(const std::string &directory, + UiFileProperty::ptr uiFileProperty, + const std::string &filename, + std::istream &stream, size_t contentLength) { std::filesystem::path path; if (directory.length() != 0) @@ -2013,14 +1971,23 @@ std::string Storage::UploadUserFile(const std::string &directory, const std::str path = this->MakeUserFilePath(directory, filename); } else - { - if (patchProperty.length() == 0) - { - throw std::logic_error("Malformed request."); - } - throw std::logic_error("patchProperty directory not implemented."); + throw std::logic_error("Directory argument not supplied."); } + fs::path relativePath; + try { + relativePath = MakeRelativePath(path,this->GetPluginUploadDirectory()); + } catch (const std::exception& e) + { + throw std::logic_error("Permission denied. Path is outside the upload storage directory."); + } + + if (!uiFileProperty->IsValidExtension(relativePath)) + { + throw std::logic_error("Permission denied. Invalid file extension for this directory."); + } + + { try { @@ -2138,24 +2105,84 @@ void Storage::FillSampleDirectoryTree(FilePropertyDirectoryTree *node, const std return collator->Compare(left->directoryName_, right->directoryName_) < 0; }); } -FilePropertyDirectoryTree::ptr Storage::GetFilePropertydirectoryTree(const UiFileProperty &uiFileProperty) + + + +static void GetAllExtensions(std::set&result, const std::filesystem::path &path) +{ + assert(fs::is_directory(path)); + + for (const auto&dirEnt : fs::directory_iterator(path)) + { + if (dirEnt.is_directory()) + { + GetAllExtensions(result,dirEnt.path()); + } else { + std::string filename = dirEnt.path().filename(); + if (!filename.starts_with('.')) + { + if (dirEnt.path().has_extension()) + { + std::string extension = dirEnt.path().extension(); + result.insert(extension); + } + } + } + } +} + +static std::set GetAllExtensions(const std::filesystem::path &path) +{ + std::set result; + if (fs::is_regular_file(path)) { + result.insert(UiFileProperty::GetFileExtension(path)); + } else { + GetAllExtensions(result,path); + } + return result; +} +FilePropertyDirectoryTree::ptr Storage::GetFilePropertydirectoryTree(const UiFileProperty &uiFileProperty, const std::filesystem::path&selectedPath) { fs::path uploadDirectory = this->GetPluginUploadDirectory(); + fs::path relativePath; + try { + relativePath = MakeRelativePath(selectedPath,uploadDirectory); + } catch (const std::exception&e) { + // not an upload directory. + throw std::runtime_error(SS("Permission denied: " << selectedPath)); + } + + std::set fileExtensions = GetAllExtensions(selectedPath); + + if (hasSyntheticModRoot(uiFileProperty)) { + + if (relativePath.empty()) + { + throw std::runtime_error(SS("Permission denied: " << selectedPath)); + } FilePropertyDirectoryTree::ptr result = std::make_unique("", "Home"); result->isProtected_ = true; + std::string parentModDirectory = uiFileProperty.getParentModDirectory(relativePath); + for (const auto &modDirectory : uiFileProperty.modDirectories()) { auto modDirectoryInfo = ModFileTypes::GetModDirectory(modDirectory); if (modDirectoryInfo) { - auto childPath = uploadDirectory / modDirectoryInfo->pipedalPath; - FilePropertyDirectoryTree::ptr child = std::make_unique( - childPath, modDirectoryInfo->displayName); - FillSampleDirectoryTree(child.get(), childPath); - result->children_.push_back(std::move(child)); + if (IsSubset(fileExtensions,modDirectoryInfo->fileExtensions) || + modDirectoryInfo->fileExtensions.contains(".*") || + modDirectoryInfo->fileExtensions.empty() // Private directory that accepts files of any type. + ) + { + auto childPath = uploadDirectory / modDirectoryInfo->pipedalPath; + FilePropertyDirectoryTree::ptr child = std::make_unique( + childPath, modDirectoryInfo->displayName); + FillSampleDirectoryTree(child.get(), childPath); + result->children_.push_back(std::move(child)); + } } } if (uiFileProperty.useLegacyModDirectory()) @@ -2186,6 +2213,11 @@ FilePropertyDirectoryTree::ptr Storage::GetFilePropertydirectoryTree(const UiFil } } +bool Storage::IsInUploadsDirectory(const std::filesystem::path&path) const +{ + return IsSubdirectory(path,this->GetPluginUploadDirectory()); +} + const PluginPresetIndex &Storage::GetPluginPresetIndex() { return pluginPresetIndex; diff --git a/src/Storage.hpp b/src/Storage.hpp index 810e128..0e50aa8 100644 --- a/src/Storage.hpp +++ b/src/Storage.hpp @@ -37,6 +37,7 @@ namespace pipedal { class UiFileProperty; class Lv2PluginInfo; +class UiFileProperty; class CurrentPreset { public: @@ -153,7 +154,8 @@ public: void MoveBank(int from, int to); int64_t DeleteBank(int64_t bankId); - std::vector GetFileList(const UiFileProperty&fileProperty); + bool IsInUploadsDirectory(const std::filesystem::path&path) const; + FileRequestResult GetFileList2(const std::string&relativePath,const UiFileProperty&fileProperty); FileRequestResult GetModFileList2(const std::string &relativePath,const UiFileProperty &fileProperty); @@ -222,13 +224,14 @@ public: void SetSystemMidiBindings(const std::vector&bindings); std::vector GetSystemMidiBindings(); void DeleteSampleFile(const std::filesystem::path &fileName); - std::string UploadUserFile(const std::string &directory, const std::string &patchProperty,const std::string&filename,std::istream&stream, size_t contentLength); + std::string UploadUserFile(const std::string &directory, + std::shared_ptr uiFileProperty ,const std::string&filename,std::istream&stream, size_t contentLength); std::string CreateNewSampleDirectory(const std::string&relativePath, const UiFileProperty&uiFileProperty); std::string RenameFilePropertyFile( const std::string&oldRelativePath, const std::string&newRelativePath, const UiFileProperty&uiFileProperty); - FilePropertyDirectoryTree::ptr GetFilePropertydirectoryTree(const UiFileProperty&uiFileProperty); + FilePropertyDirectoryTree::ptr GetFilePropertydirectoryTree(const UiFileProperty&uiFileProperty,const std::filesystem::path&selectedPath); }; diff --git a/src/SystemConfigFile.cpp b/src/SystemConfigFile.cpp index 8bea50b..cc56266 100644 --- a/src/SystemConfigFile.cpp +++ b/src/SystemConfigFile.cpp @@ -109,6 +109,16 @@ static inline std::string ValuePart(const std::string &line) return line.substr(pos + 1); } +void SystemConfigFile::Set(int position,const std::string&line) +{ + if ((size_t)position == lines.size()) + { + lines.push_back(line); + } else { + lines[position] = line; + } +} + std::string SystemConfigFile::Get(const std::string &key) const { int64_t lineIndex = GetLine(key); diff --git a/src/SystemConfigFile.hpp b/src/SystemConfigFile.hpp index a8622cb..ab9aeb4 100644 --- a/src/SystemConfigFile.hpp +++ b/src/SystemConfigFile.hpp @@ -50,6 +50,8 @@ public: const std::string& Get(int position) const { return lines[position]; } void Set(const std::string&key,const std::string &value); void Set(const std::string&key,const std::string &value, const std::string&comment); + void Set(int position,const std::string&line); + void SetDefault(const std::string&key, const std::string &value); void SetDefault(const std::string&key,const std::string &value, const std::string &comment); diff --git a/src/Updater.hpp b/src/Updater.hpp index 201422b..24e760d 100644 --- a/src/Updater.hpp +++ b/src/Updater.hpp @@ -27,6 +27,7 @@ #include "json.hpp" #include #include "UpdaterStatus.hpp" +#include namespace pipedal diff --git a/src/WebServer.cpp b/src/WebServer.cpp index d0f2b04..0ad2718 100644 --- a/src/WebServer.cpp +++ b/src/WebServer.cpp @@ -576,7 +576,7 @@ static std::string getIpv4Address(const std::string interface) /* I want to get an IPv4 IP address */ ifr.ifr_addr.sa_family = AF_INET; - /* I want an IP address attached to "eth0" */ + /* I want an IP address attached to "ethernet" */ strncpy(ifr.ifr_name, interface.c_str(), IFNAMSIZ - 1); int result = ioctl(fd, SIOCGIFADDR, &ifr); @@ -636,6 +636,40 @@ std::string GetFromAddress(const tcp::socket &socket) s << socket.remote_endpoint().address().to_string() << ':' << socket.remote_endpoint().port(); return s.str(); } + +static bool encoding_allowed(const std::string&acceptEncodingHeader,const std::string&encoding) +{ + auto npos = acceptEncodingHeader.find(encoding); + if (npos == std::string::npos) + return false; + std::vector encodings = split(acceptEncodingHeader, ','); + for (auto &e : encodings) + { + if (e.starts_with(encoding)) { + if (e.length() == encoding.length()) + return true; + if (e[encoding.length()] == ';') + return true; + } + } + return false; +} + +static bool can_use_gzip_encoding( + const std::string &acceptEncodingHeader, + const std::filesystem::path &filename, + std::filesystem::path *gzName) +{ + if (!encoding_allowed(acceptEncodingHeader, "gzip")) + return false; + *gzName = filename.string() + ".gz"; + if (std::filesystem::exists(*gzName)) { + return true; + } + return false; +} + + namespace pipedal { @@ -1125,12 +1159,22 @@ namespace pipedal } } + + std::string mimeType = mime_type(filename); + + std::filesystem::path gzName; + + if (can_use_gzip_encoding(req.get(HttpField::accept_encoding) ,filename,&gzName) ) + { + filename = gzName; + res.set(HttpField::content_encoding,"gzip"); + } + if (req.method() != HttpVerb::get) { ServerError(*con, "Unknown HTTP-Method"); return; } - std::string mimeType = mime_type(filename); file.open(filename.c_str(), std::ios::in); if (!file) @@ -1413,21 +1457,22 @@ void WebServerImpl::DisplayIpAddresses() ss << "Listening on mDns address " << hostName << ":" << this->port; Lv2Log::info(ss.str()); } - std::string ipv4Address = getIpv4Address("eth0"); - if (ipv4Address.length() != 0) + auto ethAddresses = GetEthernetIpv4Addresses(); + for (const autoðAddress: ethAddresses) { - Lv2Log::info(SS("Listening on eth0 address " << ipv4Address << ":" << this->port)); + Lv2Log::info(SS("Listening on " << ethAddress << ":" << this->port)); + } - std::string wifiAddress = getIpv4Address("wlan0"); - if (wifiAddress.length() != 0) + auto wifiAddress = GetWlanIpv4Address(); + if (wifiAddress) { - if (wifiAddress == "10.42.0.1") + if (*wifiAddress == "10.42.0.1") { - Lv2Log::info(SS("Listening on Wi-Fi hotspot address " << wifiAddress << ":" << this->port)); + Lv2Log::info(SS("Listening on Wi-Fi hotspot address " << *wifiAddress << ":" << this->port)); } else { - Lv2Log::info(SS("Listening on Wi-Fi address " << wifiAddress << ":" << this->port)); + Lv2Log::info(SS("Listening on Wi-Fi address " << *wifiAddress << ":" << this->port)); } } } \ No newline at end of file diff --git a/src/WebServer.hpp b/src/WebServer.hpp index f85657a..e121cc2 100644 --- a/src/WebServer.hpp +++ b/src/WebServer.hpp @@ -71,6 +71,8 @@ public: constexpr static const char* date = "Date"; constexpr static const char* referer = "Referer"; constexpr static const char * location = "Location"; + constexpr static const char* accept_encoding = "Accept-Encoding"; + constexpr static const char* content_encoding = "Content-Encoding"; }; diff --git a/src/WebServerConfig.cpp b/src/WebServerConfig.cpp index 59c8337..c42488c 100644 --- a/src/WebServerConfig.cpp +++ b/src/WebServerConfig.cpp @@ -550,11 +550,21 @@ public: res.set(HttpField::content_type, "application/json"); res.set(HttpField::cache_control, "no-cache"); - std::string instanceId = request_uri.query("id"); + std::string instanceIdString = request_uri.query("id"); std::string directory = request_uri.query("directory"); std::string filename = request_uri.query("filename"); std::string patchProperty = request_uri.query("property"); + int64_t instanceId; + { + std::istringstream ss { instanceIdString}; + ss >> instanceId; + if (!ss) + { + throw PiPedalException("Invalid instanceID"); + } + } + if (patchProperty.length() == 0 && directory.length() == 0) { throw PiPedalException("Malformed request."); @@ -588,7 +598,7 @@ public: if (extensionChecker.IsValidExtension(extension)) { auto si = zipFile->GetFileInputStream(inputFile); - std::string path = this->model->UploadUserFile(directory, patchProperty, inputFile, si, zipFile->GetFileSize(inputFile)); + std::string path = this->model->UploadUserFile(directory, instanceId,patchProperty, inputFile, si, zipFile->GetFileSize(inputFile)); } } } @@ -606,7 +616,7 @@ public: } else { - outputFileName = this->model->UploadUserFile(directory, patchProperty, filename, req.get_body_input_stream(), req.content_length()); + outputFileName = this->model->UploadUserFile(directory, instanceId,patchProperty, filename, req.get_body_input_stream(), req.content_length()); } if (outputFileName.is_relative()) diff --git a/src/Worker.cpp b/src/Worker.cpp index 1f0361d..f94b72d 100644 --- a/src/Worker.cpp +++ b/src/Worker.cpp @@ -39,7 +39,6 @@ #include #include "Lv2Log.hpp" #include -#include // for nice( #include #include "util.hpp" #include "SchedulerPriority.hpp" diff --git a/src/kconfigMain.cpp b/src/kconfigMain.cpp new file mode 100644 index 0000000..f7f7982 --- /dev/null +++ b/src/kconfigMain.cpp @@ -0,0 +1,710 @@ +// Copyright (c) 2024 Robin E. R. Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +/* + Preamble: + + The choice of backend for this project was unfortunate. The ftxui project has ungodly horrible problems + dealing with mouse and keyboard focus. Really embarassingly horrible problems. And no real sensible + support for modal dialogs. As well as deficiences in keyboard handling (no way to intercept the ESC key, for example, + which would have been a nice feature). + + So the code that follows is .... unpleasant, as it does its best to work around severe problesm and + deficiencies in FTXUI. + + Tempting as it is to rewrite from scratch, FTXUI *probably* deals with unpleasant platform issues and + complications in ncurses, which may not be entirely straighforward on windows. The tab/nav/cursor implementation + is also *almost* nice (although being able to use the enter key for OK in dialogs would have been nice, and ESC for + cancel). + + Things to watch out for: Focus handling in the FTXUI RadioBox control was unsalvageable. This code hacks together + a replacement implementation using Checkboxes instead. Checkbox focus handling was also broken, but is (just barely) + salageable. Also broken under window resizing. (It recovers when you mose over). + + Nevertheless, FTXUI is truly awful. Do not use this package. You have been warned. +*/ + +#undef _GLIBCXX_DEBUG + +#include "ftxui/component/captured_mouse.hpp" // for ftxui +#include "ftxui/component/component.hpp" // for Input, Renderer, Vertical +#include "ftxui/component/component_base.hpp" // for ComponentBase +#include "ftxui/component/component_options.hpp" // for InputOption +#include "ftxui/component/screen_interactive.hpp" // for Component, ScreenInteractive +#include "ftxui/dom/elements.hpp" // for text, hbox, separator, Element, operator|, vbox, border +#include "ftxui/util/ref.hpp" // for Ref +#include "ftxui/component/animation.hpp" +#include +#include +#include +#include "BootConfig.hpp" +#include +#include "CommandLineParser.hpp" +#include "PrettyPrinter.hpp" +#include "SysExec.hpp" + + +using namespace ftxui; +using Clock = ftxui::animation::Clock; +using namespace pipedal; + +std::string spinnerText(const Clock::time_point &startTime) +{ + using namespace std::chrono; + + constexpr int MAX_LENGTH = 40; + constexpr int N_DOTS = 3; + + int64_t ms = std::chrono::duration_cast(Clock::now() - startTime).count(); + + int64_t position = (ms * MAX_LENGTH / 3000) % (MAX_LENGTH + N_DOTS); + + char result[MAX_LENGTH + 1]; + for (int64_t i = 0; i < MAX_LENGTH; ++i) + { + if (i >= position && i < position + N_DOTS) + { + result[i] = '.'; + } + else + { + result[i] = ' '; + } + } + result[MAX_LENGTH] = '\0'; + return result; +} + +RadioboxOption CustomRadioboxOption(int *value, int *forceFocus) +{ + RadioboxOption option = RadioboxOption::Simple(); + if (*forceFocus >= 0) + { + // option.focused_entry = *forceFocus; + *forceFocus = -1; + } + option.on_change = [value, forceFocus]() mutable + { + *forceFocus = *value; + }; + + option.transform = [](const EntryState &s) -> Element + { +#if 0 + // Microsoft terminal do not use fonts able to render properly the default + // radiobox glyph. + auto prefix = text(s.state ? "(*) " : "( ) "); // NOLINT +#else + auto prefix = text(s.state ? "◉ " : "○ "); // NOLINT +#endif + auto t = text(s.label); + if (s.active != s.focused) + { + s.label; + } + if (s.active) + { + t = t | color(Color::Red); + } + if (s.focused) + { + t = t | bgcolor(Color::GrayDark); + } + + return hbox({prefix, t}); + }; + return option; +} +CheckboxOption CustomCheckboxOption(bool *forceFocus) +{ + CheckboxOption option = CheckboxOption::Simple(); + + option.on_change = [forceFocus]() mutable + { + *forceFocus = true; + }; + option.transform = [](const EntryState &s) -> Element + { +#if 0 + // Microsoft terminal do not use fonts able to render properly the default + // radiobox glyph. + auto prefix = text(s.state ? "[X] " : "[ ] "); // NOLINT +#else + auto prefix = text(s.state ? "▣ " : "☐ "); // NOLINT +#endif + auto t = text(s.label); + if (s.active != s.focused) + { + s.label; + } + if (s.active) + { + t = t | color(Color::White); + } + if (s.focused) + { + t = t | color(Color::White) | bgcolor(Color::GrayDark); + } + + return hbox({prefix, t}); + }; + return option; +} +CheckboxOption CustomRadioCheckboxOption(bool *selections, size_t size, size_t index, int *forceFocus) +{ + CheckboxOption option = CheckboxOption::Simple(); + + option.on_change = [selections, size, index, forceFocus]() mutable + { + *forceFocus = index; + for (size_t i = 0; i < size; ++i) + { + selections[i] = (i == index); + } + }; + option.transform = [](const EntryState &s) -> Element + { +#if defined(FTXUI_MICROSOFT_TERMINAL_FALLBACK) + // Microsoft terminal do not use fonts able to render properly the default + // radiobox glyph. + auto prefix = text(s.state ? "(*) " : "( ) "); // NOLINT +#else + auto prefix = text(s.state ? "◉ " : "○ "); // NOLINT +#endif + auto t = text(s.label); + if (s.active != s.focused) + { + s.label; + } + if (s.active) + { + t = t | color(Color::White); + } + if (s.focused) + { + t = t | color(Color::White) | bgcolor(Color::GrayDark); + } + + return hbox({prefix, t}); + }; + return option; +} + +std::unique_ptr setBootParametersThread; + +void setBootParameters(std::shared_ptr newConfig, std::function onComplete) +{ + newConfig->WriteConfiguration(onComplete); +} + +void kconfigUi(void) +{ + const std::string kernelType = "PREEMPT_DYNAMIC"; + + int kernelMode = 0; + + const int NO_DIALOG = 0; + const int PROCESSING_DIALOG = 1; + const int REBOOT_DIALOG = 2; + const int ERROR_DIALOG = 3; + + Clock::time_point startTime = Clock::now(); + + int dialogIndex = 0; + std::string errorMessage; + + auto screen = ScreenInteractive::Fullscreen(); + + auto quit = [&screen]() + { + screen.Exit(); + }; + + std::mutex updateCallbackMutex; + bool updatePending = false; + bool updateComplete = false; + std::string updateErrorMessage; + + auto onError = [&errorMessage, &dialogIndex](const std::string &error) mutable + { + errorMessage = error; + dialogIndex = ERROR_DIALOG; + }; + + bool useThreadedIrqs = true; + + BootConfig::DynamicSchedulerT dynamicScheduler = BootConfig::DynamicSchedulerT::NotApplicable; + bool threadedIrqsAvailable = false; + bool configRequired = false; + + std::unique_ptr bootConfig; + using DynamicSchedulerT = BootConfig::DynamicSchedulerT; + try + { + bootConfig = std::make_unique(); + threadedIrqsAvailable = bootConfig->CanSetThreadIrqs(); + dynamicScheduler = bootConfig->DynamicScheduler(); + useThreadedIrqs = bootConfig->ThreadedIrqs(); + configRequired = bootConfig->DynamicScheduler() != DynamicSchedulerT::NotApplicable || useThreadedIrqs; + + if (!bootConfig->CanWriteConfig()) + { + throw std::runtime_error("Unrecognized boot loader. Unable to reconfigure the kernel."); + } + } + catch (const std::exception &e) + { + onError(e.what()); + } + + bool forceThreadedIrqFocus = false; + + + int dynamicSchedulerIndex = (int)dynamicScheduler; + std::vector preemptModeLabelRefs = { + " none ", + " voluntary ", + " full (recommended) "}; + bool preemptModeSelections[3]; // std::vector is bizarrely specialized, so it doesn't wrok. + + + for (int i = 0; i < 3; ++i) + { + preemptModeSelections[i] = (i == dynamicSchedulerIndex); + } + + + + int forceSchedulerFocus = -1; + + Component preemptCheckBox0 = + Checkbox( + preemptModeLabelRefs[0], + &(preemptModeSelections[0]), + CustomRadioCheckboxOption(preemptModeSelections, 3, 0, &forceSchedulerFocus)); + Component preemptCheckBox1 = + Checkbox( + preemptModeLabelRefs[1], + &(preemptModeSelections[1]), + CustomRadioCheckboxOption(preemptModeSelections, 3, 1, &forceSchedulerFocus)); + Component preemptCheckBox2 = + Checkbox( + preemptModeLabelRefs[2], + &(preemptModeSelections[2]), + CustomRadioCheckboxOption(preemptModeSelections, 3, 2, &forceSchedulerFocus)); + + std::vector preemptCheckboxes{ + preemptCheckBox0, + preemptCheckBox1, + preemptCheckBox2, + }; + + ConstStringRef checkboxRef{" Enable threadirqs (recommended) "}; + Component threadedIrqCheckbox = Checkbox(checkboxRef, &useThreadedIrqs, CustomCheckboxOption(&forceThreadedIrqFocus)); + + // The basic input components: + auto handleSave = [&]() + { + if (updatePending) + { + onError("Save already running."); + return; + } + + dialogIndex = PROCESSING_DIALOG; + + std::shared_ptr newBootConfig = std::make_shared(); + + if (bootConfig->CanSetThreadIrqs()) + { + newBootConfig->ThreadedIrqs(useThreadedIrqs); + } + if (bootConfig->DynamicScheduler() != DynamicSchedulerT::NotApplicable) + { + int schedulerIndex = -1; + for (size_t i = 0; i < 3; ++i) + { + if (preemptModeSelections[i]) + { + schedulerIndex = i; + break; + } + } + if (schedulerIndex == -1) + { + onError("Internal state error."); + } + else + { + newBootConfig->DynamicScheduler((DynamicSchedulerT)schedulerIndex); + + if (newBootConfig->Changed()) + { + { + std::lock_guard lock{updateCallbackMutex}; + updatePending = true; + updateComplete = false; + updateErrorMessage = true; + } + + newBootConfig->WriteConfiguration( + [&](bool success, std::string errorMessage) + { + // potentially wrong-threaded. We pick up the result because we're animating the "..." + std::lock_guard lock(updateCallbackMutex); + updateComplete = true; + updateErrorMessage = errorMessage; + }); + } else { + // no changes. Just quit. + quit(); + } + } + } + }; + + Component okButton = Button( + ConstStringRef(" OK "), + [&]() mutable + { + screen.ExitLoopClosure()(); + }, + ButtonOption::Ascii()); + + Component saveButton = Button( + ConstStringRef(" Save "), + [&]() mutable + { + handleSave(); + }, + ButtonOption::Ascii()); + + Component cancelButton = Button( + ConstStringRef(" Cancel "), + [&screen]() mutable + { + screen.ExitLoopClosure()(); + }, + ButtonOption::Ascii()); + + // The component tree: + Component tabOrder; + + if (configRequired) + { + Components components; + if (dynamicScheduler != DynamicSchedulerT::NotApplicable) + { + components.push_back(preemptCheckBox0); + components.push_back(preemptCheckBox1); + components.push_back(preemptCheckBox2); + } + if (threadedIrqsAvailable) + { + components.push_back(threadedIrqCheckbox); + } + components.push_back(Container::Horizontal({cancelButton, saveButton})); + + tabOrder = Container::Vertical(components); + } + else + { + tabOrder = Container::Vertical({okButton}); + } + + // component tree for Processing dialog. + auto focusTrap = Container::Horizontal({Button(ButtonOption::Ascii())}); + + auto mainRenderer = Renderer( + tabOrder, + [&]() mutable + { + if (forceThreadedIrqFocus) + { + threadedIrqCheckbox->TakeFocus(); + forceThreadedIrqFocus = false; + } + if (forceSchedulerFocus >= 0) + { + preemptCheckboxes[forceSchedulerFocus]->TakeFocus(); + forceSchedulerFocus = -1; + } + Elements topLevelElements; + + Elements contentElements; + { + contentElements.push_back(hbox(text("Kernel type: "), text(kernelType))); + contentElements.push_back(text("")); + + if (!configRequired) + { + contentElements.push_back(text("No configuration required.")); + } + else + { + Elements kernelCommandLineOptions; + { + kernelCommandLineOptions.push_back(text("")); + if (dynamicScheduler != DynamicSchedulerT::NotApplicable) + { + kernelCommandLineOptions.push_back(text(" Preempt")); + kernelCommandLineOptions.push_back(hbox(text(" "), preemptCheckBox0->Render(), text(" "))); + kernelCommandLineOptions.push_back(hbox(text(" "), preemptCheckBox1->Render(), text(" "))); + kernelCommandLineOptions.push_back(hbox(text(" "), preemptCheckBox2->Render(), text(" "))); + } + if (dynamicScheduler != DynamicSchedulerT::NotApplicable && threadedIrqsAvailable) + { + kernelCommandLineOptions.push_back(text("")); + } + if (threadedIrqsAvailable) + { + kernelCommandLineOptions.push_back(hbox(text(" "), threadedIrqCheckbox->Render(), text(" "))); + } + kernelCommandLineOptions.push_back(text("")); + } + contentElements.push_back( + window( + text(" Kernel Commandline Options "), + vbox(kernelCommandLineOptions))); + } + auto dialog = vbox( + {text(" PiPedal Kernel Configuration"), + separator(), + text(""), + hbox(text(" "), vbox(contentElements) | color(Color::White), text(" ")), + text(""), + text(""), + configRequired ? hbox(text("") | flex, cancelButton->Render(), saveButton->Render(), text(" ")) + : hbox(text("") | flex, okButton->Render(), text(" "))}) | + (borderStyled(BorderStyle::HEAVY) | color(Color::White)); + topLevelElements.push_back(std::move(center(dialog))); + } + return dbox(topLevelElements); + }); + mainRenderer = CatchEvent( + mainRenderer, + [&](Event event) + { + if (event.is_character()) + { + if (event == Event::Character('q')) + { + screen.ExitLoopClosure()(); + return true; + } + } + return false; + }); + auto processDialogRenderer = Renderer(focusTrap, [&]() + { + auto dialog = vbox( + { + text(" Applying changes..."), + hbox(text(" "),text(spinnerText(startTime)),text(" ")) + }) | borderHeavy | clear_under | center; + + return dialog; }); + + ConstStringRef rebootNowText(" Now "); + ConstStringRef rebootLaterText(" Later "); + + auto rebootNowButton = Button( + rebootNowText, + [&]() + { + dialogIndex = 0; + silentSysExec("sudo reboot now"); + quit(); + }, + ButtonOption::Ascii()); + auto rebootLaterButton = Button( + rebootLaterText, + [&]() + { + dialogIndex = 0; + quit(); + }, + ButtonOption::Ascii()); + auto rebootDialogContainer = Container::Horizontal({rebootLaterButton, rebootNowButton}); + + auto rebootDialogRenderer = Renderer( + rebootDialogContainer, + [&]() + { + return hbox({text(" "), + vbox({hbox(text(" "), paragraph("Reboot required. Would you like to reboot now or later?") | size(WIDTH, LESS_THAN, 35), text(" ")), + text(""), + hbox(text("") | flex, rebootLaterButton->Render(), rebootNowButton->Render(), text(" ")), + text(" ")})}) | + borderHeavy; + }); + + ////////////// ErrorDialog ///////////////////////////////////////////////// + + ConstStringRef errorOkText(" OK "); + + auto errorOkButton = Button( + errorOkText, + [&]() + { + dialogIndex = 0; + quit(); + }, + ButtonOption::Ascii()); + auto errorDialogContainer = Container::Horizontal({errorOkButton}); + + auto errorDialogRenderer = Renderer( + errorDialogContainer, + [&]() + { + return vbox( + {text(" Error"), + separator(), + + vbox({hbox(text(" "), paragraph(errorMessage) | size(WIDTH, LESS_THAN, 35), text(" ")), + text(""), + hbox(text("") | flex, errorOkButton->Render(), text(" ")) + + })}) | + borderHeavy; + }); + + ///////////////////////////////////////////////////////////////////////////// + + auto modalDialogContainer = Container::Tab( + { + + mainRenderer, + processDialogRenderer, + rebootDialogRenderer, + errorDialogRenderer}, + &dialogIndex); + + auto modalDialogRenderer = Renderer( + modalDialogContainer, + [&]() mutable + { + Element document = modalDialogContainer->ChildAt(0)->Render(); + if (dialogIndex != 0) + { + document = dbox( + document, + modalDialogContainer->ChildAt(dialogIndex)->Render() | clear_under | center); + } + if (dialogIndex == PROCESSING_DIALOG) + { + screen.RequestAnimationFrame(); + { + std::lock_guard lock(updateCallbackMutex); + if (updatePending && updateComplete) + { + updatePending = false; + updateComplete = false; + if (updateErrorMessage.length() != 0) + { + onError(updateErrorMessage); + updateErrorMessage = ""; + } else { + // operation complete. + // show the reboot dialog. + dialogIndex = REBOOT_DIALOG; + + } + + } + } + + } + return document; + }); + + screen.Loop(modalDialogRenderer); +} + + +void printHelp() +{ + using namespace std; + + PrettyPrinter pp; + + + pp << + "pipedal_kconfig - Edit kernel commandline arguments. \n" + << "Copyright (c) Robin E. R. Davies" + << "\n\n" + << "A utility that provides a user-friendly interface for configuring kernel commandline arguments that affect realtime audio performance on PREEMPT_DYANMIC kernels (like Ubuntu)." + << "\n\n" + << "Linux kernels that have PREEMPT_DYNAMIC kernels provide excellent support for real-time low-latency audio, but are not " + << "optimially configured for real-time audio by default. " + << "\n\n" + << "To provide best performance, the following two kernel commandline arguments need to be set:" + << "\n\n" + << Indent(20) + << HangingIndent() + << " preempt=full\tallows the kernel to preempt kernel threads` in order to service more urgent real-time audio tasks." + << "\n\n" + << HangingIndent() + << " threadirqs\tallows realtime audio tasks to run with higher priority than network and hard disk interrupt handlers." + << "\n\n" + << Indent(0) + << "These settings have no effect on PREEMT_RT kernels (like Raspberry Pi OS), since PREEMPT_RT kernels turn these features on by default." + << "\n\n" + << "pipedal_kconfig needs to run with root privileges." + << "\n\n" + ; + + +} + +int main(int argc, char**argv) +{ + bool help = false; + bool noSudo = false; + CommandLineParser cmdline; + cmdline.AddOption("-h",&help); + cmdline.AddOption("--help",&help); + cmdline.AddOption("--no-sudo",&noSudo); // undocumented option to allow debugging of most of the code, except for the finial privileged bits. + + + try { + cmdline.Parse(argc,(const char**)argv); + + if (help || cmdline.Arguments().size() != 0) + { + printHelp(); + return EXIT_SUCCESS; + } + + } catch (const std::exception &e) + { + std::cerr << e.what() << std::endl; + return EXIT_FAILURE; + } + + auto uid = getuid(); + if (uid != 0 && !noSudo) + { + return SudoExec(argc, argv); + } + + + kconfigUi(); + return EXIT_SUCCESS; +} \ No newline at end of file diff --git a/src/lv2ext/pipedal.lv2/ext/fileBrowser.h b/src/lv2ext/pipedal.lv2/ext/fileBrowser.h new file mode 100644 index 0000000..60c6db4 --- /dev/null +++ b/src/lv2ext/pipedal.lv2/ext/fileBrowser.h @@ -0,0 +1,257 @@ +/* + * Copyright (c) 2023 Robin E. R. Davies + * All rights reserved. + + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifndef FILEBROWSERFILES_H +#define FILEBROWSERFILES_H + +#define LV2_FILEBROWSER_URI "http://two-play.com/ns/ext/fileBrowser" +#define LV2_FILEBROWSER_PREFIX LV2_FILEBROWSER_URI "#" +#define LV2_FILEBROWSER__files LV2_FILEBROWSER_PREFIX "files" ///< http://two-play.com/ns/ext/fileBrowser#files > + +/** + @defgroup filedialog LV2_FileBrowser_Files + @ingroup lv2 + + Because PiPedal is accessed remotely through a web interface, audio and model files + have to be uploaded into standardized directories using the Upload File button, found in + the File Property Dialog. Plugins that run locally can place sample and model files + more casually, since users can browse anywhere on their computer using the system + file dialog. + + This LV2 Extension allows plugin developers to determine the location of well-known directory. + + The extension addresses three primary uses-cases: + + - Allow plugins to published factory-installed resource files that can be + selected using the Patch Property file dialog. Typically. Source files would be + stored in the bundle directory of the plugin at install time. On first use, the + plugin would create symlinks in the well-known directory that reference files in the + bundle directory. + + - Allow plugins to reference factory-installed resource files that can be selected using + the Patch Property file dialog. + + - Allow recording plugins to locate the directory in which new files should be + placed. + + The plugin recognizes the following well-known directory locations, which are based on MOD fileType + conventions. + + "audioloop" + Audio Loops, meant to be used for looper-style plugins. + "audiorecording", + Audio Recordings, triggered by plugins and stored in the unit + "audiosample", + One-shot Audio Samples, meant to be used for sampler-style plugins + "audiotrack" + Audio Tracks, meant to be used as full-performance/song or backtrack + "cabsim" + Impulse response files for convolution-based Cabinet response simulation. + "h2drumkit" + Hydrogen Drumkits, must use h2drumkit file extension. Not currently supported by PiPedal. + "ir" + Impulse response files of arbitrary size. May be either CAB IR files, or Reverbe IR files. + "midiclip" + MIDI Clips", {".mid", ".midi"}}, // MIDI Clips, to be used in sync with + host tempo, must have mid or midi file extension + "midisong" + MIDI Songs", {".mid", ".midi"}}, meant to be used as + full-performance/song or backtrack. + "sf2" + SF2 Instruments, must have sf2 or sf3 file extension + "sfz" + SFZ Instruments, must have sfz file extension + "audio" + Parent directory of all audio file directories. Not officially documented + by MOD, but has been observed in the field. + "nammodel" + .nam files: Nueral amp model's for Steven Atkin's Neural Amp Modeler library. + "aidadspmodel" + AIDA IAX model files. (file extensions of ".json") + "mlmodel" + Model files for plugins based on the ML neural net library. (file + extensions of ".json"). TooB ML, Proteus, probably others. + "~" + References a directory that is for private use by only the current plugin. + Users can upload and select files in the private directory when using + the current plugin, but no other plugins can access the files. (Not + supported by MOD). + + + Methods are are safe on the realtime thread, as they perform file i/o and allocate memory. This feature should be used + at initialization time, in the call to Activate, or else on a scheduler thread. + + @{ +*/ + + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum { + LV2_FileBrowser_Status_Success = 0, + LV2_FileBrowser_Status_Err_InvalidParameter = 1, + LV2_FileBrowser_Status_Err_Filesystem = 2, +} LV2_FileBrowser_Status; + +typedef void* + LV2_FileBrowser_Files_Handle; ///< Opaque handle for pipedal:uploadPath feature + + +/** + Feature data for filedialog:files (@ref LV2_FILEBROWSER_file). +*/ +typedef struct { + /** + Opaque host data. + */ + LV2_FileBrowser_Files_Handle handle; + + /** + Publish a resource file provided by the plugin to a well-known directory location. + + @param handle MUST be the `handle` member of this struct. + + @param version The version number of the resource file. + + @param resourcePath The source filename./ + + @param uploadDirectory The target filename. + + @return LV2_FileBrowser_Status Zero if successful. + + The version number is the version number of the resource file(s). The host keeps track of which + resource files have previously been installed, and the version thereof. Files will only be + published once. This allows users to delete published files if they want to; and allows + upgraded plugins to write upgraded resource files. + + `resourcePath` is specified relative to the plugin's bundle directory. You can supply an + absolute path if you want, but it's generally better to place resource files in the plugin's + bundle, and specify the location with a relative path. If the resourcePath specifies a file, + only the file will be copied; if the the path specifies a directory, all files and subdirectories + will be published. + + `uploadDirectory` most be a relative path of a directory, and the first segment of the path must be one of + the well-known directory locations. + + A return code of LV2_FileBrowser_Status_Err_InvalidParameter indicates + either that the well-known directory was not found, or that an absolute + path was provided where a relative path was expected. + LV2_FileBrowser_Status_Err_Filesystem will be return if some kind of + catastrophic filesystem error occurred (out of disk space, perhaps, or + permission denied). + + Example: + [code] + // becomes /usr/lib/lv2/ToobAmp.lv2/namFactoryModels/FenderBlackface.nam (for example) + const char*sourceFile = "namFactoryModels/Fender Blackface.nam" + + // /becomes /var/pipedal/audio_uploads/NeuralAmpModels/TooB NAM (for example) + const char(*targetDirectory = "namModel/TooB NAM") + + Lv2_FileBrowserStatus ec = + feature.publish_resource_files(feature.handle,1,sourceFile,targetDirectory); + + // on success creates a symlink at + // /var/pipedal/audio_uploads/NeuralAmpModels/TooB NAM/Fender Blackface.nam + [/code] + */ + + LV2_FileBrowser_Status (*publish_resource_files)( + LV2_FileBrowser_Files_Handle handle, + uint32_t version, + const char*resourcePath, + const char*uploadDirectory); + + /** + ccc + + @param handle MUST be the `handle` member of this struct. + + @param path A relative path, starting with a well-known directory name. + + @return The absolute path to use for the new directory. + + This function can be used by plugins to get the path of files or directories + that can be browsed by file dialogs. get_filebrowser_path, unlike + map_path() does not create or modify files or directories in any way. + + The path can have multiple segments, but the first segment of the path must be + the name of a well-known directory. + + The caller must free memory for the returned value with + LV2_FileBrowser_Files.free_path(). + + Example: + [code] + const char *filePath = feature.get_upload_path(feature.handle,"audio/Tracks/Xmas/Frosty.wav"); + // returns (for example) + // /var/pipedal/audio_uploads/shared/audio/Tracks/Xmas/Frosty.wav + [/code] + */ + char* (*get_upload_path)(LV2_FileBrowser_Files_Handle handle, const char* path); + + /** + Map resource bundle filenames to upload directories. + @param handle MUST be the `handle` member of this struct. + @param path File path name + @param fileBrowserDirectory relative directory of the file browser directory in which to create a link. + @return The absolute pathname of a file in the resource directory. + + The primary purpose of this method is to map file references to files in the plugin's bundle + directory to corresponding files in the a file browser directory. + + If the path is relative, the full path is resolved using the `rootResourceDirectory` path. + + If the full path is not a child of rootResourceDirectory or if the path is relative, + get_upload_path returns the supplied path unmodified. +` + If the filename is a child of rootResourceDirectory, creates a corresponding link to the file in the file browser + directory and returns the path of that link. + + The caller must free memory for the returned value with `LV2_FileBrowser_Files.free_path()`. + + Example: + */ + char* (*map_path)(LV2_FileBrowser_Files_Handle handle, const char* path, const char*rootResourceDirectory, const char*fileBrowserDirectory); + + + /** + Free a path returned by LV2_FileBrowser_Files.get_upload_path() or LV2_FileBrowser_Files.map_path() + @param handle MUST be the `handle` member of this struct. + @param path A path previously returned by a method of `LV2_FileBrowser_Files`. + + */ + void (*free_path)(LV2_FileBrowser_Files_Handle handle, char* path); +} LV2_FileBrowser_Files; + + + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // FILEBROWSERFILES_H diff --git a/src/pch.h b/src/pch.h index 7dca65f..9b33fd3 100644 --- a/src/pch.h +++ b/src/pch.h @@ -24,7 +24,7 @@ template class TypeDisplay; #ifndef SUPPORT_MIDI // currently, only whether midi plugins can be loaded. No routing or handling implemented (yet). -#define SUPPORT_MIDI 0 +#define SUPPORT_MIDI 1 #endif @@ -32,33 +32,9 @@ template class TypeDisplay; #include #include -#include #include -#include #include #include -#include -#include #include -#ifdef JUNK - -#endif -/* -#include - -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/log/log.h" -#include "lv2/log/logger.h" -#include "lv2/midi/midi.h" -#include "lv2/urid/urid.h" -#include "lv2/log/logger.h" -#include "lv2/uri-map/uri-map.h" -#include "lv2/atom/forge.h" -#include "lv2/worker/worker.h" -#include "lv2/patch/patch.h" -#include "lv2/parameters/parameters.h" -#include "lv2/units/units.h" -*/ #include "ss.hpp" diff --git a/src/templates/pipedald.service.template b/src/templates/pipedald.service.template index 8b93a57..aafd6f0 100644 --- a/src/templates/pipedald.service.template +++ b/src/templates/pipedald.service.template @@ -11,6 +11,7 @@ Restart=on-failure Type=notify LimitMEMLOCK=infinity LimitRTPRIO=95 +Nice=-9 ExecStart=${COMMAND} User=pipedal_d Group=pipedal_d diff --git a/src/vst3/Vst3EffectImpl.hpp b/src/vst3/Vst3EffectImpl.hpp index dc9469f..e910290 100644 --- a/src/vst3/Vst3EffectImpl.hpp +++ b/src/vst3/Vst3EffectImpl.hpp @@ -126,8 +126,21 @@ namespace pipedal { return info.pluginInfo_.audio_outputs(); } + + virtual int GetNumberOfInputAudioBuffers() const { return buffers.inputs.size(); } + virtual int GetNumberOfOutputAudioPorts() const {return buffers.outputs.size(); } + virtual float *GetAudioInputBuffer(int index) const { return buffers.inputs[index]; } virtual float *GetAudioOutputBuffer(int index) const { return buffers.outputs[index]; } + + virtual int GetNumberOfInputAudioBuffers() const { + return buffers.inputs.size(); + } + virtual int GetNumberOfInputAudioBuffers() const { + return buffers.outputs.size(); + } + + virtual void ResetAtomBuffers() {} virtual void RequestParameter(LV2_URID uridUri) {} // no vst equivalent. virtual void GatherPatchProperties(RealtimePatchPropertyRequest *pRequest) {} // no vst equivalent. diff --git a/todo.txt b/todo.txt index 4fd65aa..c13afca 100644 --- a/todo.txt +++ b/todo.txt @@ -1,13 +1,42 @@ +- Test midi bindings. -- Start and end connectors are missing in PedalboardView when no device selected (Do they have zero outputs?) + -- Toggle + -- Switch + -- List + -- Dial. +-- make sure trigger controls are set to default value after load/save. + +- reset trigger controls after processing. +- reset triggers before loading. +- review trigger binding behavior. +- triggers dont' change save state. +- Feature for directory locations. + + +- center ellipsis on file properties. + +- State of MIDI plugins: + - plugin routing is implemented. (maybe needs a not-cheating UI) + - MIDI message routing is not. + - No routing of midi messages yet. + - Midi Channel Filter dialog is implemented, but not yet hooked up. + - Need to think about Midi Channel filters for system and control bindings. A separate filter? + - Bunch of new LV2 interfaces probably needed -- most especially program selection. + - SF2 plugin loads the SF2 file on the Scheduler thread, blocking everyone else fo sevearl seconds. Completion + - becomes a SIGNIFICANT issue, since it's going to leak upward of 1G of memory! + - Severe memory trash/state trash of the SF2 plugin in LV2 restore state. (starts complaining about DBus notification failures!) + - Suspect the bin64 library which has several buffer overrun problems. + + +X Start and end connectors are missing in PedalboardView when no device selected (Do they have zero outputs?) X Review docs changes once we go live. - Localisation: support non-UTF8 code pages. - unicode commandline arguments. (probably the hotspot name) - review unicode filenames (this is probably ok) -- BUG: gcs when we have an animated output control +- BUG: gc problems when we have an animated output control on phones only. Pri Description diff --git a/vite/.gitignore b/vite/.gitignore new file mode 100644 index 0000000..a547bf3 --- /dev/null +++ b/vite/.gitignore @@ -0,0 +1,24 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +dist +dist-ssr +*.local + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? diff --git a/vite/CMakeLists.txt b/vite/CMakeLists.txt new file mode 100644 index 0000000..32b6825 --- /dev/null +++ b/vite/CMakeLists.txt @@ -0,0 +1,316 @@ + + +find_program(NPM_COMMAND npm) + + +if (CMAKE_BUILD_TYPE MATCHES Debug) + set(BUILD_REACT "echo") + set(BUILD_REACT_ARGS Skipping react debug build) +else() + set(BUILD_REACT npm) + set(BUILD_REACT_ARGS run build) +endif() + +set (BUILD_DIRECTORY ${PROJECT_SOURCE_DIR}/vite/dist) + + +add_custom_command( + OUTPUT ${BUILD_DIRECTORY}/index.html + COMMAND ${BUILD_REACT} + ARGS ${BUILD_REACT_ARGS} + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vite + + DEPENDS + # find public src *.json *.ts -type f >/tmp/tmp.txt + public/serve.json + public/fonts/Roboto-BoldItalic.woff2 + public/fonts/Roboto-MediumItalic.woff2 + public/fonts/Roboto-Thin.woff2 + public/fonts/Roboto-LightItalic.woff2 + public/fonts/Roboto-Light.woff2 + public/fonts/Roboto-BlackItalic.woff2 + public/fonts/Roboto-ThinItalic.woff2 + public/fonts/LICENSE.txt + public/fonts/Roboto-Regular.woff2 + public/fonts/Roboto-Medium.woff2 + public/fonts/Roboto-Black.woff2 + public/fonts/Roboto-Bold.woff2 + public/fonts/Roboto-Italic.woff2 + public/robots.txt + public/css/roboto.css + public/manifest.json + public/logo192.png + public/img/fx_dial.svg + public/img/fx_spatial.svg + public/img/ic_logo.svg + public/img/ic_navigate_next.svg + public/img/fx_simulator.svg + public/img/VST_Logo_Steinberg.png + public/img/fx_lr.svg + public/img/fx_pitch.svg + public/img/vst.svg + public/img/ic_bank.svg + public/img/fx_utility.svg + public/img/fx_compressor.svg + public/img/fx_phaser.svg + public/img/fx_delay.svg + public/img/ic_drawer.svg + public/img/fx_limiter.svg + public/img/fx_mixer.svg + public/img/fx_amplifier.svg + public/img/edit_banks.svg + public/img/old_delete_outline_black_24dp.svg + public/img/fx_eq.svg + public/img/edit_banks_white.svg + public/img/Pi-Logo-3.svg + public/img/fx_split_a.svg + public/img/fx_spectral.svg + public/img/settings_white_24dp.svg + public/img/fx_converter.svg + public/img/ic_presets.svg + public/img/fx_flanger2.svg + public/img/fx_generator.svg + public/img/Pi-Logo-3.png + public/img/fx_oscillator.svg + public/img/ic_drawer_2.svg + public/img/ic_presets_white.svg + public/img/fx_chorus.svg + public/img/settings_black_24dp.svg + public/img/fx_analyzer.svg + public/img/old_delete_outline_white_24dp.svg + public/img/fx_reverb.svg + public/img/fx_instrument.svg + public/img/ic_drawer_2.png + public/img/cx_mono.svg + public/img/fx_split_b.svg + public/img/fx_filter_hp.svg + public/img/fx_parametric_eq.svg + public/img/fx_filter.svg + public/img/fx_error.svg + public/img/cx_stereo.svg + public/img/fx_modulator.svg + public/img/delete_outline_black_24dp.svg + public/img/fx_gate.svg + public/img/vst.png + public/img/fx_function.svg + public/img/VST_Logo_Steinberg.ico + public/img/fx_terminal.svg + public/img/fx_plugin.svg + public/img/fx_distortion.svg + public/img/fx_constant.svg + public/img/cc-by.png + public/img/fx_empty.svg + public/img/ic_navigate_before.svg + public/img/fx_flanger.svg + public/var/plugin_classes.json + public/var/uiplugins.json + public/var/current_pedalboard.json + public/var/config.json + public/favicon.ico + public/index.html + public/iso_codes.json + public/logo512.png + public/sample_lv2_plugins.json + public/vite.svg + src/pipedal/SplitUiControls.tsx + src/pipedal/JackHostStatus.tsx + src/pipedal/VirtualKeyboardHandler.tsx + src/pipedal/JackStatusView.tsx + src/pipedal/Pedal.tsx + src/pipedal/PiPedalError.tsx + src/pipedal/FilePropertyControl.tsx + src/pipedal/PerformanceView.tsx + src/pipedal/ChannelBindingsHelpDialog.tsx + src/pipedal/TemporaryDrawer.tsx + src/pipedal/OkCancelDialog.tsx + src/pipedal/SystemMidiBindingView.tsx + src/pipedal/WifiConfigSettings.tsx + src/pipedal/react-app-env.d.ts + src/pipedal/UpdateDialog.tsx + src/pipedal/PresetSelector.tsx + src/pipedal/JackServerSettings.tsx + src/pipedal/SearchControl.tsx + src/pipedal/ObservableEvent.tsx + src/pipedal/WindowScale.tsx + src/pipedal/DialogStack.tsx + src/pipedal/ToobToneStackView.tsx + src/pipedal/TextFieldEx.tsx + src/pipedal/AppThemed.css + src/pipedal/PluginIcon.tsx + src/pipedal/svg/snapshot_4.svg + src/pipedal/svg/fx_dial.svg + src/pipedal/svg/fx_spatial.svg + src/pipedal/svg/snapshot_6.svg + src/pipedal/svg/fx_simulator.svg + src/pipedal/svg/ic_save_bank_as.svg + src/pipedal/svg/fx_lr.svg + src/pipedal/svg/fx_pitch.svg + src/pipedal/svg/snapshot_3.svg + src/pipedal/svg/ic_pluginpreset2.svg + src/pipedal/svg/ic_bank.svg + src/pipedal/svg/fx_utility.svg + src/pipedal/svg/fx_compressor.svg + src/pipedal/svg/fx_phaser.svg + src/pipedal/svg/fx_delay.svg + src/pipedal/svg/ic_edit_banks.svg + src/pipedal/svg/fx_limiter.svg + src/pipedal/svg/ic_settings.svg + src/pipedal/svg/fx_mixer.svg + src/pipedal/svg/fx_amplifier.svg + src/pipedal/svg/ic_help_outline.svg + src/pipedal/svg/fx_eq.svg + src/pipedal/svg/fx_split_a.svg + src/pipedal/svg/fx_spectral.svg + src/pipedal/svg/fx_converter.svg + src/pipedal/svg/ic_presets.svg + src/pipedal/svg/fx_flanger2.svg + src/pipedal/svg/fx_generator.svg + src/pipedal/svg/old_delete_outline_24dp.svg + src/pipedal/svg/file_download_black_24dp.svg + src/pipedal/svg/fx_oscillator.svg + src/pipedal/svg/snapshot_1.svg + src/pipedal/svg/fx_chorus.svg + src/pipedal/svg/fx_analyzer.svg + src/pipedal/svg/fx_reverb.svg + src/pipedal/svg/fx_instrument.svg + src/pipedal/svg/drive_file_rename_outline_black_24dp.svg + src/pipedal/svg/fx_split_b.svg + src/pipedal/svg/snapshot_5.svg + src/pipedal/svg/fx_filter_hp.svg + src/pipedal/svg/fx_parametric_eq.svg + src/pipedal/svg/fx_filter.svg + src/pipedal/svg/fx_error.svg + src/pipedal/svg/fx_modulator.svg + src/pipedal/svg/ic_midi.svg + src/pipedal/svg/fx_gate.svg + src/pipedal/svg/ic_pluginpreset.svg + src/pipedal/svg/fx_function.svg + src/pipedal/svg/snapshot_2.svg + src/pipedal/svg/file_upload_black_24dp.svg + src/pipedal/svg/fx_terminal.svg + src/pipedal/svg/fx_plugin.svg + src/pipedal/svg/fx_distortion.svg + src/pipedal/svg/fx_constant.svg + src/pipedal/svg/snapshot_0.svg + src/pipedal/svg/fx_empty.svg + src/pipedal/svg/fx_flanger.svg + src/pipedal/AboutDialog.tsx + src/pipedal/NumericInput.tsx + src/pipedal/SelectHoverBackground.tsx + src/pipedal/MidiBindingView.tsx + src/pipedal/GxTunerView.tsx + src/pipedal/SnapshotDialog.tsx + src/pipedal/AndroidHost.tsx + src/pipedal/SplitControlView.tsx + src/pipedal/ToobFrequencyResponseView.tsx + src/pipedal/ObservableProperty.tsx + src/pipedal/UploadPresetDialog.tsx + src/pipedal/Utility.tsx + src/pipedal/ToobSpectrumResponseView.tsx + src/pipedal/ToobMLView.tsx + src/pipedal/Banks.tsx + src/pipedal/Units.tsx + src/pipedal/StringBuilder.tsx + src/pipedal/ToobCabSimView.tsx + src/pipedal/ToobSpectrumAnalyzerView.tsx + src/pipedal/ControlTooltip.tsx + src/pipedal/AlsaMidiDeviceInfo.tsx + src/pipedal/ToobInputStageView.tsx + src/pipedal/MidiChannelBindingControl.tsx + src/pipedal/MidiChannelBindingDialog.tsx + src/pipedal/ToobWaveShapeView.tsx + src/pipedal/PiPedalSocket.tsx + src/pipedal/SnapshotColors.tsx + src/pipedal/SnapshotButton.tsx + src/pipedal/ResizeResponsiveComponent.tsx + src/pipedal/SnapshotPropertiesDialog.tsx + src/pipedal/PluginInfoDialog.tsx + src/pipedal/DarkMode.tsx + src/pipedal/Updater.tsx + src/pipedal/Rect.tsx + src/pipedal/PedalboardView.tsx + src/pipedal/JackServerSettingsDialog.tsx + src/pipedal/PluginOutputControl.tsx + src/pipedal/PresetDialog.tsx + src/pipedal/MidiBinding.tsx + src/pipedal/FilePropertyDirectoryTree.tsx + src/pipedal/SnapshotPanel.tsx + src/pipedal/PiPedalModel.tsx + src/pipedal/RadioSelectDialog.tsx + src/pipedal/WifiChannel.tsx + src/pipedal/App.tsx + src/pipedal/IControlViewFactory.tsx + src/pipedal/WifiDirectConfigSettings.tsx + src/pipedal/ZoomedUiControl.tsx + src/pipedal/MidiBindingsDialog.tsx + src/pipedal/JsonAtom.tsx + src/pipedal/DialogEx.tsx + src/pipedal/FullScreenIME.tsx + src/pipedal/FilePropertyDialog.tsx + src/pipedal/RenameDialog.tsx + src/pipedal/ControlViewFactory.tsx + src/pipedal/MaterialColors.tsx + src/pipedal/PluginPresetsDialog.tsx + src/pipedal/PluginControl.tsx + src/pipedal/PluginControlView.tsx + src/pipedal/ToobPowerStage2View.tsx + src/pipedal/NoChangePassword.tsx + src/pipedal/logo.svg + src/pipedal/WithStyles.tsx + src/pipedal/AlsaDeviceInfo.tsx + src/pipedal/Lv2Plugin.tsx + src/pipedal/SvgPathBuilder.tsx + src/pipedal/SnapshotEditor.tsx + src/pipedal/ColorDropdownButton.tsx + src/pipedal/ZoomedDial.tsx + src/pipedal/VuMeter.tsx + src/pipedal/SystemMidiBindingsDialog.tsx + src/pipedal/GxTunerControl.tsx + src/pipedal/BankDialog.tsx + src/pipedal/FilePropertyDirectorySelectDialog.tsx + src/pipedal/GovernorSettings.tsx + src/pipedal/XxxSnippet.tsx + src/pipedal/PluginPresetSelector.tsx + src/pipedal/OldDeleteIcon.tsx + src/pipedal/SelectMidiChannelsDialog.tsx + src/pipedal/SearchFilter.tsx + src/pipedal/Jack.tsx + src/pipedal/LoadPluginDialog.tsx + src/pipedal/Pedalboard.tsx + src/pipedal/Draggable.tsx + src/pipedal/SelectChannelsDialog.tsx + src/pipedal/PluginClass.tsx + src/pipedal/DraggableGrid.tsx + src/pipedal/WifiConfigDialog.tsx + src/pipedal/SelectThemeDialog.tsx + src/pipedal/WifiDirectConfigDialog.tsx + src/pipedal/UploadFileDialog.tsx + src/pipedal/MainPage.tsx + src/pipedal/Rectangle.tsx + src/pipedal/PluginPreset.tsx + src/pipedal/SettingsDialog.tsx + src/pipedal/AppThemed.tsx + src/pipedal/OptionsDialog.tsx + src/pipedal/MidiChannelBinding.tsx + src/pipedal/ModFileTypes.tsx + src/assets/react.svg + src/App.css + src/App.tsx + src/vite-env.d.ts + src/index.css + src/main.tsx + package.json + package-lock.json + tsconfig.app.json + tsconfig.json + tsconfig.node.json + vite.config.ts + +) + +message(STATUS "VITE TARGET: ${BUILD_DIRECTORY}/index.html") + +add_custom_target ( + ReactBuild ALL + DEPENDS ${BUILD_DIRECTORY}/index.html +) diff --git a/vite/README.md b/vite/README.md new file mode 100644 index 0000000..74872fd --- /dev/null +++ b/vite/README.md @@ -0,0 +1,50 @@ +# React + TypeScript + Vite + +This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules. + +Currently, two official plugins are available: + +- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh +- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh + +## Expanding the ESLint configuration + +If you are developing a production application, we recommend updating the configuration to enable type aware lint rules: + +- Configure the top-level `parserOptions` property like this: + +```js +export default tseslint.config({ + languageOptions: { + // other options... + parserOptions: { + project: ['./tsconfig.node.json', './tsconfig.app.json'], + tsconfigRootDir: import.meta.dirname, + }, + }, +}) +``` + +- Replace `tseslint.configs.recommended` to `tseslint.configs.recommendedTypeChecked` or `tseslint.configs.strictTypeChecked` +- Optionally add `...tseslint.configs.stylisticTypeChecked` +- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and update the config: + +```js +// eslint.config.js +import react from 'eslint-plugin-react' + +export default tseslint.config({ + // Set the react version + settings: { react: { version: '18.3' } }, + plugins: { + // Add the react plugin + react, + }, + rules: { + // other rules... + // Enable its recommended rules + ...react.configs.recommended.rules, + ...react.configs['jsx-runtime'].rules, + }, +}) +``` diff --git a/vite/build.sh b/vite/build.sh new file mode 100755 index 0000000..26b6983 --- /dev/null +++ b/vite/build.sh @@ -0,0 +1,14 @@ +#!/bin/bash +npm run build && \ +#remove any existing .gz files. +if ls dist/assets/index*.js.gz 1> /dev/null 2>&1; then + rm dist/assets/index*.js.gz +fi +# generate a .gz file for each index*.js file + +if ls dist/assets/index*.js 1> /dev/null 2>&1; then + for file in dist/assets/index*.js; do + # generate a .gz file + gzip -c $file > $file.gz + done +fi diff --git a/vite/eslint.config.js b/vite/eslint.config.js new file mode 100644 index 0000000..adef530 --- /dev/null +++ b/vite/eslint.config.js @@ -0,0 +1,28 @@ +import js from '@eslint/js' +import globals from 'globals' +import reactHooks from 'eslint-plugin-react-hooks' +import reactRefresh from 'eslint-plugin-react-refresh' +import tseslint from 'typescript-eslint' + +export default tseslint.config( + { ignores: ['dist', 'build'] }, + { + extends: [js.configs.recommended, ...tseslint.configs.recommended], + files: ['**/*.{ts,tsx}'], + languageOptions: { + ecmaVersion: 2020, + globals: globals.browser, + }, + plugins: { + 'react-hooks': reactHooks, + 'react-refresh': reactRefresh, + }, + rules: { + ...reactHooks.configs.recommended.rules, + 'react-refresh/only-export-components': [ + 'warn', + { allowConstantExport: true }, + ], + }, + }, +) diff --git a/vite/index.html b/vite/index.html new file mode 100644 index 0000000..b44998e --- /dev/null +++ b/vite/index.html @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + PiPedal + + +
+ + + diff --git a/vite/package-lock.json b/vite/package-lock.json new file mode 100644 index 0000000..58d5300 --- /dev/null +++ b/vite/package-lock.json @@ -0,0 +1,5152 @@ +{ + "name": "pipedal", + "version": "0.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "pipedal", + "version": "0.0.0", + "dependencies": { + "@emotion/react": "^11.14.0", + "@emotion/styled": "^11.14.0", + "@fontsource/roboto": "^5.1.1", + "@mui/icons-material": "^6.4.4", + "@mui/material": "^6.4.4", + "@mui/styles": "^6.4.4", + "@types/react-window": "^1.8.8", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "react-remark": "^2.1.0", + "react-virtualized-auto-sizer": "^1.0.25", + "react-window": "^1.8.11", + "tss-react": "^4.9.15" + }, + "devDependencies": { + "@eslint/js": "^9.19.0", + "@types/react": "^19.0.8", + "@types/react-dom": "^19.0.3", + "@vitejs/plugin-react": "^4.3.4", + "eslint": "^9.19.0", + "eslint-plugin-react-hooks": "^5.0.0", + "eslint-plugin-react-refresh": "^0.4.18", + "globals": "^15.14.0", + "typescript": "~5.7.2", + "typescript-eslint": "^8.22.0", + "vite": "^6.1.0", + "vite-plugin-svgr": "^4.3.0" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", + "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz", + "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.9", + "@babel/helper-compilation-targets": "^7.26.5", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.9", + "@babel/parser": "^7.26.9", + "@babel/template": "^7.26.9", + "@babel/traverse": "^7.26.9", + "@babel/types": "^7.26.9", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/generator": { + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz", + "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==", + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.26.9", + "@babel/types": "^7.26.9", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^3.0.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz", + "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.26.5", + "@babel/helper-validator-option": "^7.25.9", + "browserslist": "^4.24.0", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", + "license": "MIT", + "dependencies": { + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", + "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz", + "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz", + "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz", + "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.26.9" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/plugin-transform-react-jsx-self": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.25.9.tgz", + "integrity": "sha512-y8quW6p0WHkEhmErnfe58r7x0A70uKphQm8Sp8cV7tjNQwK56sNVK0M73LK3WuYmsuyrftut4xAkjjgU0twaMg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-react-jsx-source": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.25.9.tgz", + "integrity": "sha512-+iqjT8xmXhhYv4/uiYd8FNQsraMFZIfxVSqxxVSZP0WbbSAWvBXAul0m/zu+7Vv4O/3WtApy9pmaTMiumEZgfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/runtime": { + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.9.tgz", + "integrity": "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==", + "license": "MIT", + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/template": { + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz", + "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.26.2", + "@babel/parser": "^7.26.9", + "@babel/types": "^7.26.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz", + "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.9", + "@babel/parser": "^7.26.9", + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.9", + "debug": "^4.3.1", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/types": { + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz", + "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==", + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@emotion/babel-plugin": { + "version": "11.13.5", + "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz", + "integrity": "sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==", + "license": "MIT", + "dependencies": { + "@babel/helper-module-imports": "^7.16.7", + "@babel/runtime": "^7.18.3", + "@emotion/hash": "^0.9.2", + "@emotion/memoize": "^0.9.0", + "@emotion/serialize": "^1.3.3", + "babel-plugin-macros": "^3.1.0", + "convert-source-map": "^1.5.0", + "escape-string-regexp": "^4.0.0", + "find-root": "^1.1.0", + "source-map": "^0.5.7", + "stylis": "4.2.0" + } + }, + "node_modules/@emotion/babel-plugin/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "license": "MIT" + }, + "node_modules/@emotion/cache": { + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.14.0.tgz", + "integrity": "sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==", + "license": "MIT", + "dependencies": { + "@emotion/memoize": "^0.9.0", + "@emotion/sheet": "^1.4.0", + "@emotion/utils": "^1.4.2", + "@emotion/weak-memoize": "^0.4.0", + "stylis": "4.2.0" + } + }, + "node_modules/@emotion/hash": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz", + "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==", + "license": "MIT" + }, + "node_modules/@emotion/is-prop-valid": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.3.1.tgz", + "integrity": "sha512-/ACwoqx7XQi9knQs/G0qKvv5teDMhD7bXYns9N/wM8ah8iNb8jZ2uNO0YOgiq2o2poIvVtJS2YALasQuMSQ7Kw==", + "license": "MIT", + "dependencies": { + "@emotion/memoize": "^0.9.0" + } + }, + "node_modules/@emotion/memoize": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz", + "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==", + "license": "MIT" + }, + "node_modules/@emotion/react": { + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz", + "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.18.3", + "@emotion/babel-plugin": "^11.13.5", + "@emotion/cache": "^11.14.0", + "@emotion/serialize": "^1.3.3", + "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0", + "@emotion/utils": "^1.4.2", + "@emotion/weak-memoize": "^0.4.0", + "hoist-non-react-statics": "^3.3.1" + }, + "peerDependencies": { + "react": ">=16.8.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@emotion/serialize": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.3.tgz", + "integrity": "sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==", + "license": "MIT", + "dependencies": { + "@emotion/hash": "^0.9.2", + "@emotion/memoize": "^0.9.0", + "@emotion/unitless": "^0.10.0", + "@emotion/utils": "^1.4.2", + "csstype": "^3.0.2" + } + }, + "node_modules/@emotion/sheet": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz", + "integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==", + "license": "MIT" + }, + "node_modules/@emotion/styled": { + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.0.tgz", + "integrity": "sha512-XxfOnXFffatap2IyCeJyNov3kiDQWoR08gPUQxvbL7fxKryGBKUZUkG6Hz48DZwVrJSVh9sJboyV1Ds4OW6SgA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.18.3", + "@emotion/babel-plugin": "^11.13.5", + "@emotion/is-prop-valid": "^1.3.0", + "@emotion/serialize": "^1.3.3", + "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0", + "@emotion/utils": "^1.4.2" + }, + "peerDependencies": { + "@emotion/react": "^11.0.0-rc.0", + "react": ">=16.8.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@emotion/unitless": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.10.0.tgz", + "integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==", + "license": "MIT" + }, + "node_modules/@emotion/use-insertion-effect-with-fallbacks": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.2.0.tgz", + "integrity": "sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==", + "license": "MIT", + "peerDependencies": { + "react": ">=16.8.0" + } + }, + "node_modules/@emotion/utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.2.tgz", + "integrity": "sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==", + "license": "MIT" + }, + "node_modules/@emotion/weak-memoize": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz", + "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==", + "license": "MIT" + }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz", + "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz", + "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz", + "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz", + "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz", + "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz", + "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz", + "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz", + "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz", + "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz", + "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz", + "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz", + "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz", + "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz", + "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz", + "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz", + "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz", + "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz", + "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz", + "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz", + "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz", + "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz", + "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz", + "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz", + "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz", + "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", + "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/config-array": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz", + "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/object-schema": "^2.1.6", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/core": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz", + "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", + "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^10.0.1", + "globals": "^14.0.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/js": { + "version": "9.20.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz", + "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/object-schema": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", + "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/plugin-kit": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz", + "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.10.0", + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz", + "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@fontsource/roboto": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.1.1.tgz", + "integrity": "sha512-XwVVXtERDQIM7HPUIbyDe0FP4SRovpjF7zMI8M7pbqFp3ahLJsJTd18h+E6pkar6UbV3btbwkKjYARr5M+SQow==", + "license": "Apache-2.0" + }, + "node_modules/@humanfs/core": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node": { + "version": "0.16.6", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", + "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanfs/core": "^0.19.1", + "@humanwhocodes/retry": "^0.3.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/retry": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", + "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", + "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", + "license": "MIT", + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@mapbox/hast-util-table-cell-style": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@mapbox/hast-util-table-cell-style/-/hast-util-table-cell-style-0.2.1.tgz", + "integrity": "sha512-LyQz4XJIdCdY/+temIhD/Ed0x/p4GAOUycpFSEK2Ads1CPKZy6b7V/2ROEtQiLLQ8soIs0xe/QAoR6kwpyW/yw==", + "license": "BSD-2-Clause", + "dependencies": { + "unist-util-visit": "^1.4.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@mui/core-downloads-tracker": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.4.4.tgz", + "integrity": "sha512-r+J0EditrekkTtO2CnCBCOGpNaDYwJqz8lH4rj6o/anDcskZFJodBlG8aCJkS8DL/CF/9EHS+Gz53EbmYEnQbw==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + } + }, + "node_modules/@mui/icons-material": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.4.4.tgz", + "integrity": "sha512-uF1chGaoFmYdRUomK6f8kgJfWosk9A3HXWiVD0vQm+2mE7f25eTQ1E8RRO11LXpnUBqu8Rbv/uGlpnjT/u1Ksg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.26.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@mui/material": "^6.4.4", + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/material": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.4.4.tgz", + "integrity": "sha512-ISVPrIsPQsxnwvS40C4u03AuNSPigFeS2+n1qpuEZ94hDsdMi19dQM2JcC9CHEhXecSIQjP1RTyY0mPiSpSrFQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.26.0", + "@mui/core-downloads-tracker": "^6.4.4", + "@mui/system": "^6.4.3", + "@mui/types": "^7.2.21", + "@mui/utils": "^6.4.3", + "@popperjs/core": "^2.11.8", + "@types/react-transition-group": "^4.4.12", + "clsx": "^2.1.1", + "csstype": "^3.1.3", + "prop-types": "^15.8.1", + "react-is": "^19.0.0", + "react-transition-group": "^4.4.5" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@emotion/react": "^11.5.0", + "@emotion/styled": "^11.3.0", + "@mui/material-pigment-css": "^6.4.3", + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + }, + "@mui/material-pigment-css": { + "optional": true + }, + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/private-theming": { + "version": "6.4.3", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-6.4.3.tgz", + "integrity": "sha512-7x9HaNwDCeoERc4BoEWLieuzKzXu5ZrhRnEM6AUcRXUScQLvF1NFkTlP59+IJfTbEMgcGg1wWHApyoqcksrBpQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.26.0", + "@mui/utils": "^6.4.3", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/styled-engine": { + "version": "6.4.3", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.4.3.tgz", + "integrity": "sha512-OC402VfK+ra2+f12Gef8maY7Y9n7B6CZcoQ9u7mIkh/7PKwW/xH81xwX+yW+Ak1zBT3HYcVjh2X82k5cKMFGoQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.26.0", + "@emotion/cache": "^11.13.5", + "@emotion/serialize": "^1.3.3", + "@emotion/sheet": "^1.4.0", + "csstype": "^3.1.3", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@emotion/react": "^11.4.1", + "@emotion/styled": "^11.3.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + } + } + }, + "node_modules/@mui/styles": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-6.4.4.tgz", + "integrity": "sha512-QjB9jhjVTPR7+icGQQzjTUPAu/LodnwcRV3HNDqO5sr1HJhZOqd8V8TF/8ArXWwVIm0yw6E/MTvnvhJB82LUPQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.26.0", + "@emotion/hash": "^0.9.2", + "@mui/private-theming": "^6.4.3", + "@mui/types": "^7.2.21", + "@mui/utils": "^6.4.3", + "clsx": "^2.1.1", + "csstype": "^3.1.3", + "hoist-non-react-statics": "^3.3.2", + "jss": "^10.10.0", + "jss-plugin-camel-case": "^10.10.0", + "jss-plugin-default-unit": "^10.10.0", + "jss-plugin-global": "^10.10.0", + "jss-plugin-nested": "^10.10.0", + "jss-plugin-props-sort": "^10.10.0", + "jss-plugin-rule-value-function": "^10.10.0", + "jss-plugin-vendor-prefixer": "^10.10.0", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/system": { + "version": "6.4.3", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.4.3.tgz", + "integrity": "sha512-Q0iDwnH3+xoxQ0pqVbt8hFdzhq1g2XzzR4Y5pVcICTNtoCLJmpJS3vI4y/OIM1FHFmpfmiEC2IRIq7YcZ8nsmg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.26.0", + "@mui/private-theming": "^6.4.3", + "@mui/styled-engine": "^6.4.3", + "@mui/types": "^7.2.21", + "@mui/utils": "^6.4.3", + "clsx": "^2.1.1", + "csstype": "^3.1.3", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@emotion/react": "^11.5.0", + "@emotion/styled": "^11.3.0", + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + }, + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/types": { + "version": "7.2.21", + "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.21.tgz", + "integrity": "sha512-6HstngiUxNqLU+/DPqlUJDIPbzUBxIVHb1MmXP0eTWDIROiCR2viugXpEif0PPe2mLqqakPzzRClWAnK+8UJww==", + "license": "MIT", + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/utils": { + "version": "6.4.3", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.4.3.tgz", + "integrity": "sha512-jxHRHh3BqVXE9ABxDm+Tc3wlBooYz/4XPa0+4AI+iF38rV1/+btJmSUgG4shDtSWVs/I97aDn5jBCt6SF2Uq2A==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.26.0", + "@mui/types": "^7.2.21", + "@types/prop-types": "^15.7.14", + "clsx": "^2.1.1", + "prop-types": "^15.8.1", + "react-is": "^19.0.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, + "node_modules/@rollup/pluginutils": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz", + "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/pluginutils/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.8.tgz", + "integrity": "sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.8.tgz", + "integrity": "sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.8.tgz", + "integrity": "sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.8.tgz", + "integrity": "sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.8.tgz", + "integrity": "sha512-IQNVXL9iY6NniYbTaOKdrlVP3XIqazBgJOVkddzJlqnCpRi/yAeSOa8PLcECFSQochzqApIOE1GHNu3pCz+BDA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.8.tgz", + "integrity": "sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.8.tgz", + "integrity": "sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.8.tgz", + "integrity": "sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.8.tgz", + "integrity": "sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.8.tgz", + "integrity": "sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loongarch64-gnu": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.8.tgz", + "integrity": "sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.8.tgz", + "integrity": "sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.8.tgz", + "integrity": "sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz", + "integrity": "sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.8.tgz", + "integrity": "sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.8.tgz", + "integrity": "sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.8.tgz", + "integrity": "sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.8.tgz", + "integrity": "sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.8.tgz", + "integrity": "sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@svgr/babel-plugin-add-jsx-attribute": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz", + "integrity": "sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-remove-jsx-attribute": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz", + "integrity": "sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz", + "integrity": "sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz", + "integrity": "sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-svg-dynamic-title": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz", + "integrity": "sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-svg-em-dimensions": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz", + "integrity": "sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-transform-react-native-svg": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.1.0.tgz", + "integrity": "sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-plugin-transform-svg-component": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz", + "integrity": "sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/babel-preset": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-8.1.0.tgz", + "integrity": "sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==", + "dev": true, + "license": "MIT", + "dependencies": { + "@svgr/babel-plugin-add-jsx-attribute": "8.0.0", + "@svgr/babel-plugin-remove-jsx-attribute": "8.0.0", + "@svgr/babel-plugin-remove-jsx-empty-expression": "8.0.0", + "@svgr/babel-plugin-replace-jsx-attribute-value": "8.0.0", + "@svgr/babel-plugin-svg-dynamic-title": "8.0.0", + "@svgr/babel-plugin-svg-em-dimensions": "8.0.0", + "@svgr/babel-plugin-transform-react-native-svg": "8.1.0", + "@svgr/babel-plugin-transform-svg-component": "8.0.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@svgr/core": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.1.0.tgz", + "integrity": "sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.21.3", + "@svgr/babel-preset": "8.1.0", + "camelcase": "^6.2.0", + "cosmiconfig": "^8.1.3", + "snake-case": "^3.0.4" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/core/node_modules/cosmiconfig": { + "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", + "dev": true, + "license": "MIT", + "dependencies": { + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0", + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@svgr/hast-util-to-babel-ast": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-8.0.0.tgz", + "integrity": "sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.21.3", + "entities": "^4.4.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/plugin-jsx": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-8.1.0.tgz", + "integrity": "sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.21.3", + "@svgr/babel-preset": "8.1.0", + "@svgr/hast-util-to-babel-ast": "8.0.0", + "svg-parser": "^2.0.4" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@svgr/core": "*" + } + }, + "node_modules/@types/babel__core": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", + "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.20.7" + } + }, + "node_modules/@types/estree": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/mdast": { + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz", + "integrity": "sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==", + "license": "MIT", + "dependencies": { + "@types/unist": "^2" + } + }, + "node_modules/@types/parse-json": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", + "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", + "license": "MIT" + }, + "node_modules/@types/prop-types": { + "version": "15.7.14", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz", + "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==", + "license": "MIT" + }, + "node_modules/@types/react": { + "version": "19.0.10", + "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.10.tgz", + "integrity": "sha512-JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g==", + "license": "MIT", + "dependencies": { + "csstype": "^3.0.2" + } + }, + "node_modules/@types/react-dom": { + "version": "19.0.4", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.0.4.tgz", + "integrity": "sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "@types/react": "^19.0.0" + } + }, + "node_modules/@types/react-transition-group": { + "version": "4.4.12", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz", + "integrity": "sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*" + } + }, + "node_modules/@types/react-window": { + "version": "1.8.8", + "resolved": "https://registry.npmjs.org/@types/react-window/-/react-window-1.8.8.tgz", + "integrity": "sha512-8Ls660bHR1AUA2kuRvVG9D/4XpRC6wjAaPT9dil7Ckc76eP9TKWZwwmgfq8Q1LANX3QNDnoU4Zp48A3w+zK69Q==", + "license": "MIT", + "dependencies": { + "@types/react": "*" + } + }, + "node_modules/@types/unist": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz", + "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==", + "license": "MIT" + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "8.24.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.24.1.tgz", + "integrity": "sha512-ll1StnKtBigWIGqvYDVuDmXJHVH4zLVot1yQ4fJtLpL7qacwkxJc1T0bptqw+miBQ/QfUbhl1TcQ4accW5KUyA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "8.24.1", + "@typescript-eslint/type-utils": "8.24.1", + "@typescript-eslint/utils": "8.24.1", + "@typescript-eslint/visitor-keys": "8.24.1", + "graphemer": "^1.4.0", + "ignore": "^5.3.1", + "natural-compare": "^1.4.0", + "ts-api-utils": "^2.0.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "8.24.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.24.1.tgz", + "integrity": "sha512-Tqoa05bu+t5s8CTZFaGpCH2ub3QeT9YDkXbPd3uQ4SfsLoh1/vv2GEYAioPoxCWJJNsenXlC88tRjwoHNts1oQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/scope-manager": "8.24.1", + "@typescript-eslint/types": "8.24.1", + "@typescript-eslint/typescript-estree": "8.24.1", + "@typescript-eslint/visitor-keys": "8.24.1", + "debug": "^4.3.4" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "8.24.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.24.1.tgz", + "integrity": "sha512-OdQr6BNBzwRjNEXMQyaGyZzgg7wzjYKfX2ZBV3E04hUCBDv3GQCHiz9RpqdUIiVrMgJGkXm3tcEh4vFSHreS2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.24.1", + "@typescript-eslint/visitor-keys": "8.24.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "8.24.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.24.1.tgz", + "integrity": "sha512-/Do9fmNgCsQ+K4rCz0STI7lYB4phTtEXqqCAs3gZW0pnK7lWNkvWd5iW545GSmApm4AzmQXmSqXPO565B4WVrw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/typescript-estree": "8.24.1", + "@typescript-eslint/utils": "8.24.1", + "debug": "^4.3.4", + "ts-api-utils": "^2.0.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" + } + }, + "node_modules/@typescript-eslint/types": { + "version": "8.24.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.24.1.tgz", + "integrity": "sha512-9kqJ+2DkUXiuhoiYIUvIYjGcwle8pcPpdlfkemGvTObzgmYfJ5d0Qm6jwb4NBXP9W1I5tss0VIAnWFumz3mC5A==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "8.24.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.1.tgz", + "integrity": "sha512-UPyy4MJ/0RE648DSKQe9g0VDSehPINiejjA6ElqnFaFIhI6ZEiZAkUI0D5MCk0bQcTf/LVqZStvQ6K4lPn/BRg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.24.1", + "@typescript-eslint/visitor-keys": "8.24.1", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^2.0.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <5.8.0" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "8.24.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.24.1.tgz", + "integrity": "sha512-OOcg3PMMQx9EXspId5iktsI3eMaXVwlhC8BvNnX6B5w9a4dVgpkQZuU8Hy67TolKcl+iFWq0XX+jbDGN4xWxjQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.24.1", + "@typescript-eslint/types": "8.24.1", + "@typescript-eslint/typescript-estree": "8.24.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "8.24.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.24.1.tgz", + "integrity": "sha512-EwVHlp5l+2vp8CoqJm9KikPZgi3gbdZAtabKT9KPShGeOcJhsv4Zdo3oc8T8I0uKEmYoU4ItyxbptjF08enaxg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.24.1", + "eslint-visitor-keys": "^4.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@vitejs/plugin-react": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.4.tgz", + "integrity": "sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.26.0", + "@babel/plugin-transform-react-jsx-self": "^7.25.9", + "@babel/plugin-transform-react-jsx-source": "^7.25.9", + "@types/babel__core": "^7.20.5", + "react-refresh": "^0.14.2" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "peerDependencies": { + "vite": "^4.2.0 || ^5.0.0 || ^6.0.0" + } + }, + "node_modules/acorn": { + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/babel-plugin-macros": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz", + "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.12.5", + "cosmiconfig": "^7.0.0", + "resolve": "^1.19.0" + }, + "engines": { + "node": ">=10", + "npm": ">=6" + } + }, + "node_modules/bail": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", + "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browserslist": { + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", + "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "caniuse-lite": "^1.0.30001688", + "electron-to-chromium": "^1.5.73", + "node-releases": "^2.0.19", + "update-browserslist-db": "^1.1.1" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001700", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz", + "integrity": "sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/character-entities": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", + "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/character-entities-legacy": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", + "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/character-reference-invalid": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", + "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/comma-separated-tokens": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz", + "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/cosmiconfig": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", + "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "license": "MIT", + "dependencies": { + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/cosmiconfig/node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/css-vendor": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz", + "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.8.3", + "is-in-browser": "^1.0.2" + } + }, + "node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "license": "MIT" + }, + "node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/dom-helpers": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", + "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.8.7", + "csstype": "^3.0.2" + } + }, + "node_modules/dot-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", + "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", + "dev": true, + "license": "MIT", + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.5.102", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.102.tgz", + "integrity": "sha512-eHhqaja8tE/FNpIiBrvBjFV/SSKpyWHLvxuR9dPTdo+3V9ppdLmFB7ZZQ98qNovcngPLYIz0oOBF9P0FfZef5Q==", + "dev": true, + "license": "ISC" + }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/esbuild": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz", + "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.24.2", + "@esbuild/android-arm": "0.24.2", + "@esbuild/android-arm64": "0.24.2", + "@esbuild/android-x64": "0.24.2", + "@esbuild/darwin-arm64": "0.24.2", + "@esbuild/darwin-x64": "0.24.2", + "@esbuild/freebsd-arm64": "0.24.2", + "@esbuild/freebsd-x64": "0.24.2", + "@esbuild/linux-arm": "0.24.2", + "@esbuild/linux-arm64": "0.24.2", + "@esbuild/linux-ia32": "0.24.2", + "@esbuild/linux-loong64": "0.24.2", + "@esbuild/linux-mips64el": "0.24.2", + "@esbuild/linux-ppc64": "0.24.2", + "@esbuild/linux-riscv64": "0.24.2", + "@esbuild/linux-s390x": "0.24.2", + "@esbuild/linux-x64": "0.24.2", + "@esbuild/netbsd-arm64": "0.24.2", + "@esbuild/netbsd-x64": "0.24.2", + "@esbuild/openbsd-arm64": "0.24.2", + "@esbuild/openbsd-x64": "0.24.2", + "@esbuild/sunos-x64": "0.24.2", + "@esbuild/win32-arm64": "0.24.2", + "@esbuild/win32-ia32": "0.24.2", + "@esbuild/win32-x64": "0.24.2" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "9.20.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.1.tgz", + "integrity": "sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.19.0", + "@eslint/core": "^0.11.0", + "@eslint/eslintrc": "^3.2.0", + "@eslint/js": "9.20.0", + "@eslint/plugin-kit": "^0.2.5", + "@humanfs/node": "^0.16.6", + "@humanwhocodes/module-importer": "^1.0.1", + "@humanwhocodes/retry": "^0.4.1", + "@types/estree": "^1.0.6", + "@types/json-schema": "^7.0.15", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.6", + "debug": "^4.3.2", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^8.2.0", + "eslint-visitor-keys": "^4.2.0", + "espree": "^10.3.0", + "esquery": "^1.5.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^8.0.0", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-react-hooks": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.1.0.tgz", + "integrity": "sha512-mpJRtPgHN2tNAvZ35AMfqeB3Xqeo273QxrHJsbBEPWODRM4r0yB6jfoROqKEYrOn27UtRPpcpHc2UqyBSuUNTw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-react-refresh": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.19.tgz", + "integrity": "sha512-eyy8pcr/YxSYjBoqIFSrlbn9i/xvxUFa8CjzAYo9cFjgGXqq1hyjihcpZvxRLalpaWmueWR81xn7vuKmAFijDQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "eslint": ">=8.40" + } + }, + "node_modules/eslint-scope": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", + "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.14.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^4.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "dev": true, + "license": "MIT" + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "license": "MIT" + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-glob": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.8" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz", + "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^4.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-root": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", + "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==", + "license": "MIT" + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.4" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/flatted": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "dev": true, + "license": "ISC" + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globals": { + "version": "15.15.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", + "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/hast-to-hyperscript": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz", + "integrity": "sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA==", + "license": "MIT", + "dependencies": { + "@types/unist": "^2.0.3", + "comma-separated-tokens": "^1.0.0", + "property-information": "^5.3.0", + "space-separated-tokens": "^1.0.0", + "style-to-object": "^0.3.0", + "unist-util-is": "^4.0.0", + "web-namespaces": "^1.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hoist-non-react-statics": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "license": "BSD-3-Clause", + "dependencies": { + "react-is": "^16.7.0" + } + }, + "node_modules/hoist-non-react-statics/node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "license": "MIT" + }, + "node_modules/hyphenate-style-name": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz", + "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==", + "license": "BSD-3-Clause" + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inline-style-parser": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz", + "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==", + "license": "MIT" + }, + "node_modules/is-alphabetical": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", + "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/is-alphanumerical": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", + "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", + "license": "MIT", + "dependencies": { + "is-alphabetical": "^1.0.0", + "is-decimal": "^1.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "license": "MIT" + }, + "node_modules/is-buffer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-decimal": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", + "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-hexadecimal": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", + "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/is-in-browser": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz", + "integrity": "sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g==", + "license": "MIT" + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsesc": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jss": { + "version": "10.10.0", + "resolved": "https://registry.npmjs.org/jss/-/jss-10.10.0.tgz", + "integrity": "sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.3.1", + "csstype": "^3.0.2", + "is-in-browser": "^1.1.3", + "tiny-warning": "^1.0.2" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/jss" + } + }, + "node_modules/jss-plugin-camel-case": { + "version": "10.10.0", + "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz", + "integrity": "sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.3.1", + "hyphenate-style-name": "^1.0.3", + "jss": "10.10.0" + } + }, + "node_modules/jss-plugin-default-unit": { + "version": "10.10.0", + "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz", + "integrity": "sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.3.1", + "jss": "10.10.0" + } + }, + "node_modules/jss-plugin-global": { + "version": "10.10.0", + "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz", + "integrity": "sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.3.1", + "jss": "10.10.0" + } + }, + "node_modules/jss-plugin-nested": { + "version": "10.10.0", + "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz", + "integrity": "sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.3.1", + "jss": "10.10.0", + "tiny-warning": "^1.0.2" + } + }, + "node_modules/jss-plugin-props-sort": { + "version": "10.10.0", + "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz", + "integrity": "sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.3.1", + "jss": "10.10.0" + } + }, + "node_modules/jss-plugin-rule-value-function": { + "version": "10.10.0", + "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz", + "integrity": "sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.3.1", + "jss": "10.10.0", + "tiny-warning": "^1.0.2" + } + }, + "node_modules/jss-plugin-vendor-prefixer": { + "version": "10.10.0", + "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz", + "integrity": "sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.3.1", + "css-vendor": "^2.0.8", + "jss": "10.10.0" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "license": "MIT" + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "license": "MIT", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/lower-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^2.0.3" + } + }, + "node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/mdast-util-definitions": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz", + "integrity": "sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==", + "license": "MIT", + "dependencies": { + "unist-util-visit": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-definitions/node_modules/unist-util-visit": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz", + "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==", + "license": "MIT", + "dependencies": { + "@types/unist": "^2.0.0", + "unist-util-is": "^4.0.0", + "unist-util-visit-parents": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-definitions/node_modules/unist-util-visit-parents": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", + "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", + "license": "MIT", + "dependencies": { + "@types/unist": "^2.0.0", + "unist-util-is": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-from-markdown": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz", + "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==", + "license": "MIT", + "dependencies": { + "@types/mdast": "^3.0.0", + "mdast-util-to-string": "^2.0.0", + "micromark": "~2.11.0", + "parse-entities": "^2.0.0", + "unist-util-stringify-position": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-to-hast": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-10.2.0.tgz", + "integrity": "sha512-JoPBfJ3gBnHZ18icCwHR50orC9kNH81tiR1gs01D8Q5YpV6adHNO9nKNuFBCJQ941/32PT1a63UF/DitmS3amQ==", + "license": "MIT", + "dependencies": { + "@types/mdast": "^3.0.0", + "@types/unist": "^2.0.0", + "mdast-util-definitions": "^4.0.0", + "mdurl": "^1.0.0", + "unist-builder": "^2.0.0", + "unist-util-generated": "^1.0.0", + "unist-util-position": "^3.0.0", + "unist-util-visit": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-to-hast/node_modules/unist-util-visit": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz", + "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==", + "license": "MIT", + "dependencies": { + "@types/unist": "^2.0.0", + "unist-util-is": "^4.0.0", + "unist-util-visit-parents": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-to-hast/node_modules/unist-util-visit-parents": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", + "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", + "license": "MIT", + "dependencies": { + "@types/unist": "^2.0.0", + "unist-util-is": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-to-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", + "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", + "license": "MIT" + }, + "node_modules/memoize-one": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz", + "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==", + "license": "MIT" + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromark": { + "version": "2.11.4", + "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz", + "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==", + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "debug": "^4.0.0", + "parse-entities": "^2.0.0" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/nanoid": { + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/no-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "dev": true, + "license": "MIT", + "dependencies": { + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + } + }, + "node_modules/node-releases": { + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", + "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", + "dev": true, + "license": "MIT" + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-entities": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", + "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", + "license": "MIT", + "dependencies": { + "character-entities": "^1.0.0", + "character-entities-legacy": "^1.0.0", + "character-reference-invalid": "^1.0.0", + "is-alphanumerical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-hexadecimal": "^1.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "license": "MIT" + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/postcss": { + "version": "8.5.2", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz", + "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.8", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "license": "MIT", + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "node_modules/prop-types/node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "license": "MIT" + }, + "node_modules/property-information": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz", + "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==", + "license": "MIT", + "dependencies": { + "xtend": "^4.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/react": { + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz", + "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-dom": { + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz", + "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==", + "license": "MIT", + "dependencies": { + "scheduler": "^0.25.0" + }, + "peerDependencies": { + "react": "^19.0.0" + } + }, + "node_modules/react-is": { + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.0.0.tgz", + "integrity": "sha512-H91OHcwjZsbq3ClIDHMzBShc1rotbfACdWENsmEf0IFvZ3FgGPtdHMcsv45bQ1hAbgdfiA8SnxTKfDS+x/8m2g==", + "license": "MIT" + }, + "node_modules/react-refresh": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz", + "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-remark": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/react-remark/-/react-remark-2.1.0.tgz", + "integrity": "sha512-7dEPxRGQ23sOdvteuRGaQAs9cEOH/BOeCN4CqsJdk3laUDIDYRCWnM6a3z92PzXHUuxIRLXQNZx7SiO0ijUcbw==", + "license": "MIT", + "dependencies": { + "rehype-react": "^6.0.0", + "remark-parse": "^9.0.0", + "remark-rehype": "^8.0.0", + "unified": "^9.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + }, + "peerDependencies": { + "react": ">=16.8" + } + }, + "node_modules/react-transition-group": { + "version": "4.4.5", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", + "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", + "license": "BSD-3-Clause", + "dependencies": { + "@babel/runtime": "^7.5.5", + "dom-helpers": "^5.0.1", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2" + }, + "peerDependencies": { + "react": ">=16.6.0", + "react-dom": ">=16.6.0" + } + }, + "node_modules/react-virtualized-auto-sizer": { + "version": "1.0.25", + "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.25.tgz", + "integrity": "sha512-YHsksEGDfsHbHuaBVDYwJmcktblcHGafz4ZVuYPQYuSHMUGjpwmUCrAOcvMSGMwwk1eFWj1M/1GwYpNPuyhaBg==", + "license": "MIT", + "peerDependencies": { + "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 || ^19.0.0" + } + }, + "node_modules/react-window": { + "version": "1.8.11", + "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.11.tgz", + "integrity": "sha512-+SRbUVT2scadgFSWx+R1P754xHPEqvcfSfVX10QYg6POOz+WNgkN48pS+BtZNIMGiL1HYrSEiCkwsMS15QogEQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.0.0", + "memoize-one": ">=3.1.1 <6" + }, + "engines": { + "node": ">8.0.0" + }, + "peerDependencies": { + "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" + } + }, + "node_modules/regenerator-runtime": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", + "license": "MIT" + }, + "node_modules/rehype-react": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/rehype-react/-/rehype-react-6.2.1.tgz", + "integrity": "sha512-f9KIrjktvLvmbGc7si25HepocOg4z0MuNOtweigKzBcDjiGSTGhyz6VSgaV5K421Cq1O+z4/oxRJ5G9owo0KVg==", + "license": "MIT", + "dependencies": { + "@mapbox/hast-util-table-cell-style": "^0.2.0", + "hast-to-hyperscript": "^9.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/remark-parse": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz", + "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==", + "license": "MIT", + "dependencies": { + "mdast-util-from-markdown": "^0.8.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/remark-rehype": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/remark-rehype/-/remark-rehype-8.1.0.tgz", + "integrity": "sha512-EbCu9kHgAxKmW1yEYjx3QafMyGY3q8noUbNUI5xyKbaFP89wbhDrKxyIQNukNYthzjNHZu6J7hwFg7hRm1svYA==", + "license": "MIT", + "dependencies": { + "mdast-util-to-hast": "^10.2.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rollup": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.8.tgz", + "integrity": "sha512-489gTVMzAYdiZHFVA/ig/iYFllCcWFHMvUHI1rpFmkoUtRlQxqh6/yiNqnYibjMZ2b/+FUQwldG+aLsEt6bglQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "1.0.6" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.34.8", + "@rollup/rollup-android-arm64": "4.34.8", + "@rollup/rollup-darwin-arm64": "4.34.8", + "@rollup/rollup-darwin-x64": "4.34.8", + "@rollup/rollup-freebsd-arm64": "4.34.8", + "@rollup/rollup-freebsd-x64": "4.34.8", + "@rollup/rollup-linux-arm-gnueabihf": "4.34.8", + "@rollup/rollup-linux-arm-musleabihf": "4.34.8", + "@rollup/rollup-linux-arm64-gnu": "4.34.8", + "@rollup/rollup-linux-arm64-musl": "4.34.8", + "@rollup/rollup-linux-loongarch64-gnu": "4.34.8", + "@rollup/rollup-linux-powerpc64le-gnu": "4.34.8", + "@rollup/rollup-linux-riscv64-gnu": "4.34.8", + "@rollup/rollup-linux-s390x-gnu": "4.34.8", + "@rollup/rollup-linux-x64-gnu": "4.34.8", + "@rollup/rollup-linux-x64-musl": "4.34.8", + "@rollup/rollup-win32-arm64-msvc": "4.34.8", + "@rollup/rollup-win32-ia32-msvc": "4.34.8", + "@rollup/rollup-win32-x64-msvc": "4.34.8", + "fsevents": "~2.3.2" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/scheduler": { + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz", + "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==", + "license": "MIT" + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/snake-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz", + "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==", + "dev": true, + "license": "MIT", + "dependencies": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/space-separated-tokens": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz", + "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/style-to-object": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz", + "integrity": "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==", + "license": "MIT", + "dependencies": { + "inline-style-parser": "0.1.1" + } + }, + "node_modules/stylis": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz", + "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==", + "license": "MIT" + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/svg-parser": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz", + "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/tiny-warning": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", + "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==", + "license": "MIT" + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/trough": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", + "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/ts-api-utils": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz", + "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18.12" + }, + "peerDependencies": { + "typescript": ">=4.8.4" + } + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "dev": true, + "license": "0BSD" + }, + "node_modules/tss-react": { + "version": "4.9.15", + "resolved": "https://registry.npmjs.org/tss-react/-/tss-react-4.9.15.tgz", + "integrity": "sha512-rLiEmDwUtln9RKTUR/ZPYBrufF0Tq/PFggO1M7P8M3/FAcodPQ746Ug9MCEFkURKDlntN17+Oja0DMMz5yBnsQ==", + "license": "MIT", + "dependencies": { + "@emotion/cache": "*", + "@emotion/serialize": "*", + "@emotion/utils": "*" + }, + "peerDependencies": { + "@emotion/react": "^11.4.1", + "@emotion/server": "^11.4.0", + "@mui/material": "^5.0.0 || ^6.0.0", + "@types/react": "^16.8.0 || ^17.0.2 || ^18.0.0 || ^19.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@emotion/server": { + "optional": true + }, + "@mui/material": { + "optional": true + } + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/typescript": { + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", + "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/typescript-eslint": { + "version": "8.24.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.24.1.tgz", + "integrity": "sha512-cw3rEdzDqBs70TIcb0Gdzbt6h11BSs2pS0yaq7hDWDBtCCSei1pPSUXE9qUdQ/Wm9NgFg8mKtMt1b8fTHIl1jA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/eslint-plugin": "8.24.1", + "@typescript-eslint/parser": "8.24.1", + "@typescript-eslint/utils": "8.24.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" + } + }, + "node_modules/unified": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz", + "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==", + "license": "MIT", + "dependencies": { + "bail": "^1.0.0", + "extend": "^3.0.0", + "is-buffer": "^2.0.0", + "is-plain-obj": "^2.0.0", + "trough": "^1.0.0", + "vfile": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-builder": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz", + "integrity": "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-generated": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz", + "integrity": "sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-is": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", + "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-position": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz", + "integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-stringify-position": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", + "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", + "license": "MIT", + "dependencies": { + "@types/unist": "^2.0.2" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-visit": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", + "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "license": "MIT", + "dependencies": { + "unist-util-visit-parents": "^2.0.0" + } + }, + "node_modules/unist-util-visit-parents": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz", + "integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==", + "license": "MIT", + "dependencies": { + "unist-util-is": "^3.0.0" + } + }, + "node_modules/unist-util-visit-parents/node_modules/unist-util-is": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz", + "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==", + "license": "MIT" + }, + "node_modules/update-browserslist-db": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz", + "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.2.0", + "picocolors": "^1.1.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/vfile": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", + "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", + "license": "MIT", + "dependencies": { + "@types/unist": "^2.0.0", + "is-buffer": "^2.0.0", + "unist-util-stringify-position": "^2.0.0", + "vfile-message": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vfile-message": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", + "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", + "license": "MIT", + "dependencies": { + "@types/unist": "^2.0.0", + "unist-util-stringify-position": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vite": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.0.tgz", + "integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "^0.24.2", + "postcss": "^8.5.1", + "rollup": "^4.30.1" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^18.0.0 || ^20.0.0 || >=22.0.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + }, + "peerDependencies": { + "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", + "jiti": ">=1.21.0", + "less": "*", + "lightningcss": "^1.21.0", + "sass": "*", + "sass-embedded": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.16.0", + "tsx": "^4.8.1", + "yaml": "^2.4.2" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "jiti": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + }, + "tsx": { + "optional": true + }, + "yaml": { + "optional": true + } + } + }, + "node_modules/vite-plugin-svgr": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/vite-plugin-svgr/-/vite-plugin-svgr-4.3.0.tgz", + "integrity": "sha512-Jy9qLB2/PyWklpYy0xk0UU3TlU0t2UMpJXZvf+hWII1lAmRHrOUKi11Uw8N3rxoNk7atZNYO3pR3vI1f7oi+6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rollup/pluginutils": "^5.1.3", + "@svgr/core": "^8.1.0", + "@svgr/plugin-jsx": "^8.1.0" + }, + "peerDependencies": { + "vite": ">=2.6.0" + } + }, + "node_modules/web-namespaces": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz", + "integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "license": "MIT", + "engines": { + "node": ">=0.4" + } + }, + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, + "license": "ISC" + }, + "node_modules/yaml": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", + "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", + "dev": true, + "license": "ISC", + "optional": true, + "peer": true, + "bin": { + "yaml": "bin.mjs" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/vite/package.json b/vite/package.json new file mode 100644 index 0000000..bcf96f2 --- /dev/null +++ b/vite/package.json @@ -0,0 +1,41 @@ +{ + "name": "pipedal", + "private": true, + "version": "0.0.0", + "type": "module", + "scripts": { + "dev": "vite", + "build": "tsc -b && vite build", + "lint": "eslint .", + "preview": "vite preview" + }, + "dependencies": { + "@emotion/react": "^11.14.0", + "@emotion/styled": "^11.14.0", + "@fontsource/roboto": "^5.1.1", + "@mui/icons-material": "^6.4.4", + "@mui/material": "^6.4.4", + "@mui/styles": "^6.4.4", + "@types/react-window": "^1.8.8", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "react-remark": "^2.1.0", + "react-virtualized-auto-sizer": "^1.0.25", + "react-window": "^1.8.11", + "tss-react": "^4.9.15" + }, + "devDependencies": { + "@eslint/js": "^9.19.0", + "@types/react": "^19.0.8", + "@types/react-dom": "^19.0.3", + "@vitejs/plugin-react": "^4.3.4", + "eslint": "^9.19.0", + "eslint-plugin-react-hooks": "^5.0.0", + "eslint-plugin-react-refresh": "^0.4.18", + "globals": "^15.14.0", + "typescript": "~5.7.2", + "typescript-eslint": "^8.22.0", + "vite": "^6.1.0", + "vite-plugin-svgr": "^4.3.0" + } +} diff --git a/react/public/css/roboto.css b/vite/public/css/roboto.css similarity index 100% rename from react/public/css/roboto.css rename to vite/public/css/roboto.css diff --git a/react/public/favicon.ico b/vite/public/favicon.ico similarity index 100% rename from react/public/favicon.ico rename to vite/public/favicon.ico diff --git a/react/public/fonts/LICENSE.txt b/vite/public/fonts/LICENSE.txt similarity index 100% rename from react/public/fonts/LICENSE.txt rename to vite/public/fonts/LICENSE.txt diff --git a/react/public/fonts/Roboto-Black.woff2 b/vite/public/fonts/Roboto-Black.woff2 similarity index 100% rename from react/public/fonts/Roboto-Black.woff2 rename to vite/public/fonts/Roboto-Black.woff2 diff --git a/react/public/fonts/Roboto-BlackItalic.woff2 b/vite/public/fonts/Roboto-BlackItalic.woff2 similarity index 100% rename from react/public/fonts/Roboto-BlackItalic.woff2 rename to vite/public/fonts/Roboto-BlackItalic.woff2 diff --git a/react/public/fonts/Roboto-Bold.woff2 b/vite/public/fonts/Roboto-Bold.woff2 similarity index 100% rename from react/public/fonts/Roboto-Bold.woff2 rename to vite/public/fonts/Roboto-Bold.woff2 diff --git a/react/public/fonts/Roboto-BoldItalic.woff2 b/vite/public/fonts/Roboto-BoldItalic.woff2 similarity index 100% rename from react/public/fonts/Roboto-BoldItalic.woff2 rename to vite/public/fonts/Roboto-BoldItalic.woff2 diff --git a/react/public/fonts/Roboto-Italic.woff2 b/vite/public/fonts/Roboto-Italic.woff2 similarity index 100% rename from react/public/fonts/Roboto-Italic.woff2 rename to vite/public/fonts/Roboto-Italic.woff2 diff --git a/react/public/fonts/Roboto-Light.woff2 b/vite/public/fonts/Roboto-Light.woff2 similarity index 100% rename from react/public/fonts/Roboto-Light.woff2 rename to vite/public/fonts/Roboto-Light.woff2 diff --git a/react/public/fonts/Roboto-LightItalic.woff2 b/vite/public/fonts/Roboto-LightItalic.woff2 similarity index 100% rename from react/public/fonts/Roboto-LightItalic.woff2 rename to vite/public/fonts/Roboto-LightItalic.woff2 diff --git a/react/public/fonts/Roboto-Medium.woff2 b/vite/public/fonts/Roboto-Medium.woff2 similarity index 100% rename from react/public/fonts/Roboto-Medium.woff2 rename to vite/public/fonts/Roboto-Medium.woff2 diff --git a/react/public/fonts/Roboto-MediumItalic.woff2 b/vite/public/fonts/Roboto-MediumItalic.woff2 similarity index 100% rename from react/public/fonts/Roboto-MediumItalic.woff2 rename to vite/public/fonts/Roboto-MediumItalic.woff2 diff --git a/react/public/fonts/Roboto-Regular.woff2 b/vite/public/fonts/Roboto-Regular.woff2 similarity index 100% rename from react/public/fonts/Roboto-Regular.woff2 rename to vite/public/fonts/Roboto-Regular.woff2 diff --git a/react/public/fonts/Roboto-Thin.woff2 b/vite/public/fonts/Roboto-Thin.woff2 similarity index 100% rename from react/public/fonts/Roboto-Thin.woff2 rename to vite/public/fonts/Roboto-Thin.woff2 diff --git a/react/public/fonts/Roboto-ThinItalic.woff2 b/vite/public/fonts/Roboto-ThinItalic.woff2 similarity index 100% rename from react/public/fonts/Roboto-ThinItalic.woff2 rename to vite/public/fonts/Roboto-ThinItalic.woff2 diff --git a/react/public/img/Pi-Logo-3.png b/vite/public/img/Pi-Logo-3.png similarity index 100% rename from react/public/img/Pi-Logo-3.png rename to vite/public/img/Pi-Logo-3.png diff --git a/react/public/img/Pi-Logo-3.svg b/vite/public/img/Pi-Logo-3.svg similarity index 100% rename from react/public/img/Pi-Logo-3.svg rename to vite/public/img/Pi-Logo-3.svg diff --git a/react/public/img/VST_Logo_Steinberg.ico b/vite/public/img/VST_Logo_Steinberg.ico similarity index 100% rename from react/public/img/VST_Logo_Steinberg.ico rename to vite/public/img/VST_Logo_Steinberg.ico diff --git a/react/public/img/VST_Logo_Steinberg.png b/vite/public/img/VST_Logo_Steinberg.png similarity index 100% rename from react/public/img/VST_Logo_Steinberg.png rename to vite/public/img/VST_Logo_Steinberg.png diff --git a/react/public/img/cc-by.png b/vite/public/img/cc-by.png similarity index 100% rename from react/public/img/cc-by.png rename to vite/public/img/cc-by.png diff --git a/react/public/img/cx_mono.svg b/vite/public/img/cx_mono.svg similarity index 100% rename from react/public/img/cx_mono.svg rename to vite/public/img/cx_mono.svg diff --git a/react/public/img/cx_stereo.svg b/vite/public/img/cx_stereo.svg similarity index 100% rename from react/public/img/cx_stereo.svg rename to vite/public/img/cx_stereo.svg diff --git a/react/public/img/delete_outline_black_24dp.svg b/vite/public/img/delete_outline_black_24dp.svg similarity index 100% rename from react/public/img/delete_outline_black_24dp.svg rename to vite/public/img/delete_outline_black_24dp.svg diff --git a/react/public/img/edit_banks.svg b/vite/public/img/edit_banks.svg similarity index 100% rename from react/public/img/edit_banks.svg rename to vite/public/img/edit_banks.svg diff --git a/react/public/img/edit_banks_white.svg b/vite/public/img/edit_banks_white.svg similarity index 100% rename from react/public/img/edit_banks_white.svg rename to vite/public/img/edit_banks_white.svg diff --git a/react/public/img/fx_amplifier.svg b/vite/public/img/fx_amplifier.svg similarity index 100% rename from react/public/img/fx_amplifier.svg rename to vite/public/img/fx_amplifier.svg diff --git a/react/public/img/fx_analyzer.svg b/vite/public/img/fx_analyzer.svg similarity index 100% rename from react/public/img/fx_analyzer.svg rename to vite/public/img/fx_analyzer.svg diff --git a/react/public/img/fx_chorus.svg b/vite/public/img/fx_chorus.svg similarity index 100% rename from react/public/img/fx_chorus.svg rename to vite/public/img/fx_chorus.svg diff --git a/react/public/img/fx_compressor.svg b/vite/public/img/fx_compressor.svg similarity index 100% rename from react/public/img/fx_compressor.svg rename to vite/public/img/fx_compressor.svg diff --git a/react/public/img/fx_constant.svg b/vite/public/img/fx_constant.svg similarity index 100% rename from react/public/img/fx_constant.svg rename to vite/public/img/fx_constant.svg diff --git a/react/public/img/fx_converter.svg b/vite/public/img/fx_converter.svg similarity index 100% rename from react/public/img/fx_converter.svg rename to vite/public/img/fx_converter.svg diff --git a/react/public/img/fx_delay.svg b/vite/public/img/fx_delay.svg similarity index 100% rename from react/public/img/fx_delay.svg rename to vite/public/img/fx_delay.svg diff --git a/react/public/img/fx_dial.svg b/vite/public/img/fx_dial.svg similarity index 100% rename from react/public/img/fx_dial.svg rename to vite/public/img/fx_dial.svg diff --git a/react/public/img/fx_distortion.svg b/vite/public/img/fx_distortion.svg similarity index 100% rename from react/public/img/fx_distortion.svg rename to vite/public/img/fx_distortion.svg diff --git a/react/public/img/fx_empty.svg b/vite/public/img/fx_empty.svg similarity index 100% rename from react/public/img/fx_empty.svg rename to vite/public/img/fx_empty.svg diff --git a/react/public/img/fx_eq.svg b/vite/public/img/fx_eq.svg similarity index 100% rename from react/public/img/fx_eq.svg rename to vite/public/img/fx_eq.svg diff --git a/react/public/img/fx_error.svg b/vite/public/img/fx_error.svg similarity index 100% rename from react/public/img/fx_error.svg rename to vite/public/img/fx_error.svg diff --git a/react/public/img/fx_filter.svg b/vite/public/img/fx_filter.svg similarity index 100% rename from react/public/img/fx_filter.svg rename to vite/public/img/fx_filter.svg diff --git a/react/public/img/fx_filter_hp.svg b/vite/public/img/fx_filter_hp.svg similarity index 100% rename from react/public/img/fx_filter_hp.svg rename to vite/public/img/fx_filter_hp.svg diff --git a/react/public/img/fx_flanger.svg b/vite/public/img/fx_flanger.svg similarity index 100% rename from react/public/img/fx_flanger.svg rename to vite/public/img/fx_flanger.svg diff --git a/react/public/img/fx_flanger2.svg b/vite/public/img/fx_flanger2.svg similarity index 100% rename from react/public/img/fx_flanger2.svg rename to vite/public/img/fx_flanger2.svg diff --git a/react/public/img/fx_function.svg b/vite/public/img/fx_function.svg similarity index 100% rename from react/public/img/fx_function.svg rename to vite/public/img/fx_function.svg diff --git a/react/public/img/fx_gate.svg b/vite/public/img/fx_gate.svg similarity index 100% rename from react/public/img/fx_gate.svg rename to vite/public/img/fx_gate.svg diff --git a/react/public/img/fx_generator.svg b/vite/public/img/fx_generator.svg similarity index 100% rename from react/public/img/fx_generator.svg rename to vite/public/img/fx_generator.svg diff --git a/react/public/img/fx_instrument.svg b/vite/public/img/fx_instrument.svg similarity index 100% rename from react/public/img/fx_instrument.svg rename to vite/public/img/fx_instrument.svg diff --git a/react/public/img/fx_limiter.svg b/vite/public/img/fx_limiter.svg similarity index 100% rename from react/public/img/fx_limiter.svg rename to vite/public/img/fx_limiter.svg diff --git a/react/public/img/fx_lr.svg b/vite/public/img/fx_lr.svg similarity index 100% rename from react/public/img/fx_lr.svg rename to vite/public/img/fx_lr.svg diff --git a/react/public/img/fx_mixer.svg b/vite/public/img/fx_mixer.svg similarity index 100% rename from react/public/img/fx_mixer.svg rename to vite/public/img/fx_mixer.svg diff --git a/react/public/img/fx_modulator.svg b/vite/public/img/fx_modulator.svg similarity index 100% rename from react/public/img/fx_modulator.svg rename to vite/public/img/fx_modulator.svg diff --git a/react/public/img/fx_oscillator.svg b/vite/public/img/fx_oscillator.svg similarity index 100% rename from react/public/img/fx_oscillator.svg rename to vite/public/img/fx_oscillator.svg diff --git a/react/public/img/fx_parametric_eq.svg b/vite/public/img/fx_parametric_eq.svg similarity index 100% rename from react/public/img/fx_parametric_eq.svg rename to vite/public/img/fx_parametric_eq.svg diff --git a/react/public/img/fx_phaser.svg b/vite/public/img/fx_phaser.svg similarity index 100% rename from react/public/img/fx_phaser.svg rename to vite/public/img/fx_phaser.svg diff --git a/react/public/img/fx_pitch.svg b/vite/public/img/fx_pitch.svg similarity index 100% rename from react/public/img/fx_pitch.svg rename to vite/public/img/fx_pitch.svg diff --git a/react/public/img/fx_plugin.svg b/vite/public/img/fx_plugin.svg similarity index 100% rename from react/public/img/fx_plugin.svg rename to vite/public/img/fx_plugin.svg diff --git a/react/public/img/fx_reverb.svg b/vite/public/img/fx_reverb.svg similarity index 100% rename from react/public/img/fx_reverb.svg rename to vite/public/img/fx_reverb.svg diff --git a/react/public/img/fx_simulator.svg b/vite/public/img/fx_simulator.svg similarity index 100% rename from react/public/img/fx_simulator.svg rename to vite/public/img/fx_simulator.svg diff --git a/react/public/img/fx_spatial.svg b/vite/public/img/fx_spatial.svg similarity index 100% rename from react/public/img/fx_spatial.svg rename to vite/public/img/fx_spatial.svg diff --git a/react/public/img/fx_spectral.svg b/vite/public/img/fx_spectral.svg similarity index 100% rename from react/public/img/fx_spectral.svg rename to vite/public/img/fx_spectral.svg diff --git a/react/public/img/fx_split_a.svg b/vite/public/img/fx_split_a.svg similarity index 100% rename from react/public/img/fx_split_a.svg rename to vite/public/img/fx_split_a.svg diff --git a/react/public/img/fx_split_b.svg b/vite/public/img/fx_split_b.svg similarity index 100% rename from react/public/img/fx_split_b.svg rename to vite/public/img/fx_split_b.svg diff --git a/react/public/img/fx_terminal.svg b/vite/public/img/fx_terminal.svg similarity index 100% rename from react/public/img/fx_terminal.svg rename to vite/public/img/fx_terminal.svg diff --git a/react/public/img/fx_utility.svg b/vite/public/img/fx_utility.svg similarity index 100% rename from react/public/img/fx_utility.svg rename to vite/public/img/fx_utility.svg diff --git a/react/public/img/ic_bank.svg b/vite/public/img/ic_bank.svg similarity index 100% rename from react/public/img/ic_bank.svg rename to vite/public/img/ic_bank.svg diff --git a/react/public/img/ic_drawer.svg b/vite/public/img/ic_drawer.svg similarity index 100% rename from react/public/img/ic_drawer.svg rename to vite/public/img/ic_drawer.svg diff --git a/react/public/img/ic_drawer_2.png b/vite/public/img/ic_drawer_2.png similarity index 100% rename from react/public/img/ic_drawer_2.png rename to vite/public/img/ic_drawer_2.png diff --git a/react/public/img/ic_drawer_2.svg b/vite/public/img/ic_drawer_2.svg similarity index 100% rename from react/public/img/ic_drawer_2.svg rename to vite/public/img/ic_drawer_2.svg diff --git a/react/public/img/ic_logo.svg b/vite/public/img/ic_logo.svg similarity index 100% rename from react/public/img/ic_logo.svg rename to vite/public/img/ic_logo.svg diff --git a/react/public/img/ic_navigate_before.svg b/vite/public/img/ic_navigate_before.svg similarity index 100% rename from react/public/img/ic_navigate_before.svg rename to vite/public/img/ic_navigate_before.svg diff --git a/react/public/img/ic_navigate_next.svg b/vite/public/img/ic_navigate_next.svg similarity index 100% rename from react/public/img/ic_navigate_next.svg rename to vite/public/img/ic_navigate_next.svg diff --git a/react/public/img/ic_presets.svg b/vite/public/img/ic_presets.svg similarity index 100% rename from react/public/img/ic_presets.svg rename to vite/public/img/ic_presets.svg diff --git a/react/public/img/ic_presets_white.svg b/vite/public/img/ic_presets_white.svg similarity index 100% rename from react/public/img/ic_presets_white.svg rename to vite/public/img/ic_presets_white.svg diff --git a/react/public/img/old_delete_outline_black_24dp.svg b/vite/public/img/old_delete_outline_black_24dp.svg similarity index 100% rename from react/public/img/old_delete_outline_black_24dp.svg rename to vite/public/img/old_delete_outline_black_24dp.svg diff --git a/react/public/img/old_delete_outline_white_24dp.svg b/vite/public/img/old_delete_outline_white_24dp.svg similarity index 100% rename from react/public/img/old_delete_outline_white_24dp.svg rename to vite/public/img/old_delete_outline_white_24dp.svg diff --git a/react/public/img/settings_black_24dp.svg b/vite/public/img/settings_black_24dp.svg similarity index 100% rename from react/public/img/settings_black_24dp.svg rename to vite/public/img/settings_black_24dp.svg diff --git a/react/public/img/settings_white_24dp.svg b/vite/public/img/settings_white_24dp.svg similarity index 100% rename from react/public/img/settings_white_24dp.svg rename to vite/public/img/settings_white_24dp.svg diff --git a/react/public/img/vst.png b/vite/public/img/vst.png similarity index 100% rename from react/public/img/vst.png rename to vite/public/img/vst.png diff --git a/react/public/img/vst.svg b/vite/public/img/vst.svg similarity index 100% rename from react/public/img/vst.svg rename to vite/public/img/vst.svg diff --git a/react/public/index.html b/vite/public/index.html similarity index 100% rename from react/public/index.html rename to vite/public/index.html diff --git a/react/public/iso_codes.json b/vite/public/iso_codes.json similarity index 100% rename from react/public/iso_codes.json rename to vite/public/iso_codes.json diff --git a/react/public/logo192.png b/vite/public/logo192.png similarity index 100% rename from react/public/logo192.png rename to vite/public/logo192.png diff --git a/react/public/logo512.png b/vite/public/logo512.png similarity index 100% rename from react/public/logo512.png rename to vite/public/logo512.png diff --git a/react/public/manifest.json b/vite/public/manifest.json similarity index 100% rename from react/public/manifest.json rename to vite/public/manifest.json diff --git a/react/public/robots.txt b/vite/public/robots.txt similarity index 100% rename from react/public/robots.txt rename to vite/public/robots.txt diff --git a/react/public/sample_lv2_plugins.json b/vite/public/sample_lv2_plugins.json similarity index 100% rename from react/public/sample_lv2_plugins.json rename to vite/public/sample_lv2_plugins.json diff --git a/react/public/serve.json b/vite/public/serve.json similarity index 100% rename from react/public/serve.json rename to vite/public/serve.json diff --git a/react/public/var/config.json b/vite/public/var/config.json similarity index 100% rename from react/public/var/config.json rename to vite/public/var/config.json diff --git a/react/public/var/current_pedalboard.json b/vite/public/var/current_pedalboard.json similarity index 100% rename from react/public/var/current_pedalboard.json rename to vite/public/var/current_pedalboard.json diff --git a/react/public/var/plugin_classes.json b/vite/public/var/plugin_classes.json similarity index 100% rename from react/public/var/plugin_classes.json rename to vite/public/var/plugin_classes.json diff --git a/react/public/var/uiplugins.json b/vite/public/var/uiplugins.json similarity index 100% rename from react/public/var/uiplugins.json rename to vite/public/var/uiplugins.json diff --git a/vite/public/vite.svg b/vite/public/vite.svg new file mode 100644 index 0000000..e7b8dfb --- /dev/null +++ b/vite/public/vite.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vite/src/App.css b/vite/src/App.css new file mode 100644 index 0000000..e69de29 diff --git a/vite/src/App.tsx b/vite/src/App.tsx new file mode 100644 index 0000000..eabe4ed --- /dev/null +++ b/vite/src/App.tsx @@ -0,0 +1,36 @@ +import { useState } from 'react' +import ReactLogo from './assets/react.svg?react' +//import ViteLogo from '/vite.svg?react' +import './App.css' + + +function App() { + const [count, setCount] = useState(0) + + return ( + <> + +

Vite + React

+
+ +

+ Edit src/App.tsx and save to test HMR +

+
+

+ Click on the Vite and React logos to learn more +

+ + ) +} + +export default App diff --git a/vite/src/assets/react.svg b/vite/src/assets/react.svg new file mode 100644 index 0000000..6c87de9 --- /dev/null +++ b/vite/src/assets/react.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vite/src/index.css b/vite/src/index.css new file mode 100644 index 0000000..e69de29 diff --git a/vite/src/main.tsx b/vite/src/main.tsx new file mode 100644 index 0000000..a6e4102 --- /dev/null +++ b/vite/src/main.tsx @@ -0,0 +1,14 @@ +//import { StrictMode } from 'react' +import { createRoot } from 'react-dom/client' +import './index.css' +import App from './pipedal/App.tsx' + +// createRoot(document.getElementById('root')!).render( +// +// +// , +// ) + +createRoot(document.getElementById('root')!).render( + +) diff --git a/vite/src/pipedal/AboutDialog.tsx b/vite/src/pipedal/AboutDialog.tsx new file mode 100644 index 0000000..6417ce2 --- /dev/null +++ b/vite/src/pipedal/AboutDialog.tsx @@ -0,0 +1,240 @@ + +import React, { SyntheticEvent, Component } from 'react'; +import IconButton from '@mui/material/IconButton'; +import Typography from '@mui/material/Typography'; +import { PiPedalModel, PiPedalModelFactory, State } from './PiPedalModel'; +import AppBar from '@mui/material/AppBar'; +import Toolbar from '@mui/material/Toolbar'; +import Divider from '@mui/material/Divider'; +import ArrowBackIcon from '@mui/icons-material/ArrowBack'; + +import JackHostStatus from './JackHostStatus'; +import { PiPedalError } from './PiPedalError'; +import DialogEx from './DialogEx'; + + + +import Slide, { SlideProps } from '@mui/material/Slide'; + +interface AboutDialogProps { + open: boolean; + onClose: () => void; +}; + +interface AboutDialogState { + jackStatus?: JackHostStatus; + + openSourceNotices: string; +}; + + +const Transition = React.forwardRef(function Transition( + props: SlideProps, ref: React.Ref +) { + return (); +}); + + +const AboutDialog = class extends Component { + + model: PiPedalModel; + refNotices: React.RefObject; + + + constructor(props: AboutDialogProps) { + super(props); + this.model = PiPedalModelFactory.getInstance(); + this.refNotices = React.createRef(); + this.handleDialogClose = this.handleDialogClose.bind(this); + this.state = { + jackStatus: undefined, + openSourceNotices: "" + + }; + } + + mounted: boolean = false; + subscribed: boolean = false; + + tick() { + if (this.model.state.get() === State.Ready) { + this.model.getJackStatus() + .then(jackStatus => { + this.setState({ jackStatus: jackStatus }); + }) + .catch(_error => { /* ignore*/ }); + } + } + + timerHandle?: number; + + updateNotifications() { + let subscribed = this.mounted && this.props.open; + if (subscribed !== this.subscribed) { + if (subscribed) { + this.timerHandle = setInterval(() => this.tick(), 1000); + } else { + if (this.timerHandle) { + clearInterval(this.timerHandle); + this.timerHandle = undefined; + } + } + this.subscribed = subscribed; + } + } + + startFossRequest() { + if (this.state.openSourceNotices === "") { + fetch("var/notices.txt") + .then((request) => { + if (!request.ok) { + throw new PiPedalError("notices request failed."); + } + return request.text(); + }) + .then((text) => { + if (this.mounted) { + this.setState({ openSourceNotices: text }); + } + + }) + .catch((err) => { + // ok in debug builds. File doesn't get placed until install time. + console.log("Failed to fetch open-source notices. " + err.toString()); + }); + } + } + + componentDidMount() { + super.componentDidMount?.(); + this.mounted = true; + this.updateNotifications(); + this.startFossRequest(); + } + componentWillUnmount() { + super.componentWillUnmount?.(); + this.mounted = false; + this.updateNotifications(); + } + componentDidUpdate(prevProps: Readonly, prevState: Readonly, snapshot: any): void { + super.componentDidUpdate?.(prevProps, prevState, snapshot); + this.updateNotifications(); + } + + handleDialogClose(_e: SyntheticEvent) { + this.props.onClose(); + } + + + render() { + let addressKey = 0; + let serverVersion = this.model.serverVersion?.serverVersion ?? ""; + let nPos = serverVersion.indexOf(' '); + if (nPos !== -1) { + serverVersion = serverVersion.substring(nPos + 1); + } + return ( + { this.props.onClose() }} TransitionComponent={Transition} + onEnterKey={() => { this.props.onClose() }} + style={{ userSelect: "none" }} + > + +
+
+ + + + + + + About + + + +
+
+
+
+ + PiPedal + {serverVersion + + (this.model.serverVersion?.debug ? " (Debug)" : "")} + + + +
+ + Copyright © 2022-2025 Robin Davies. + + {this.model.isAndroidHosted() && ( + + {this.model.getAndroidHostVersion()} + + )} + + {this.model.isAndroidHosted() && ( + + Copyright © 2022-2024 Robin Davies. + + )} + + + ADDRESSES + +
+ { + this.model.serverVersion?.webAddresses.map((address) => + ( + + {address} + + )) + + } +
+ + + + SERVER OS + +
+ + {this.model.serverVersion?.osVersion ?? ""} + +
+
+ + + + LEGAL NOTICES + +
+
+ +
+
+
+ + + ); + + } + +}; + + +export default AboutDialog; \ No newline at end of file diff --git a/react/src/AlsaDeviceInfo.tsx b/vite/src/pipedal/AlsaDeviceInfo.tsx similarity index 100% rename from react/src/AlsaDeviceInfo.tsx rename to vite/src/pipedal/AlsaDeviceInfo.tsx diff --git a/react/src/AlsaMidiDeviceInfo.tsx b/vite/src/pipedal/AlsaMidiDeviceInfo.tsx similarity index 100% rename from react/src/AlsaMidiDeviceInfo.tsx rename to vite/src/pipedal/AlsaMidiDeviceInfo.tsx diff --git a/react/src/AndroidHost.tsx b/vite/src/pipedal/AndroidHost.tsx similarity index 95% rename from react/src/AndroidHost.tsx rename to vite/src/pipedal/AndroidHost.tsx index b6b0f25..5fe7aa4 100644 --- a/react/src/AndroidHost.tsx +++ b/vite/src/pipedal/AndroidHost.tsx @@ -48,12 +48,12 @@ export class FakeAndroidHost implements AndroidHostInterface isDarkTheme(): boolean { return true; } - setDisconnected(isDisconnected: boolean): void { + setDisconnected(_isDisconnected: boolean): void { } showSponsorship() : void { } - launchExternalUrl(url:string): boolean + launchExternalUrl(_url:string): boolean { return false; } diff --git a/react/src/App.tsx b/vite/src/pipedal/App.tsx similarity index 93% rename from react/src/App.tsx rename to vite/src/pipedal/App.tsx index 6738e2d..cb08a14 100644 --- a/react/src/App.tsx +++ b/vite/src/pipedal/App.tsx @@ -18,7 +18,8 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import React from 'react'; -import { ThemeProvider, createTheme, StyledEngineProvider, Theme } from '@mui/material/styles'; +import { ThemeProvider, createTheme, StyledEngineProvider } from '@mui/material/styles'; +import { CssBaseline } from '@mui/material'; import VirtualKeyboardHandler from './VirtualKeyboardHandler'; import AppThemed from "./AppThemed"; @@ -44,10 +45,10 @@ declare module '@mui/material/Button' { } -declare module '@mui/styles/defaultTheme' { - // eslint-disable-next-line @typescript-eslint/no-empty-interface - interface DefaultTheme extends Theme { } -} +// declare module '@mui/styles/defaultTheme' { +// // eslint-disable-next-line @typescript-eslint/no-empty-interface +// interface DefaultTheme extends Theme { } +// } @@ -55,6 +56,7 @@ declare module '@mui/styles/defaultTheme' { const theme = createTheme( isDarkMode() ? { + cssVariables: true, components: { MuiButton: { styleOverrides: { @@ -101,6 +103,7 @@ const theme = createTheme( } : { + cssVariables: true, components: { /* make the selection state for MuiListItemButtons a smidgen darker (light theme only) */ MuiListItemButton: { @@ -187,6 +190,8 @@ const App = (class extends React.Component { return ( + + diff --git a/react/src/AppThemed.css b/vite/src/pipedal/AppThemed.css similarity index 99% rename from react/src/AppThemed.css rename to vite/src/pipedal/AppThemed.css index e007307..4ea4273 100644 --- a/react/src/AppThemed.css +++ b/vite/src/pipedal/AppThemed.css @@ -16,3 +16,4 @@ div { min-width: 0; } + diff --git a/vite/src/pipedal/AppThemed.tsx b/vite/src/pipedal/AppThemed.tsx new file mode 100644 index 0000000..8461fa9 --- /dev/null +++ b/vite/src/pipedal/AppThemed.tsx @@ -0,0 +1,1158 @@ +// Copyright (c) 2022 Robin Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +import './AppThemed.css'; +//import {alpha} from '@mui/material/styles'; +import AppBar from '@mui/material/AppBar'; + +import Modal from '@mui/material/Modal'; +import Toolbar from '@mui/material/Toolbar'; +import Typography from '@mui/material/Typography'; +import { withStyles } from "tss-react/mui"; +import WithStyles from './WithStyles'; +import { css } from '@emotion/react'; + +import IconButton from '@mui/material/IconButton'; +import VolunteerActivismIcon from '@mui/icons-material/VolunteerActivism'; +import MenuButton from '@mui/icons-material/Menu'; +import { TemporaryDrawer } from './TemporaryDrawer'; +import FullscreenIcon from '@mui/icons-material/Fullscreen'; +import FullscreenExitIcon from '@mui/icons-material/FullscreenExit'; +import List from '@mui/material/List'; +import Divider from '@mui/material/Divider'; +// import ListItem from '@mui/material/ListItem'; +import ListItemButton from '@mui/material/ListItemButton'; + +import ListItemIcon from '@mui/material/ListItemIcon'; +import ListItemText from '@mui/material/ListItemText'; +import CircularProgress from '@mui/material/CircularProgress'; +import { type OnChangedHandler } from './ObservableProperty'; +import ErrorOutlineIcon from '@mui/icons-material/Error'; +import ResizeResponsiveComponent from './ResizeResponsiveComponent'; +import Button from '@mui/material/Button'; +import PresetSelector from './PresetSelector'; +import SettingsDialog from './SettingsDialog'; +import AboutDialog from './AboutDialog'; +import BankDialog from './BankDialog'; + +import { PiPedalModelFactory, PiPedalModel, State, ZoomedControlInfo, wantsReloadingScreen } from './PiPedalModel'; +import ZoomedUiControl from './ZoomedUiControl' +import MainPage from './MainPage'; +import DialogContent from '@mui/material/DialogContent'; +import DialogContentText from '@mui/material/DialogContentText'; +import DialogActions from '@mui/material/DialogActions'; +import ListSubheader from '@mui/material/ListSubheader'; +import { BankIndex, BankIndexEntry } from './Banks'; +import RenameDialog from './RenameDialog'; +import JackStatusView from './JackStatusView'; +import { type Theme } from '@mui/material/styles'; +import { isDarkMode } from './DarkMode'; +import UpdateDialog from './UpdateDialog'; + +import RenameOutlineIcon from './svg/drive_file_rename_outline_black_24dp.svg?react'; +import SaveBankAsIcon from './svg/ic_save_bank_as.svg?react'; +import EditBanksIcon from './svg/ic_edit_banks.svg?react'; +import SettingsIcon from './svg/ic_settings.svg?react'; +import HelpOutlineIcon from './svg/ic_help_outline.svg?react'; +import FxAmplifierIcon from './svg/fx_amplifier.svg?react'; +import { PerformanceView } from './PerformanceView'; + +import DialogEx from './DialogEx'; + +import { IDialogStackable, popDialogStack, pushDialogStack } from './DialogStack'; + + + +interface AppProps extends WithStyles { +}; + +const appStyles = ((theme: Theme) => ( + { + root: css({ // :root + colorScheme: (isDarkMode() ? "dark" : "light") + }), + menuListItem: css({ + color: "#FE8!important", //theme.palette.text.primary, + fill: "#FE8!important", //theme.palette.text.primary, + }), + menuIcon: css({ + fill: (theme.palette.text.primary + "!important"), //theme.palette.text.primary, + opacity: 0.6 + }), + toolBar: css({ + color: "white" + }), + listSubheader: css({ + backgroundImage: "linear-gradient(255,255,255,0.15),rgba(255,255,255,0.15)" + }), + loadingContent: css({ + display: "block", + position: "absolute", + minHeight: "10em", + left: "0px", + top: "0px", + width: "100%", + height: "100%", + opacity: "0.95", + justifyContent: "center", + textAlign: "center", + zIndex: 2010 + }), + errorContent: css({ + + display: "flex", + flexDirection: "column", + justifyContent: "center", + flexWrap: "nowrap", + alignItems: "center", + position: "fixed", + minHeight: "10em", + left: "0px", + top: "0px", + width: "100%", + height: "100%", + color: isDarkMode() ? "#CCC" : "#444", + zIndex: 2000 + }), + errorContentMask: css({ + position: "absolute", left: 0, top: 0, + width: "100%", height: "100%", + background: isDarkMode() ? "#121212" : "#BBB", + opacity: 0.95, + zIndex: 1999 + }), + errorText: css({ + marginTop: 0, + padding: 0, + marginBottom: 12, + fontWeight: 500, + fontSize: "13pt", + maxWidth: 250, + opacity: 1, + zIndex: 2010, + }), + progressText: css({ + marginTop: 0, + fontWeight: 500, + fontSize: "13pt", + opacity: 1, + zIndex: 2010, + paddingTop: 12, + gravity: "center", + textAlign: "center" + }), + + errorMessageBox: css({ + flex: "0 0 auto", + width: 300, + marginLeft: "auto", + marginRight: "auto", + zIndex: 2010 + + + }), + errorMessage: css({ + color: theme.palette.text.secondary, + textAlign: "start", + zIndex: 2010 + + }), + loadingBox: css({ + display: "flex", + flexFlow: "column nowrap", + position: "absolute", + top: "20%", + left: 0, right: 0, + color: isDarkMode() ? theme.palette.text.secondary : "#888", + // border: "3px solid #888", + alignItems: "center", + textAlign: "center", + opacity: 0.8, + + }), + loadingBoxItem: css({ + display: "flex", flexFlow: "row nowrap", + alignItems: "center", + textAlign: "center", + + }), + + + toolBarContent: + css({ + position: "absolute", top: 0, width: "100%" + }), + + toolBarSpacer: + css({ + position: "relative", flex: "0 0 auto", + }), + + + mainFrame: css({ + overflow: "hidden", + display: "flex", + flexFlow: "column", + flex: "1 1 100%" + }), + + toolbarSizingPosition: css({ + flexGrow: 0, + flexShrink: 1, + width: "100%", + flexBasis: "auto" + }), + mainSizingPosition: css({ + overflow: "hidden", + flex: "1 1 auto" + }), + + heroContent: css({ + backgroundColor: theme.mainBackground, + position: "relative", + height: "100%", + width: "100%" + }), + + drawerItem: css({ + width: 350, + }), + drawerItemFullWidth: css({ + width: 'auto', + }), + + } +)); + + + + +function supportsFullScreen(): boolean { + let doc: any = window.document; + let docEl: any = doc.documentElement; + var requestFullScreen = docEl.requestFullscreen || docEl.mozRequestFullScreen || docEl.webkitRequestFullscreen || docEl.msRequestFullScreen; + return (!!requestFullScreen); + +} + +function setFullScreen(value: boolean) { + let doc: any = window.document; + let docEl: any = doc.documentElement; + + if (docEl.requestFullscren) // the latest offical api. + { + if (value) { + window.document.documentElement.requestFullscreen({ navigationUI: "show" }); + } else { + window.document.exitFullscreen(); + } + } + + var requestFullScreen = docEl.requestFullscreen || docEl.mozRequestFullScreen || docEl.webkitRequestFullscreen || docEl.msRequestFullScreen; + var cancelFullScreen = docEl.exitFullscreen || doc.mozCancelFullScreen || doc.webkitExitFullscreen || doc.msExitFullscreen; + + if (value) { + requestFullScreen.call(docEl); + } + else { + cancelFullScreen.call(doc); + } +} + + +// function preventDefault(e: SyntheticEvent): void { +// e.stopPropagation(); +// e.preventDefault(); +// } + +type AppState = { + zoomedControlInfo: ZoomedControlInfo | undefined; + + isDrawerOpen: boolean; + errorMessage: string; + displayState: State; + + performanceView: boolean; + + canFullScreen: boolean; + isFullScreen: boolean; + tinyToolBar: boolean; + alertDialogOpen: boolean; + alertDialogMessage: string; + updateDialogOpen: boolean; + isSettingsDialogOpen: boolean; + onboarding: boolean; + isDebug: boolean; + + renameBankDialogOpen: boolean; + saveBankAsDialogOpen: boolean; + + aboutDialogOpen: boolean; + bankDialogOpen: boolean; + editBankDialogOpen: boolean; + zoomedControlOpen: boolean; + + + presetName: string; + presetChanged: boolean; + banks: BankIndex; + bankDisplayItems: number; + showStatusMonitor: boolean; +}; +class MenuStackHandler implements IDialogStackable { + constructor(app: AppThemedBase) { + this.app = app; + } + getTag() { + return "Menu"; + } + isOpen(): boolean { + return this.app.state.isDrawerOpen; + } + onDialogStackClose() { + this.app.menuStackHandler = null; + this.app.hideDrawer(); + } + private app: AppThemedBase; +}; + + + +export + class AppThemedBase extends ResizeResponsiveComponent { + // Before the component mounts, we initialise our state + + model_: PiPedalModel; + errorChangeHandler_: OnChangedHandler; + stateChangeHandler_: OnChangedHandler; + + constructor(props: AppProps) { + super(props); + this.model_ = PiPedalModelFactory.getInstance(); + + + this.state = { + performanceView: false, + zoomedControlInfo: this.model_.zoomedUiControl.get(), + isDrawerOpen: false, + errorMessage: this.model_.errorMessage.get(), + displayState: this.model_.state.get(), + canFullScreen: supportsFullScreen() && !this.model_.isAndroidHosted(), + isFullScreen: !!document.fullscreenElement, + tinyToolBar: false, + alertDialogOpen: false, + alertDialogMessage: "", + presetName: this.model_.presets.get().getSelectedText(), + isSettingsDialogOpen: false, + updateDialogOpen: false, + onboarding: false, + isDebug: true, + presetChanged: this.model_.presets.get().presetChanged, + banks: this.model_.banks.get(), + renameBankDialogOpen: false, + saveBankAsDialogOpen: false, + aboutDialogOpen: false, + bankDialogOpen: false, + editBankDialogOpen: false, + zoomedControlOpen: false, + bankDisplayItems: 5, + showStatusMonitor: this.model_.showStatusMonitor.get() + + }; + + this.promptForUpdateHandler = this.promptForUpdateHandler.bind(this); + this.errorChangeHandler_ = this.setErrorMessage.bind(this); + this.beforeUnloadListener = this.beforeUnloadListener.bind(this); + this.unloadListener = this.unloadListener.bind(this); + this.stateChangeHandler_ = this.setDisplayState.bind(this); + this.presetChangedHandler = this.presetChangedHandler.bind(this); + this.alertMessageChangedHandler = this.alertMessageChangedHandler.bind(this); + this.handleCloseAlert = this.handleCloseAlert.bind(this); + this.banksChangedHandler = this.banksChangedHandler.bind(this); + this.showStatusMonitorHandler = this.showStatusMonitorHandler.bind(this); + this.handleZoomedUiControlChanged = this.handleZoomedUiControlChanged.bind(this); + } + + showDrawer() { + if (!this.state.isDrawerOpen) { + this.setState({ isDrawerOpen: true }) + this.pushOpenMenuState(); + } + } + hideDrawer(loadingDialog: boolean = false) { + window.setTimeout(() => { + this.popOpenMenuState(); + this.setState({ isDrawerOpen: false }) + }); + } + + + menuStackHandler: MenuStackHandler | null = null; + + popOpenMenuState() { + if (this.menuStackHandler) { + let t = this.menuStackHandler; + this.menuStackHandler = null; + popDialogStack(t); + } + + } + pushOpenMenuState() { + this.menuStackHandler = new MenuStackHandler(this); + pushDialogStack(this.menuStackHandler); + } + + handleSpecificBank(bankId: number) { + + this.model_.openBank(bankId) + .catch((error) => this.model_.showAlert(error.toString())); + + } + + handleSaveBankAsOk(newName: string) { + let currentName = this.model_.banks.get().getSelectedEntryName(); + if (currentName === newName) { + this.setState({ + renameBankDialogOpen: false, + saveBankAsDialogOpen: false + }); + return; + + } + + if (this.model_.banks.get().nameExists(newName)) { + this.model_.showAlert("A bank by that name already exists."); + return; + } + this.setState({ + renameBankDialogOpen: false, + saveBankAsDialogOpen: false + }); + this.model_.saveBankAs(this.model_.banks.get().selectedBank, newName) + .catch((error) => { + this.model_.showAlert(error.toString()); + }); + + } + handleBankRenameOk(newName: string) { + let currentName = this.model_.banks.get().getSelectedEntryName(); + if (currentName === newName) { + this.setState({ + renameBankDialogOpen: false, + saveBankAsDialogOpen: false + }); + return; + + } + + if (this.model_.banks.get().nameExists(newName)) { + this.model_.showAlert("A bank by that name already exists."); + return; + } + this.setState({ + renameBankDialogOpen: false + }); + this.model_.renameBank(this.model_.banks.get().selectedBank, newName) + .catch((error) => { + this.model_.showAlert(error.toString()); + }); + + } + handleSettingsDialogClose() { + this.setState({ + isSettingsDialogOpen: false, + onboarding: false + }); + } + handleDrawerSettingsClick() { + this.setState({ + isDrawerOpen: false, + isSettingsDialogOpen: true, + onboarding: false + }); + + } + + handleDisplayOnboarding() { + this.setState({ + isDrawerOpen: false, + isSettingsDialogOpen: true, + onboarding: true + }); + + } + + handleDrawerManageBanks() { + this.setState({ + isDrawerOpen: false, + bankDialogOpen: true, + editBankDialogOpen: true + }); + + } + handleDrawerSelectBank() { + + this.setState({ + bankDialogOpen: true, + editBankDialogOpen: false + }); + + } + handleDrawerDonationClick() { + this.hideDrawer(false); + if (this.model_.isAndroidHosted()) { + this.model_.showAndroidDonationActivity(); + } else { + if (window) { + window.open("https://github.com/sponsors/rerdavies", '_blank'); + } + } + + } + + handleDrawerAboutClick() { + this.setState({ + aboutDialogOpen: true + }); + + } + handleDrawerRenameBank() { + this.setState({ + renameBankDialogOpen: true, + saveBankAsDialogOpen: false + }); + + } + handleDrawerSaveBankAs() { + this.setState({ + renameBankDialogOpen: false, + saveBankAsDialogOpen: true + }); + } + + + handleCloseAlert(e?: any, reason?: any) { + this.model_.alertMessage.set(""); + } + showStatusMonitorHandler() { + this.setState({ + showStatusMonitor: this.model_.showStatusMonitor.get() + }); + } + banksChangedHandler() { + this.setState({ + banks: this.model_.banks.get() + }); + } + presetChangedHandler() { + let presets = this.model_.presets.get(); + + this.setState({ + presetName: presets.getSelectedText(), + presetChanged: presets.presetChanged + }); + } + toggleFullScreen(): void { + setFullScreen(!this.state.isFullScreen); + this.setState({ isFullScreen: !this.state.isFullScreen }); + } + + private unloadListener(e: Event) { + this.model_.close(); + return undefined; + } + + private beforeUnloadListener(e: Event) { + this.model_.close(); + return undefined; + } + promptForUpdateHandler(newValue: boolean) { + if (this.model_.enableAutoUpdate) { + if (this.state.updateDialogOpen !== newValue) { + this.setState({ updateDialogOpen: newValue }); + } + } + } + componentDidMount() { + + super.componentDidMount(); + window.addEventListener("beforeunload", this.beforeUnloadListener); + window.addEventListener("unload", this.unloadListener); + + this.model_.errorMessage.addOnChangedHandler(this.errorChangeHandler_); + this.model_.state.addOnChangedHandler(this.stateChangeHandler_); + this.model_.pedalboard.addOnChangedHandler(this.presetChangedHandler); + this.model_.alertMessage.addOnChangedHandler(this.alertMessageChangedHandler); + this.model_.banks.addOnChangedHandler(this.banksChangedHandler); + this.model_.showStatusMonitor.addOnChangedHandler(this.showStatusMonitorHandler); + this.model_.promptForUpdate.addOnChangedHandler(this.promptForUpdateHandler); + this.alertMessageChangedHandler(); + + this.model_.zoomedUiControl.addOnChangedHandler( + this.handleZoomedUiControlChanged + ); + } + handleZoomedUiControlChanged() { + this.setState({ + zoomedControlOpen: this.model_.zoomedUiControl.get() !== undefined, + zoomedControlInfo: this.model_.zoomedUiControl.get() + }); + + } + + updateOverscroll(): void { + if (this.model_.serverVersion) { + // no pull-down refresh on android devices once we're ready (unless we're debug) + let preventOverscroll = + this.model_.state.get() === State.Ready + && !this.model_.debug; + + let overscrollBehavior = preventOverscroll ? "none" : "auto"; + document.body.style.overscrollBehavior = overscrollBehavior; + } + } + + componentDidUpdate() { + } + + componentWillUnmount() { + super.componentWillUnmount(); + + this.model_.zoomedUiControl.removeOnChangedHandler( + this.handleZoomedUiControlChanged + ); + + window.removeEventListener("beforeunload", this.beforeUnloadListener); + + this.model_.promptForUpdate.removeOnChangedHandler(this.promptForUpdateHandler); + this.model_.errorMessage.removeOnChangedHandler(this.errorChangeHandler_); + this.model_.state.removeOnChangedHandler(this.stateChangeHandler_); + this.model_.pedalboard.removeOnChangedHandler(this.presetChangedHandler); + this.model_.banks.removeOnChangedHandler(this.banksChangedHandler); + this.model_.banks.removeOnChangedHandler(this.showStatusMonitorHandler); + + this.model_.close(); + + } + + alertMessageChangedHandler() { + let message = this.model_.alertMessage.get(); + if (message === "") { + this.setState({ alertDialogOpen: false }); + // leave the message intact so the dialog can fade. + } else { + this.setState({ + alertDialogOpen: true, + alertDialogMessage: message + }); + } + + } + updateResponsive() { + // functional, but disabled. + // let tinyToolBar_ = this.windowSize.height < 600; + // this.setState({ tinyToolBar: tinyToolBar_ }); + + let height = this.windowSize.height; + + const ENTRY_HEIGHT = 48; + // ENTRY_HEIGHT*6 +K = 727 from observation. + const K = 450; + + let bankEntries = Math.floor((height - K) / ENTRY_HEIGHT); + if (bankEntries < 1) bankEntries = 1; + if (bankEntries > 7) bankEntries = 7; + if (bankEntries === 2) bankEntries = 1; + + this.setState({ bankDisplayItems: bankEntries }); + + } + onWindowSizeChanged(width: number, height: number): void { + super.onWindowSizeChanged(width, height); + this.updateResponsive(); + } + + + setErrorMessage(message: string): void { + this.setState({ errorMessage: message }); + } + + + setDisplayState(newState: State): void { + this.updateOverscroll(); + + this.setState({ + displayState: newState, + canFullScreen: supportsFullScreen() && !this.model_.isAndroidHosted() + }); + if (newState === State.Ready) { + if (this.model_.isOnboarding()) { + this.handleDisplayOnboarding(); + } + } + } + + shortBankList(banks: BankIndex): BankIndexEntry[] { + let nDisplayEntries = this.state.bankDisplayItems; + let entries = banks.entries; + let nListEntries = entries.length; + + let result: BankIndexEntry[] = []; + + if (nListEntries <= nDisplayEntries) { + for (let i = 0; i < nListEntries; ++i) { + result.push(entries[i]); + } + } else { + // a subset of the list CENTERED on the currently selected entry. + let selectedIndex = 0; + for (let i = 0; i < nListEntries; ++i) { + if (entries[i].instanceId === banks.selectedBank) { + selectedIndex = i; + break; + } + } + + let minN = selectedIndex - Math.floor(nDisplayEntries / 2); + if (minN < 0) minN = 0; + let maxN = minN + nDisplayEntries; + if (maxN > entries.length) { + maxN = entries.length; + } + for (let i = minN; i < maxN; ++i) { + result.push(entries[i]); + } + } + return result; + } + handleReload() { + if (this.model_.isAndroidHosted()) { + this.model_.chooseNewDevice(); + } else { + window.location.reload(); + } + } + getReloadingMessage(): string { + switch (this.state.displayState) { + case State.ApplyingChanges: + return "Applying\u00A0changes..."; + case State.ReloadingPlugins: + return "Reloading\u00A0plugins..."; + case State.DownloadingUpdate: + return "Downloading update..."; + case State.InstallingUpdate: + return "Installing update...."; + case State.HotspotChanging: + return "Network connection changing..." + default: + return "Reconnecting..."; + } + } + render() { + + const classes = withStyles.getClasses(this.props); + + let shortBankList = this.shortBankList(this.state.banks); + let showBankSelectDialog = shortBankList.length !== this.state.banks.entries.length; + + + return ( +
{ + if (!this.model_.debug) { + e.preventDefault(); e.stopPropagation(); + } + }} + > + {this.state.performanceView ? ( + { this.setState({ performanceView: false }); }} + /> + ) : ( +
+ + + {(!this.state.tinyToolBar) && !this.state.performanceView ? + ( + + + { this.showDrawer() }} + size="large"> + + +
+ +
+
+ {this.state.canFullScreen && + { this.toggleFullScreen(); }} + color="inherit" + size="large"> + {this.state.isFullScreen ? ( + + ) : ( + + + )} + + + } + + + ) : ( +
+ { this.showDrawer() }} + color="inherit" + size="large"> + + + {this.state.canFullScreen && ( + { this.toggleFullScreen(); }} + size="large"> + {this.state.isFullScreen ? ( + + ) : ( + + + )} + + + )} +
+ )} + { this.hideDrawer(false); }} > + + + { + ev.stopPropagation(); + this.hideDrawer(true); + this.setState({ performanceView: true }); + }}> + + + + + + + + + Banks + + + { + shortBankList.map((bank) => { + return ( + { + ev.stopPropagation(); + this.hideDrawer(false); + this.handleSpecificBank(bank.instanceId); + }} + > + + + + + ); + }) + } + { + showBankSelectDialog && ( + { + ev.stopPropagation(); + this.hideDrawer(true); + this.handleDrawerSelectBank(); + }} + > + + + + + + ) + } + + + + { + ev.stopPropagation(); + this.hideDrawer(true); + this.handleDrawerRenameBank() + }}> + + + + + + { + ev.stopPropagation(); + this.hideDrawer(true); + this.handleDrawerSaveBankAs(); + }} > + + + + + + { + ev.stopPropagation(); + this.hideDrawer(true); + this.handleDrawerManageBanks(); + }}> + + + + + + + + + { + ev.stopPropagation(); + this.hideDrawer(true); + this.handleDrawerSettingsClick() + }}> + + + + + + { + ev.stopPropagation(); + this.hideDrawer(true); + this.handleDrawerAboutClick(); + }}> + + + + + + { + ev.stopPropagation(); + this.handleDrawerDonationClick(); + }}> + + + + + + + + + {!this.state.tinyToolBar && ( + + )} +
+
+
+ {(this.state.displayState !== State.Loading) && + ( + + ) + } +
+ +
+
+ this.setState({ bankDialogOpen: false })} /> + {(this.state.aboutDialogOpen) && + ( + this.setState({ aboutDialogOpen: false })} /> + )} + this.handleSettingsDialogClose()} /> + { + this.setState({ + renameBankDialogOpen: false, + saveBankAsDialogOpen: false + }) + }} + onOk={(text: string) => { + if (this.state.renameBankDialogOpen) { + this.handleBankRenameOk(text); + } else if (this.state.saveBankAsDialogOpen) { + this.handleSaveBankAsOk(text); + } + } + } + /> + + { this.setState({ zoomedControlOpen: false }); }} + onDialogClosed={() => { this.model_.zoomedUiControl.set(undefined); } + } + /> + + {this.state.showStatusMonitor && ()} +
+ ) + } + + + + + + + + { + this.state.alertDialogMessage + } + + + + + + + + + + +
+
+
 
+
+
+ +
+
+

+ Error: {this.state.errorMessage} +

+
+
+ + +
+
+
 
+
+ + + {/* Reloading mask */} + < Modal + open={wantsReloadingScreen(this.state.displayState) || this.state.displayState === State.Loading} + aria-label="loading" + aria-describedby="reloading-modal-description" + > +
+
+
+
+ +
+ + { + this.state.displayState === State.Loading ? + "Loading..." + : this.getReloadingMessage() + } + +
+
+ +
+ + ); + } + }; + + +const AppThemed = withStyles(AppThemedBase, appStyles); +export default AppThemed; diff --git a/react/src/BankDialog.tsx b/vite/src/pipedal/BankDialog.tsx similarity index 96% rename from react/src/BankDialog.tsx rename to vite/src/pipedal/BankDialog.tsx index e22fd4c..ea12606 100644 --- a/react/src/BankDialog.tsx +++ b/vite/src/pipedal/BankDialog.tsx @@ -27,8 +27,13 @@ import ButtonBase from "@mui/material/ButtonBase"; import Slide, { SlideProps } from '@mui/material/Slide'; import AppBar from '@mui/material/AppBar'; import Toolbar from '@mui/material/Toolbar'; -import { Theme, createStyles } from '@mui/material/styles'; -import { WithStyles, withStyles } from "@mui/styles"; +import {createStyles} from './WithStyles'; + + +import { Theme } from '@mui/material/styles'; +import { withStyles } from "tss-react/mui"; +import WithStyles from './WithStyles'; + import DraggableGrid, { ScrollDirection } from './DraggableGrid'; import Fade from '@mui/material/Fade'; @@ -46,9 +51,11 @@ import MenuItem from '@mui/material/MenuItem'; import DialogEx from './DialogEx'; import DialogContent from '@mui/material/DialogContent'; import DialogActions from '@mui/material/DialogActions'; -import { ReactComponent as DownloadIcon } from './svg/file_download_black_24dp.svg'; -import { ReactComponent as UploadIcon } from './svg/file_upload_black_24dp.svg'; -import { ReactComponent as BankIcon } from './svg/ic_bank.svg'; +import DownloadIcon from './svg/file_download_black_24dp.svg?react'; +import UploadIcon from './svg/file_upload_black_24dp.svg?react'; +import BankIcon from './svg/ic_bank.svg?react'; +import { css } from '@emotion/react'; + //import PublishIcon from '@mui/icons-material/Publish'; // import FileDownloadIcon from '@mui/icons-material/FileDownload'; // import AppsIcon from '@mui/icons-material/Apps'; @@ -76,24 +83,24 @@ interface BankDialogState { const styles = (theme: Theme) => createStyles({ - listIcon: { + listIcon: css({ width: 24, height: 24, opacity: 0.6, fill: theme.palette.text.primary - }, - dialogAppBar: { + }), + dialogAppBar: css({ position: 'relative', top: 0, left: 0 - }, - dialogActionBar: { + }), + dialogActionBar: css({ position: 'relative', top: 0, left: 0, background: "black" - }, - dialogTitle: { + }), + dialogTitle: css({ marginLeft: theme.spacing(2), flex: 1, - }, - itemFrame: { + }), + itemFrame: css({ display: "flex", flexDirection: "row", flexWrap: "nowrap", @@ -103,18 +110,18 @@ const styles = (theme: Theme) => createStyles({ textAlign: "left", justifyContent: "center", paddingLeft: 8 - }, - iconFrame: { + }), + iconFrame: css({ flex: "0 0 auto", - }, - itemIcon: { + }), + itemIcon: css({ width: 24, height: 24, margin: 12, opacity: 0.6 - }, - itemLabel: { + }), + itemLabel: css({ flex: "1 1 1px", marginLeft: 8 - } + }) }); @@ -126,13 +133,12 @@ const Transition = React.forwardRef(function Transition( }); -const BankDialog = withStyles(styles, { withTheme: true })( - +const BankDialog = withStyles( class extends Component { model: PiPedalModel; - refUpload: React.RefObject; + refUpload: React.RefObject; constructor(props: BankDialogProps) { super(props); @@ -294,7 +300,7 @@ const BankDialog = withStyles(styles, { withTheme: true })( mapElement(el: any): React.ReactNode { let bankEntry = el as BankIndexEntry; - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let selectedItem = this.isEditMode() ? this.state.selectedItem : this.state.banks.selectedBank; return (
@@ -304,8 +310,8 @@ const BankDialog = withStyles(styles, { withTheme: true })( >
-
- +
+
@@ -401,7 +407,7 @@ const BankDialog = withStyles(styles, { withTheme: true })( render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let actionBarClass = this.props.isEditDialog ? classes.dialogAppBar : classes.dialogActionBar; let defaultSelectedIndex = this.getSelectedIndex(); @@ -568,8 +574,8 @@ const BankDialog = withStyles(styles, { withTheme: true })( } - } - + }, + styles ); export default BankDialog; \ No newline at end of file diff --git a/react/src/Banks.tsx b/vite/src/pipedal/Banks.tsx similarity index 100% rename from react/src/Banks.tsx rename to vite/src/pipedal/Banks.tsx diff --git a/vite/src/pipedal/ChannelBindingsHelpDialog.tsx b/vite/src/pipedal/ChannelBindingsHelpDialog.tsx new file mode 100644 index 0000000..0829af4 --- /dev/null +++ b/vite/src/pipedal/ChannelBindingsHelpDialog.tsx @@ -0,0 +1,131 @@ +// Copyright (c) 2022 Robin Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import React from 'react'; +import Button from '@mui/material/Button'; +import DialogEx from './DialogEx'; +import DialogActions from '@mui/material/DialogActions'; +import DialogContent from '@mui/material/DialogContent'; +import Typography from '@mui/material/Typography'; +import ResizeResponsiveComponent from './ResizeResponsiveComponent'; +import Divider from '@mui/material/Divider'; +//import TextFieldEx from './TextFieldEx'; + + +export interface ChannelBindingHelpDialogProps { + open: boolean, + onClose: () => void, +}; + +export interface ChannelBindingHelpDialogState { + fullScreen: boolean; +}; + +export default class ChannelBindingHelpDialog extends ResizeResponsiveComponent { + + refText: React.RefObject; + + constructor(props: ChannelBindingHelpDialogProps) { + super(props); + this.state = { + fullScreen: false + }; + this.refText = React.createRef(); + } + mounted: boolean = false; + + + + onWindowSizeChanged(width: number, height: number): void { + this.setState({ fullScreen: height < 200 }) + } + + + componentDidMount() { + super.componentDidMount(); + this.mounted = true; + } + componentWillUnmount() { + super.componentWillUnmount(); + this.mounted = false; + } + + componentDidUpdate() { + } + render() { + let props = this.props; + let { open, onClose } = props; + + const handleClose = () => { + onClose(); + }; + + return ( + { }} + > + + + MIDI Control Binding Priority + +
+

MIDI Channel Filters determine which MIDI messages get sent to a plugin that accepts MIDI messages. Note that the + MIDI Channel Filters do NOT affect system MIDI bindings or control bindings. +

+

+ MIDI message processing occurs in the following order +

+
    +
  • If the message is a Program Change message, the message is first offered to any MIDI plugins in the currently loaded preset (Message Filters permitting). + The message is sent to each MIDI plugin in the current preset that wants it. If any MIDI plugin accepts the program change, + no futher processing occurs. Specifically, the program change will not change the currently selected PiPedal preset. +
    +
    • +
  • + If the message is a Program Change message, and no MIDI plugin has accepted the message, PiPedal selects the PiPedal preset that corresponds + to the requested program. +
    +
    • +
  • + The message is then checked to see if it has been bound to a Pipedal feature using the System Midi Bindings settings. If it has, + Pipedal processes the message, and it is not forwarded to MIDI plugins. +
    +
    • +
  • + Otherwise, the message is sent to each MIDI plugin in the currently loaded Pipedal preset (channel filters permitting).) +
    +
    • +
+
+ + + + + + + + ); + } +} \ No newline at end of file diff --git a/react/src/ColorDropdownButton.tsx b/vite/src/pipedal/ColorDropdownButton.tsx similarity index 98% rename from react/src/ColorDropdownButton.tsx rename to vite/src/pipedal/ColorDropdownButton.tsx index 3d9dace..64af2dc 100644 --- a/react/src/ColorDropdownButton.tsx +++ b/vite/src/pipedal/ColorDropdownButton.tsx @@ -3,7 +3,7 @@ import ButtonBase from '@mui/material/ButtonBase'; import Menu from '@mui/material/Menu'; import MenuItem from '@mui/material/MenuItem'; import { colorKeys, getBackgroundColor } from './MaterialColors'; -import { useTheme } from '@mui/styles'; +import { useTheme } from '@mui/material/styles'; const colors: string[] = colorKeys; diff --git a/vite/src/pipedal/ControlTooltip.tsx b/vite/src/pipedal/ControlTooltip.tsx new file mode 100644 index 0000000..344c096 --- /dev/null +++ b/vite/src/pipedal/ControlTooltip.tsx @@ -0,0 +1,41 @@ + +import React, { ReactElement } from 'react'; +import Tooltip from "@mui/material/Tooltip" +import { UiControl } from './Lv2Plugin'; +import Typography from "@mui/material/Typography"; +import Divider from '@mui/material/Divider'; + + +interface ControlTooltipProps { + children: ReactElement, + uiControl: UiControl +} + + +export default function ControlTooltip(props: ControlTooltipProps) { + let { children, uiControl } = props; + if (uiControl.comment && (uiControl.comment !== uiControl.name)) { + return ( + + {uiControl.name} + + {uiControl.comment} + + + )} + placement="top-start" arrow enterDelay={1500} enterNextDelay={1500} + > + {children} + + ); + } else { + return ( + + {children} + + ); + } +} diff --git a/react/src/ControlViewFactory.tsx b/vite/src/pipedal/ControlViewFactory.tsx similarity index 100% rename from react/src/ControlViewFactory.tsx rename to vite/src/pipedal/ControlViewFactory.tsx diff --git a/react/src/DarkMode.tsx b/vite/src/pipedal/DarkMode.tsx similarity index 100% rename from react/src/DarkMode.tsx rename to vite/src/pipedal/DarkMode.tsx diff --git a/vite/src/pipedal/DialogEx.tsx b/vite/src/pipedal/DialogEx.tsx new file mode 100644 index 0000000..39de5ae --- /dev/null +++ b/vite/src/pipedal/DialogEx.tsx @@ -0,0 +1,116 @@ +// Copyright (c) 2022 Robin Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import React from 'react'; +import { IDialogStackable, pushDialogStack, popDialogStack } from './DialogStack'; +import Dialog, { DialogProps } from '@mui/material/Dialog'; + + +interface DialogExState { +} + + +interface DialogExProps extends DialogProps { + tag: string; + fullwidth?: boolean; + onEnterKey: () => void; +} + +class DialogEx extends React.Component implements IDialogStackable { + constructor(props: DialogExProps) { + super(props); + this.state = { + + }; + } + + mounted: boolean = false; + + hasHooks: boolean = false; + stateWasPopped: boolean = false; + + getTag() { + return this.props.tag; + } + isOpen(): boolean { + return this.props.open; + } + onDialogStackClose() { + this.props.onClose?.({}, "backdropClick"); + } + updateHooks(): void { + let wantHooks = this.mounted && this.props.open; + if (wantHooks !== this.hasHooks) { + this.hasHooks = wantHooks; + + if (this.hasHooks) { + this.stateWasPopped = false; + pushDialogStack(this); + } else { + popDialogStack(this); + } + } + } + + componentDidMount() { + super.componentDidMount?.(); + + this.mounted = true; + this.updateHooks(); + } + componentWillUnmount() { + super.componentWillUnmount?.(); + this.mounted = false; + this.updateHooks(); + } + + componentDidUpdate() { + this.updateHooks(); + } + myOnClose(event: {}, reason: "backdropClick" | "escapeKeyDown") { + if (this.props.onClose) this.props.onClose(event, reason); + } + + handleEnterKey() { + if (this.props.onEnterKey) { + this.props.onEnterKey(); + } + } + onKeyDown(evt: React.KeyboardEvent) { + if (evt.key === 'Enter') { + this.handleEnterKey(); + } + evt.stopPropagation(); + } + render() { + let { tag, onClose, fullWidth, onEnterKey, ...extra } = this.props; + return ( + { this.myOnClose(event, reason); }} + onKeyDown={(evt) => { this.onKeyDown(evt); }} + > + {this.props.children} + + ); + } + +}; + +export default DialogEx; \ No newline at end of file diff --git a/vite/src/pipedal/DialogStack.tsx b/vite/src/pipedal/DialogStack.tsx new file mode 100644 index 0000000..af875ff --- /dev/null +++ b/vite/src/pipedal/DialogStack.tsx @@ -0,0 +1,203 @@ +/* + * Copyright (c) 2025 Robin E. R. Davies + * All rights reserved. + + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + + +export interface IDialogStackable { + getTag: () => string; + isOpen: () => boolean; + onDialogStackClose(): void; +} + +interface DialogStackEntry { + dialog: IDialogStackable | null; + historyState: DialogStackHistoryState +}; + +let dialogStack: DialogStackEntry[] = []; + + +const DLG_STATE_MAGIC = "DlgState438327" +export interface DialogStackHistoryState { + magic: string; + topmost: boolean; + stackDepth: number; + tag: string; + id: string; + previousState: DialogStackHistoryState | null; +}; + +export function pushDialogStack(dialog: IDialogStackable): void { + let stackId = Math.random().toString(36).substring(7); + let dialogStackState: DialogStackHistoryState = { + magic: DLG_STATE_MAGIC, + topmost: false, + stackDepth: dialogStack.length + 1, + tag: dialog.getTag(), + id: stackId, previousState: + window.history.state as DialogStackHistoryState | null + }; + window.history.replaceState( + dialogStackState, + "", + "#" + dialog.getTag()); + + // refresh reloads the page. + let topState: DialogStackHistoryState = { + topmost: true, + magic: DLG_STATE_MAGIC, + previousState: dialogStackState, + tag: dialog.getTag(), + id: stackId, + stackDepth: dialogStack.length + 1 + }; + + dialogStack.push( + { + dialog: dialog, + historyState: dialogStackState + }); + + + window.history.pushState( + topState, + "", + "#" + dialog.getTag()); + + if (!gWatchingHistory) { + gWatchingHistory = true; + window.addEventListener("popstate", handlePopState); + } +} + +let gWatchingHistory = false; +let gPopFromBack = true; + +let handlePopState = (ev: PopStateEvent) => { + let evTag: DialogStackHistoryState | null = ev.state as DialogStackHistoryState | null; + if (!evTag) return; + if (evTag.magic !== DLG_STATE_MAGIC) return; + + ev.stopPropagation(); + + let id = evTag.id; + let ix = dialogStack.length-1; + while (ix >= 0) { + let entry = dialogStack[ix]; + if (entry.historyState.id === id) { + break; + } + ix--; + } + if (ix < 0) { + // user must have navigated directly. + // so just reload the page. + dialogStack = []; + window.location.reload(); + ev.stopPropagation(); + return; + } + + while (dialogStack.length > ix) { + let topEntry = dialogStack[dialogStack.length - 1]; + if (topEntry.dialog) { + try { + + if (topEntry.dialog.isOpen()) { + topEntry.dialog.onDialogStackClose(); + } + } catch (_e) { + + } + topEntry.dialog = null; + } + dialogStack.pop(); + } + let previousState = evTag.previousState; + if (previousState) + { + let newState = {...previousState, topmost: true}; + window.history.replaceState(newState,"","#"+previousState.tag); + } else { + window.history.replaceState(null,"",window.location.pathname); + } + + if (dialogStack.length != 0 && gPopFromBack) { + if (dialogStack[dialogStack.length -1].dialog === null) + { + if (window.history.state != null) + { + window.setTimeout(() => { window.history.back(); }, 0); + } else { + dialogStack.pop(); + } + } + } + ev.stopPropagation(); +} + + +export function popDialogStack(dialog: IDialogStackable): void { + let ix = dialogStack.length-1; + + while (ix >= 0) { + let entry = dialogStack[ix]; + if (entry.dialog === dialog) { + break; + } + ix--; + } + if (ix < 0) + { + return; + } + dialogStack[ix].dialog = null; + if (dialogStack.length != 0 && dialogStack[dialogStack.length - 1].dialog === null) + { + window.history.back(); + } +} + + + + + + + + + +// Close all dialogs higher in the dialog stack than "tag". +export function removeDialogStackEntriesAbove(tag: string) { + while (dialogStack.length > 0) { + let entry = dialogStack[dialogStack.length - 1]; + if (entry.dialog && entry.dialog.getTag() === tag) { + return; + } + + dialogStack.pop(); + + if (entry.dialog && entry.dialog.isOpen()) { + entry.dialog.onDialogStackClose(); + } + } +} + diff --git a/react/src/Draggable.tsx b/vite/src/pipedal/Draggable.tsx similarity index 97% rename from react/src/Draggable.tsx rename to vite/src/pipedal/Draggable.tsx index 81751dc..ca2931e 100644 --- a/react/src/Draggable.tsx +++ b/vite/src/pipedal/Draggable.tsx @@ -19,10 +19,12 @@ import { MouseEvent, PointerEvent, ReactNode, Component } from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import { PiPedalStateError } from './PiPedalError'; +import { css } from '@emotion/react'; const SELECT_SCALE = 1.5; @@ -35,14 +37,14 @@ const AUTOSCROLL_SCROLL_RATE = AUTOSCROLL_SCROLL_PER_SECOND * AUTOSCROLL_TICK_DE const LONG_PRESS_TIME_MS = 250; const styles = (theme: Theme) => createStyles({ - frame: { + frame: css({ width: "100%", height: "100%", display: "flex", alignItems: "center", justifyContent: "center", position: "relative" - } + }) }); type Point = { x: number, y: number }; @@ -64,7 +66,7 @@ type DraggableState = { const Draggable = - withStyles(styles, { withTheme: true })( + withStyles( class extends Component { @@ -158,7 +160,7 @@ const Draggable = e.preventDefault(); e.stopPropagation(); } - longPressTimer?: NodeJS.Timeout = undefined; + longPressTimer?: number = undefined; longPressTimerTick() { if (this.pointerType === "touch") { @@ -482,8 +484,9 @@ const Draggable = render() { + const classes = withStyles.getClasses(this.props); return ( -
createStyles({ - frame: { - position: "relative", - margin: "12px", - background: theme.palette.background.paper - } -}); type Point = { x: number, y: number }; @@ -113,8 +103,8 @@ const DraggableGrid = ( class extends Component { - refScrollContainer: React.RefObject; - refGrid: React.RefObject; + refScrollContainer: React.RefObject; + refGrid: React.RefObject; constructor(props: DraggableGridProps) { super(props); @@ -653,7 +643,7 @@ const DraggableGrid = itemOffsetX: number = 0; itemOffsetY: number = 0; - longPressTimer?: NodeJS.Timeout = undefined; + longPressTimer?: number = undefined; longPressTimerTick() { @@ -792,7 +782,7 @@ const DraggableGrid = } } } - autoScrollTimer?: NodeJS.Timeout; + autoScrollTimer?: number; getElementKeys(): any[] { diff --git a/vite/src/pipedal/FilePropertyControl.tsx b/vite/src/pipedal/FilePropertyControl.tsx new file mode 100644 index 0000000..04a4f49 --- /dev/null +++ b/vite/src/pipedal/FilePropertyControl.tsx @@ -0,0 +1,268 @@ +/* + * MIT License + * + * Copyright (c) 2023 Robin E. R. Davies + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +import { Component, SyntheticEvent } from 'react'; +import { Theme } from '@mui/material/styles'; +import { css } from '@emotion/react'; + +import { UiFileProperty } from './Lv2Plugin'; +import Typography from '@mui/material/Typography'; +import { PiPedalModel, PiPedalModelFactory, ListenHandle, State } from './PiPedalModel'; +import ButtonBase from '@mui/material/ButtonBase' +import MoreHorizIcon from '@mui/icons-material/MoreHoriz'; +import { PedalboardItem } from './Pedalboard'; +import { isDarkMode } from './DarkMode'; +import Tooltip from "@mui/material/Tooltip" + +export const StandardItemSize = { width: 80, height: 140 } + + +import { withStyles } from "tss-react/mui"; +import WithStyles from './WithStyles'; +import { withTheme } from './WithStyles'; + +const styles = (theme: Theme) => { + return { + frame: css({ + position: "relative", + margin: "12px" + }), + switchTrack: css({ + height: '100%', + width: '100%', + borderRadius: 14 / 2, + zIndex: -1, + transition: theme.transitions.create(['opacity', 'background-color'], { + duration: theme.transitions.duration.shortest + }), + backgroundColor: theme.palette.secondary.main, + opacity: theme.palette.mode === 'light' ? 0.38 : 0.3 + }), + controlFrame: css({ + display: "flex", flexDirection: "column", alignItems: "start", justifyContent: "space-between", height: 116 + }), + displayValue: css({ + position: "absolute", + top: 0, + left: 0, + right: 0, + bottom: 4, + textAlign: "center", + background: theme.mainBackground, + color: theme.palette.text.secondary, + // zIndex: -1, + }), + titleSection: css({ + flex: "0 0 auto", alignSelf: "stretch", marginBottom: 8, marginLeft: 8, marginRight: 0 + }), + midSection: css({ + flex: "1 1 1", display: "flex", flexFlow: "column nowrap", alignContent: "center", justifyContent: "center" + }), + editSection: css({ + flex: "0 0 0", position: "relative", width: 60, height: 28, minHeight: 28 + }) + } +} + ; + + +export interface FilePropertyControlProps extends WithStyles { + fileProperty: UiFileProperty; + pedalboardItem: PedalboardItem; + onFileClick: (fileProperty: UiFileProperty, value: string) => void; + theme: Theme; +} +type FilePropertyControlState = { + error: boolean; + hasValue: boolean; + value: string; +}; + +const FilePropertyControl = + withTheme(withStyles( + class extends Component { + + model: PiPedalModel; + + + constructor(props: FilePropertyControlProps) { + super(props); + + this.state = { + error: false, + hasValue: false, + value: "", + }; + this.model = PiPedalModelFactory.getInstance(); + this.onStateChanged = this.onStateChanged.bind(this); + } + + + onStateChanged(state: State) { + if (this.mounted) { + if (state === State.Ready) { + this.subscribeToPatchProperty(); + } + } + } + // private propertyGetHandle?: ListenHandle; + + monitorPropertyHandle?: ListenHandle; + + subscribeToPatchProperty() { + // this.propertyGetHandle = this.model.listenForAtomOutput(this.props.instanceId,(instanceId,atomOutput)=>{ + // // PARSE THE OBJECT! + // // this.setState({value: atomOutput?.value as string}); + // }); + this.unsubscribeToPatchProperty(); + this.monitorPropertyHandle = this.model.monitorPatchProperty(this.props.pedalboardItem.instanceId, + this.props.fileProperty.patchProperty, + (instanceId, property, propertyValue) => { + if (propertyValue.otype_ === "Path") { + this.setState({ value: propertyValue.value as string, hasValue: true }); + } + } + ); + + } + unsubscribeToPatchProperty() { + if (this.monitorPropertyHandle !== undefined) { + this.model.cancelMonitorPatchProperty(this.monitorPropertyHandle); + this.monitorPropertyHandle = undefined; + } + + } + private mounted: boolean = false; + componentDidMount() { + this.model.state.addOnChangedHandler(this.onStateChanged); + this.mounted = true; + this.subscribeToPatchProperty(); + } + componentWillUnmount() { + this.unsubscribeToPatchProperty(); + this.mounted = false; + this.model.state.removeOnChangedHandler(this.onStateChanged); + } + componentDidUpdate(prevProps: Readonly, prevState: Readonly, snapshot?: any): void { + if (prevProps.fileProperty.patchProperty !== this.props.fileProperty.patchProperty + || prevProps.pedalboardItem.instanceId !== this.props.pedalboardItem.instanceId + || prevProps.pedalboardItem.stateUpdateCount !== this.props.pedalboardItem.stateUpdateCount + + ) { + this.unsubscribeToPatchProperty(); + this.subscribeToPatchProperty(); + } + + } + + + inputChanged: boolean = false; + + onDrag(e: SyntheticEvent) { + e.preventDefault(); + } + + onFileClick() { + this.props.onFileClick(this.props.fileProperty, this.state.value); + } + private fileNameOnly(path: string): string { + let slashPos = path.lastIndexOf('/'); + if (slashPos < 0) { + slashPos = 0; + } else { + ++slashPos; + } + let extPos = path.lastIndexOf('.'); + if (extPos < 0 || extPos < slashPos) { + extPos = path.length; + } + + return path.substring(slashPos, extPos); + + } + render() { + //const classes = withStyles.getClasses(this.props); + + const classes = withStyles.getClasses(this.props); + + let fileProperty = this.props.fileProperty; + + let value = "\u00A0"; + if (this.state.hasValue) { + if (this.state.value.length === 0) { + value = ""; + } else { + value = this.fileNameOnly(this.state.value); + } + } + + let item_width = 264; + + return ( +
+ {/* TITLE SECTION */} +
+ + {fileProperty.label} + +
+ {/* CONTROL SECTION */} + +
+ + { this.onFileClick() }} > +
+
+ {value} + +
+
 
+
+ +
+ + {/* LABEL/EDIT SECTION*/} +
+
+
+ ); + } + } + ,styles) +) + ; +export default FilePropertyControl; \ No newline at end of file diff --git a/react/src/FilePropertyDialog.tsx b/vite/src/pipedal/FilePropertyDialog.tsx similarity index 98% rename from react/src/FilePropertyDialog.tsx rename to vite/src/pipedal/FilePropertyDialog.tsx index cd4bb90..4a02bd7 100644 --- a/react/src/FilePropertyDialog.tsx +++ b/vite/src/pipedal/FilePropertyDialog.tsx @@ -19,7 +19,10 @@ import React from 'react'; -import { Theme, createStyles } from '@mui/material/styles'; +import {createStyles} from './WithStyles'; + + +import { Theme } from '@mui/material/styles'; import CreateNewFolderIcon from '@mui/icons-material/CreateNewFolder'; import RenameDialog from './RenameDialog'; import Divider from '@mui/material/Divider'; @@ -32,7 +35,7 @@ import Button from '@mui/material/Button'; import FileUploadIcon from '@mui/icons-material/FileUpload'; import AudioFileIcon from '@mui/icons-material/AudioFile'; import ArrowBackIcon from '@mui/icons-material/ArrowBack'; -import FolderOutlinedIcon from '@mui/icons-material/FolderOutlined'; +import FolderIcon from '@mui/icons-material/Folder'; import InsertDriveFileOutlinedIcon from '@mui/icons-material/InsertDriveFileOutlined'; import InsertDriveFileIcon from '@mui/icons-material/InsertDriveFile'; import DialogActions from '@mui/material/DialogActions'; @@ -41,7 +44,9 @@ import DialogContent from '@mui/material/DialogContent'; import IconButton from '@mui/material/IconButton'; import OldDeleteIcon from './OldDeleteIcon'; import Toolbar from '@mui/material/Toolbar'; -import { withStyles, WithStyles } from '@mui/styles'; +import WithStyles from './WithStyles'; +import { withStyles } from "tss-react/mui"; + import ResizeResponsiveComponent from './ResizeResponsiveComponent'; @@ -92,6 +97,7 @@ function isAudioFile(filename: string) { export interface FilePropertyDialogProps extends WithStyles { open: boolean, fileProperty: UiFileProperty, + instanceId: number, selectedFile: string, onOk: (fileProperty: UiFileProperty, selectedItem: string) => void, onCancel: () => void @@ -172,7 +178,7 @@ export function pathFileName(path: string): string { } -export default withStyles(styles, { withTheme: true })( +export default withStyles( class FilePropertyDialog extends ResizeResponsiveComponent { getNavDirectoryFromFile(selectedFile: string, fileProperty: UiFileProperty): string { @@ -445,7 +451,6 @@ export default withStyles(styles, { withTheme: true })( } } - private wantsScrollRef: boolean = true; navigate(relativeDirectory: string) { this.requestFiles(relativeDirectory); @@ -557,7 +562,7 @@ export default withStyles(styles, { withTheme: true })( } if (fileEntry.isDirectory) { return ( - + ); } if (isAudioFile(fileEntry.pathname)) { @@ -567,7 +572,7 @@ export default withStyles(styles, { withTheme: true })( } render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let columnWidth = this.state.columnWidth; let okButtonText = "Select"; if (this.state.hasSelection && this.state.selectedFileIsDirectory) { @@ -750,6 +755,8 @@ export default withStyles(styles, { withTheme: true })( } uploadPage={ "uploadUserFile?directory=" + encodeURIComponent(this.state.uploadDirectory) + + "&id=" + this.props.instanceId.toString() + + "&property=" + encodeURIComponent(this.props.fileProperty.patchProperty) + "&ext=" + encodeURIComponent(this.getFileExtensionList(this.props.fileProperty)) } @@ -794,8 +801,10 @@ export default withStyles(styles, { withTheme: true })( ( void, onClose: () => void }; @@ -141,7 +142,6 @@ export interface FilePropertyDirectorySelectDialogState { export default class FilePropertyDirectorySelectDialog extends ResizeResponsiveComponent { private model: PiPedalModel; - private refSelected: React.Ref; constructor(props: FilePropertyDirectorySelectDialogProps) { super(props); @@ -155,7 +155,6 @@ export default class FilePropertyDirectorySelectDialog extends ResizeResponsiveC directoryTreeInvalidatecount: 0 }; - this.refSelected = React.createRef(); this.requestDirectoryTree(); } @@ -181,7 +180,7 @@ export default class FilePropertyDirectorySelectDialog extends ResizeResponsiveC requestDirectoryTree() { if (!this.props.open) return; - this.model.getFilePropertyDirectoryTree(this.props.uiFileProperty) + this.model.getFilePropertyDirectoryTree(this.props.uiFileProperty,this.props.selectedFile) .then((filePropertyDirectoryTree) => { let myTree = new DirectoryTree(filePropertyDirectoryTree); if (this.props.excludeDirectory.length !== 0) @@ -327,7 +326,7 @@ export default class FilePropertyDirectorySelectDialog extends ResizeResponsiveC PaperProps={{ style: { minHeight: "80%", maxHeight: "80%", minWidth: "75%", maxWidth: "75%", overflowY: "visible" } }} > - Select folder + {this.props.dialogTitle} diff --git a/react/src/FilePropertyDirectoryTree.tsx b/vite/src/pipedal/FilePropertyDirectoryTree.tsx similarity index 100% rename from react/src/FilePropertyDirectoryTree.tsx rename to vite/src/pipedal/FilePropertyDirectoryTree.tsx diff --git a/react/src/FullScreenIME.tsx b/vite/src/pipedal/FullScreenIME.tsx similarity index 95% rename from react/src/FullScreenIME.tsx rename to vite/src/pipedal/FullScreenIME.tsx index f3ec69a..a9b3930 100644 --- a/react/src/FullScreenIME.tsx +++ b/vite/src/pipedal/FullScreenIME.tsx @@ -19,9 +19,10 @@ import React, { ReactNode } from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles, {withTheme} from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel'; import ResizeResponsiveComponent from './ResizeResponsiveComponent'; import { UiControl } from './Lv2Plugin'; @@ -29,10 +30,10 @@ import DialogEx from './DialogEx'; import Input from '@mui/material/Input'; import { nullCast } from './Utility'; import Typography from '@mui/material/Typography'; - +import { css } from '@emotion/react'; const styles = (theme: Theme) => createStyles({ - frame: { + frame: css({ display: "block", position: "relative", flexDirection: "row", @@ -42,7 +43,7 @@ const styles = (theme: Theme) => createStyles({ height: "100%", overflowX: "auto", overflowY: "auto" - }, + }), }); @@ -60,11 +61,11 @@ type FullScreenIMEState = { }; const FullScreenIME = - withStyles(styles, { withTheme: true })( + withTheme(withStyles( class extends ResizeResponsiveComponent { model: PiPedalModel; - inputRef: React.RefObject; + inputRef: React.RefObject; constructor(props: FullScreenIMEProps) { super(props); @@ -187,7 +188,7 @@ const FullScreenIME = currentWidth?: number; render(): ReactNode { - //let classes = this.props.classes; + //const classes = withStyles.getClasses(this.props); let control = this.props.uiControl; if (!control) { this.currentWidth = undefined; @@ -233,8 +234,9 @@ const FullScreenIME = } - } - ); + }, + styles + )); export default FullScreenIME; diff --git a/react/src/GovernorSettings.tsx b/vite/src/pipedal/GovernorSettings.tsx similarity index 100% rename from react/src/GovernorSettings.tsx rename to vite/src/pipedal/GovernorSettings.tsx diff --git a/react/src/GxTunerControl.tsx b/vite/src/pipedal/GxTunerControl.tsx similarity index 93% rename from react/src/GxTunerControl.tsx rename to vite/src/pipedal/GxTunerControl.tsx index 9f997f2..e73e127 100644 --- a/react/src/GxTunerControl.tsx +++ b/vite/src/pipedal/GxTunerControl.tsx @@ -19,9 +19,10 @@ import React, {Component} from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import { MonitorPortHandle, PiPedalModel, State, PiPedalModelFactory } from "./PiPedalModel"; import SvgPathBuilder from './SvgPathBuilder' import {isDarkMode} from './DarkMode'; @@ -62,8 +63,8 @@ interface PitchInfo { const FLAT = "\u{266d}"; const SHARP = "#"; -const DOUBLE_FLAT = "\uD834\uDD2B"; -const DOUBLE_SHARP = "\uD834\uDD2A"; +// const DOUBLE_FLAT = "\uD834\uDD2B"; +// const DOUBLE_SHARP = "\uD834\uDD2A"; const HALF_FLAT = "\uD834\uDD33"; const HALF_SHARP = "\uD834\uDD32"; @@ -78,16 +79,15 @@ const NOTES_24TET: string[] = [ "C","C"+HALF_SHARP, "C" + SHARP,"D"+HALF_FLAT, "D", "D"+HALF_SHARP, "E"+FLAT, "E"+HALF_FLAT, "E","E"+HALF_SHARP,"F", "F"+HALF_SHARP, "F" + SHARP, "G"+HALF_FLAT,"G","G"+HALF_SHARP, "A"+FLAT,"A"+HALF_FLAT,"A","A"+HALF_SHARP,"B"+FLAT,"B"+HALF_FLAT,"B","C"+HALF_FLAT ]; -// eslint-disable-next-line @typescript-eslint/no-unused-vars -const NOTES_31TET: string[] = [ - "C", "D"+DOUBLE_FLAT, "C" + SHARP,"Db","C"+DOUBLE_SHARP,"D","E"+DOUBLE_FLAT,"D" + SHARP,"Eb","D"+DOUBLE_SHARP,"E",'Fb","E" + SHARP,"F","G"+DOUBLE_FLAT,"F" + SHARP,"Gb""Fx","G","A"+DOUBLE_FLAT,"G"+DOUBLE_SHARP,"A"' -]; +// // eslint-disable-next-line @typescript-eslint/no-unused-vars +// const NOTES_31TET: string[] = [ +// "C", "D"+DOUBLE_FLAT, "C" + SHARP,"Db","C"+DOUBLE_SHARP,"D","E"+DOUBLE_FLAT,"D" + SHARP,"Eb","D"+DOUBLE_SHARP,"E",'Fb","E" + SHARP,"F","G"+DOUBLE_FLAT,"F" + SHARP,"Gb""Fx","G","A"+DOUBLE_FLAT,"G"+DOUBLE_SHARP,"A"' +// ]; -// eslint-disable-next-line @typescript-eslint/no-unused-vars -const NOTES_53TET = ["la","laa","lo","law","ta","teh","te","tu","tuh","ti","tih","to","taw","da","do","di","daw","ro","rih","ra","ru","ruh","reh","re ","ri","raw","ma","meh","me","mu","muh","mi","maa","mo","maw","fe","fa","fih","fu","fuh","fi","se","suh","su","sih","sol","si","saw","lo","leh","le","lu","luh"]; +// // eslint-disable-next-line @typescript-eslint/no-unused-vars +// const NOTES_53TET = ["la","laa","lo","law","ta","teh","te","tu","tuh","ti","tih","to","taw","da","do","di","daw","ro","rih","ra","ru","ruh","reh","re ","ri","raw","ma","meh","me","mu","muh","mi","maa","mo","maw","fe","fa","fih","fu","fuh","fi","se","suh","su","sih","sol","si","saw","lo","leh","le","lu","luh"]; interface GxTunerControlProps extends WithStyles { - theme: Theme; instanceId: number; valueIsMidi: boolean; symbolName?: string; @@ -100,13 +100,13 @@ type GxTunerControlState = { }; const GxTunerControl = - withStyles(styles, { withTheme: true })( + withStyles( class extends Component { model: PiPedalModel; - refRoot: React.RefObject; + refRoot: React.RefObject; constructor(props: GxTunerControlProps) { super(props); @@ -236,7 +236,7 @@ const GxTunerControl = } } - animationTimer?: NodeJS.Timeout = undefined; + animationTimer?: number = undefined; cancelAnimationTimer(): void { if (this.animationTimer) @@ -430,7 +430,8 @@ const GxTunerControl = { this.renderDial(this.state.pitchInfo) }
); } - } + }, + styles ); diff --git a/react/src/GxTunerView.tsx b/vite/src/pipedal/GxTunerView.tsx similarity index 95% rename from react/src/GxTunerView.tsx rename to vite/src/pipedal/GxTunerView.tsx index 0f313cd..c4c9b7e 100644 --- a/react/src/GxTunerView.tsx +++ b/vite/src/pipedal/GxTunerView.tsx @@ -20,9 +20,10 @@ import React from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import IControlViewFactory from './IControlViewFactory'; import { PiPedalModelFactory, PiPedalModel } from "./PiPedalModel"; @@ -49,7 +50,7 @@ interface GxTunerState { } const GxTunerView = - withStyles(styles, { withTheme: true })( + withStyles( class extends React.Component implements ControlViewCustomization { @@ -107,7 +108,8 @@ const GxTunerView = customizationId={this.customizationId} />); } - } + }, + styles ); diff --git a/react/src/IControlViewFactory.tsx b/vite/src/pipedal/IControlViewFactory.tsx similarity index 100% rename from react/src/IControlViewFactory.tsx rename to vite/src/pipedal/IControlViewFactory.tsx diff --git a/react/src/Jack.tsx b/vite/src/pipedal/Jack.tsx similarity index 100% rename from react/src/Jack.tsx rename to vite/src/pipedal/Jack.tsx diff --git a/react/src/JackHostStatus.tsx b/vite/src/pipedal/JackHostStatus.tsx similarity index 94% rename from react/src/JackHostStatus.tsx rename to vite/src/pipedal/JackHostStatus.tsx index 52b92dc..1f5c1f5 100644 --- a/react/src/JackHostStatus.tsx +++ b/vite/src/pipedal/JackHostStatus.tsx @@ -49,6 +49,18 @@ function fmtCpuFreq(freq: number): string { return freq + " KHz"; } +function areSameFrequency(max: number, min: number): boolean { + return true; + // // x86 cpus can show incredibly minor frequency variations between CPUs + // if (min === 0) return false; + // let ratio = max/min; + // if (ratio < 1.2) + // { + // return true; + // } + // return false; +} + export default class JackHostStatus { deserialize(input: any): JackHostStatus { this.active = input.active; @@ -92,12 +104,12 @@ export default class JackHostStatus { ( { - (status.cpuFreqMax === status.cpuFreqMin) ? + (areSameFrequency(status.cpuFreqMax,status.cpuFreqMin)) ? ( {status.governor} {fmtCpuFreq(status.cpuFreqMax)} ) : ( - {status.governor} {fmtCpuFreq(status.cpuFreqMax)}-{fmtCpuFreq(status.cpuFreqMax)} + {status.governor} {fmtCpuFreq(status.cpuFreqMin)}-{fmtCpuFreq(status.cpuFreqMax)} ) } diff --git a/react/src/JackServerSettings.tsx b/vite/src/pipedal/JackServerSettings.tsx similarity index 100% rename from react/src/JackServerSettings.tsx rename to vite/src/pipedal/JackServerSettings.tsx diff --git a/react/src/JackServerSettingsDialog.tsx b/vite/src/pipedal/JackServerSettingsDialog.tsx similarity index 98% rename from react/src/JackServerSettingsDialog.tsx rename to vite/src/pipedal/JackServerSettingsDialog.tsx index aa9530d..b933d79 100644 --- a/react/src/JackServerSettingsDialog.tsx +++ b/vite/src/pipedal/JackServerSettingsDialog.tsx @@ -18,13 +18,14 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -import React, { Component } from 'react'; +import { Component } from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import Button from '@mui/material/Button'; import DialogActions from '@mui/material/DialogActions'; @@ -220,7 +221,7 @@ function isOkEnabled(jackServerSettings: JackServerSettings, alsaDevices?: AlsaD } -const JackServerSettingsDialog = withStyles(styles)( +const JackServerSettingsDialog = withStyles( class extends Component { model: PiPedalModel; @@ -400,7 +401,7 @@ const JackServerSettingsDialog = withStyles(styles)( }; render() { - const classes = this.props.classes; + const classes = withStyles.getClasses(this.props); const { onClose, open } = this.props; @@ -541,6 +542,7 @@ const JackServerSettingsDialog = withStyles(styles)( ); } - }); + }, + styles); export default JackServerSettingsDialog; diff --git a/react/src/JackStatusView.tsx b/vite/src/pipedal/JackStatusView.tsx similarity index 98% rename from react/src/JackStatusView.tsx rename to vite/src/pipedal/JackStatusView.tsx index b8a40fa..b47d96a 100644 --- a/react/src/JackStatusView.tsx +++ b/vite/src/pipedal/JackStatusView.tsx @@ -56,7 +56,7 @@ export default class JackStatusView extends React.Component void; @@ -59,14 +63,14 @@ const FILTER_STORAGE_KEY = "com.twoplay.pipedal.load_dlg.filter"; const pluginGridStyles = (theme: Theme) => createStyles({ - frame: { + frame: css({ position: "relative", width: "100%", height: "100%" - }, + }), - top: { + top: css({ top: "0px", right: "0px", left: "0px", @@ -75,8 +79,8 @@ const pluginGridStyles = (theme: Theme) => createStyles({ flexGrow: 1, overflowX: "hidden", overflowY: "visible" - }, - bottom: { + }), + bottom: css({ position: "relative", bottom: "0px", height: "64px", @@ -88,20 +92,20 @@ const pluginGridStyles = (theme: Theme) => createStyles({ paddingLeft: "24px", paddingRight: "48px", - }, - paper: { + }), + paper: css({ position: "relative", overflow: "hidden", height: "56px", width: "100%", background: theme.palette.background.paper - }, - buttonBase: { + }), + buttonBase: css({ width: "100%", height: "100%'" - }, - content: { + }), + content: css({ marginTop: "4px", marginBottom: "4px", marginLeft: "8px", @@ -115,42 +119,42 @@ const pluginGridStyles = (theme: Theme) => createStyles({ height: 48, alignItems: "start", flexWrap: "nowrap" - }, - content2: { + }), + content2: css({ display: "flex", flexDirection: "column", flex: "1 1 auto", width: "100%", paddingLeft: 12, whiteSpace: "nowrap", textOverflow: "ellipsis" - }, - favoriteDecoration: { + }), + favoriteDecoration: css({ flex: "0 0 auto" - }, - table: { + }), + table: css({ borderCollapse: "collapse", - }, - icon: { + }), + icon: css({ width: "24px", height: "24px", margin: "0px", opacity: "0.6" - }, - iconBorder: { + }), + iconBorder: css({ flex: "0 0 auto", paddingTop: "4px" - }, - label: { + }), + label: css({ width: "100%" - }, - label2: { + }), + label2: css({ marginTop: 8, color: theme.palette.text.secondary - }, - control: { + }), + control: css({ padding: theme.spacing(1), - }, - tdText: { + }), + tdText: css({ padding: "0px" - } + }) }) ; @@ -182,10 +186,11 @@ type PluginGridState = { export const LoadPluginDialog = - withStyles(pluginGridStyles, { withTheme: true })( + withTheme( + withStyles( class extends ResizeResponsiveComponent { model: PiPedalModel; - searchInputRef: React.RefObject; + searchInputRef: React.RefObject; constructor(props: PluginGridProps) { super(props); @@ -372,13 +377,9 @@ export const LoadPluginDialog = handleCancel(e: SyntheticEvent): void { - e.preventDefault(); this.cancel(); } handleOk(e?: SyntheticEvent): void { - if (e) { - e.preventDefault(); - } let selectedPlugin: UiPlugin | undefined = undefined; if (this.state.selected_uri) { @@ -563,7 +564,7 @@ export const LoadPluginDialog = } changedSearchString?: string = undefined; - hSearchTimeout?: NodeJS.Timeout; + hSearchTimeout?: number; private scrollToRequested = false; requestScrollTo() { @@ -636,7 +637,7 @@ export const LoadPluginDialog = } let value = gridItems[item]; - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let isFavorite: boolean = this.state.favoritesList[value.uri] ?? false; return ( @@ -689,7 +690,7 @@ export const LoadPluginDialog = render() { - const { classes } = this.props; + const classes= withStyles.getClasses(this.props); let selectedPlugin: UiPlugin | undefined = undefined; if (this.state.selected_uri) { @@ -910,6 +911,8 @@ export const LoadPluginDialog = ); } } - ); + , + pluginGridStyles + )); export default LoadPluginDialog; diff --git a/react/src/Lv2Plugin.tsx b/vite/src/pipedal/Lv2Plugin.tsx similarity index 95% rename from react/src/Lv2Plugin.tsx rename to vite/src/pipedal/Lv2Plugin.tsx index c451ba8..6192ab9 100644 --- a/react/src/Lv2Plugin.tsx +++ b/vite/src/pipedal/Lv2Plugin.tsx @@ -25,6 +25,16 @@ interface Deserializable { deserialize(input: any): T; } +const noteNames: string[] = [ + "C","C#","D","Eb","E","F","F#","G","Ab","A","Bb","B","C" +]; + +function semitone12TETValue(value: number) : string { + let iValue = Math.round(value) % 12; + return noteNames[iValue]; + +} + export class Port implements Deserializable { deserialize(input: any): Port { @@ -445,7 +455,30 @@ export enum ControlType { Tuner, Vu, DbVu, - OutputSelect + OutputText +} + +const textUnits : Set = new Set([ + Units.none, + Units.unknown, + Units.bar, + Units.beat, + Units.bpm, + Units.cent, + Units.cm, + Units.hz, + Units.khz, + Units.km, + Units.m, + Units.min, + Units.ms, + Units.s, + Units.semitone12TET +]); + +function displayUnitAsText(unit: Units): boolean +{ + return textUnits.has(unit); } export class UiControl implements Deserializable { @@ -468,6 +501,7 @@ deserialize(input: any): UiControl { this.scale_points = ScalePoint.deserialize_array(input.scale_points); this.port_group = input.port_group; this.units = input.units as Units; + this.pipedal_ledColor = input.pipedal_ledColor; this.comment = input.comment ?? ""; this.is_bypass = input.is_bypass ? true : false; @@ -489,10 +523,13 @@ deserialize(input: any): UiControl { } else if (this.units === Units.db) { this.controlType = ControlType.DbVu; } else if (this.enumeration_property) { - this.controlType = ControlType.OutputSelect; + this.controlType = ControlType.OutputText; + } else if (displayUnitAsText(this.units)) + { + this.controlType = ControlType.OutputText } else { this.controlType = ControlType.Vu; - } + } } if (this.isValidEnumeration()) { this.controlType = ControlType.Select; @@ -566,6 +603,7 @@ deserialize(input: any): UiControl { is_program_controller: boolean = true; custom_units: string = ""; connection_optional: boolean = false; + pipedal_ledColor: string = ""; // Return the value of the closest scale_point. @@ -602,8 +640,8 @@ deserialize(input: any): UiControl { isTrigger(): boolean { return this.controlType === ControlType.Trigger; } - isOutputSelect(): boolean { - return !this.is_input && this.controlType === ControlType.OutputSelect; + isOutputText(): boolean { + return !this.is_input && this.controlType === ControlType.OutputText; } @@ -666,6 +704,29 @@ deserialize(input: any): UiControl { return scalePoint.label; } } + + if (this.units === Units.s) + { + let iValue = Math.round(value); + if (iValue >= 60) + { + let minutes = Math.floor(iValue/60); + let seconds = iValue % 60; + if (seconds < 10) + { + return minutes + ":0" + seconds; + + } + return minutes + ":" + seconds; + } else { + return this.formatShortValue(value); + } + } + if (this.units === Units.semitone12TET) + { + return semitone12TETValue(value); + } + let text = this.formatShortValue(value); switch (this.units) { @@ -705,13 +766,8 @@ deserialize(input: any): UiControl { case Units.pc: text += "%"; break; - case Units.s: - text += "s"; + default: break; - // Midinote: not handled. - // semitone12TET not handled. - - } return text; diff --git a/react/src/MainPage.tsx b/vite/src/pipedal/MainPage.tsx similarity index 93% rename from react/src/MainPage.tsx rename to vite/src/pipedal/MainPage.tsx index 00db0f4..6a41c96 100644 --- a/react/src/MainPage.tsx +++ b/vite/src/pipedal/MainPage.tsx @@ -19,9 +19,9 @@ import { SyntheticEvent } from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles, {withTheme} from './WithStyles'; +import { withStyles } from "tss-react/mui"; + import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel'; import { Pedalboard, PedalboardItem, PedalboardSplitItem, SplitType @@ -45,18 +45,19 @@ import PluginInfoDialog from './PluginInfoDialog'; import { GetControlView } from './ControlViewFactory'; import MidiBindingsDialog from './MidiBindingsDialog'; import PluginPresetSelector from './PluginPresetSelector'; -import { ReactComponent as OldDeleteIcon } from "./svg/old_delete_outline_24dp.svg"; -import { ReactComponent as MidiIcon } from "./svg/ic_midi.svg"; +import OldDeleteIcon from "./svg/old_delete_outline_24dp.svg?react"; +import MidiIcon from "./svg/ic_midi.svg?react"; import { isDarkMode } from './DarkMode'; -import { ReactComponent as Snapshot0Icon } from "./svg/snapshot_0.svg"; -import { ReactComponent as Snapshot1Icon } from "./svg/snapshot_1.svg"; -import { ReactComponent as Snapshot2Icon } from "./svg/snapshot_2.svg"; -import { ReactComponent as Snapshot3Icon } from "./svg/snapshot_3.svg"; -import { ReactComponent as Snapshot4Icon } from "./svg/snapshot_4.svg"; -import { ReactComponent as Snapshot5Icon } from "./svg/snapshot_5.svg"; -import { ReactComponent as Snapshot6Icon } from "./svg/snapshot_6.svg"; +import Snapshot0Icon from "./svg/snapshot_0.svg?react"; +import Snapshot1Icon from "./svg/snapshot_1.svg?react"; +import Snapshot2Icon from "./svg/snapshot_2.svg?react"; +import Snapshot3Icon from "./svg/snapshot_3.svg?react"; +import Snapshot4Icon from "./svg/snapshot_4.svg?react"; +import Snapshot5Icon from "./svg/snapshot_5.svg?react"; +import Snapshot6Icon from "./svg/snapshot_6.svg?react"; import SnapshotDialog from './SnapshotDialog'; +import { css } from '@emotion/react'; const SPLIT_CONTROLBAR_THRESHHOLD = 750; @@ -65,41 +66,42 @@ const DISPLAY_AUTHOR_SPLIT_THRESHOLD = 500; const HORIZONTAL_CONTROL_SCROLL_HEIGHT_BREAK = 500; // eslint-disable-next-line @typescript-eslint/no-unused-vars -const HORIZONTAL_LAYOUT_MQ = "@media (max-height: " + HORIZONTAL_CONTROL_SCROLL_HEIGHT_BREAK + "px)"; +// const HORIZONTAL_LAYOUT_MQ = "@media (max-height: " + HORIZONTAL_CONTROL_SCROLL_HEIGHT_BREAK + "px)"; -const styles = ({ palette }: Theme) => createStyles({ - frame: { +const styles = ({ palette }: Theme) => { return { + frame: css({ position: "absolute", display: "flex", flexDirection: "column", flexWrap: "nowrap", justifyContent: "flex-start", left: "0px", top: "0px", bottom: "0px", right: "0px", overflow: "hidden" - }, - pedalboardScroll: { + }), + pedalboardScroll: css({ position: "relative", width: "100%", flex: "0 0 auto", overflow: "auto", maxHeight: 220 - }, - pedalboardScrollSmall: { + }), + pedalboardScrollSmall: css({ position: "relative", width: "100%", flex: "1 1 1px", overflow: "auto" - }, - separator: { + }), + separator: css({ width: "100%", height: "1px", background: "#888", opacity: "0.5", flex: "0 0 1px" - }, + }), - controlToolBar: { + controlToolBar: css({ flex: "0 0 auto", width: "100%", height: 48 - }, - splitControlBar: { + }), + splitControlBar: css({ flex: "0 0 64px", width: "100%", paddingLeft: 24, paddingRight: 16, paddingBottom: 16 - }, - controlContent: { + }), + controlContent: css({ flex: "1 1 auto", width: "100%", overflowY: "auto", minHeight: 240 - }, - controlContentSmall: { + }), + controlContentSmall: css({ flex: "0 0 162px", width: "100%", height: 162, overflowY: "hidden", - }, - title: { fontSize: "1.1em", fontWeight: 700, marginRight: 8, textOverflow: "ellipsis", whiteSpace: "nowrap", opacity: 0.75 }, - author: { fontWeight: 500, marginRight: 8, textOverflow: "ellipsis", whiteSpace: "nowrap", opacity: 0.75 } -}); + }), + title: css({ fontSize: "1.1em", fontWeight: 700, marginRight: 8, textOverflow: "ellipsis", whiteSpace: "nowrap", opacity: 0.75 }), + author: css({ fontWeight: 500, marginRight: 8, textOverflow: "ellipsis", whiteSpace: "nowrap", opacity: 0.75 }) +} +}; @@ -126,7 +128,8 @@ interface MainState { export const MainPage = - withStyles(styles, { withTheme: true })( + withTheme( + withStyles( class extends ResizeResponsiveComponent { model: PiPedalModel; @@ -288,7 +291,10 @@ export const MainPage = this.setSelection(selectedId); let item = this.getPedalboardItem(selectedId); if (item != null) { - if (item.isSplit()) { + if (item.isStart() || item.isEnd()) + { + // do nothing. + } else if (item.isSplit()) { let split = item as PedalboardSplitItem; if (split.getSplitType() === SplitType.Ab) { let cv = split.getToggleAbControlValue(); @@ -315,6 +321,8 @@ export const MainPage = onLoadClick(e: SyntheticEvent) { this.setState({ loadDialogOpen: true }); + e.preventDefault(); + e.stopPropagation(); } onSnapshotClick() { this.setState({ snapshotDialogOpen: true }); @@ -363,7 +371,7 @@ export const MainPage = titleBar(pedalboardItem: PedalboardItem | null): React.ReactNode { let title = ""; let author = ""; - let pluginUri = ""; + let infoPluginUri = ""; let presetsUri = ""; let missing = false; if (pedalboardItem) { @@ -375,7 +383,7 @@ export const MainPage = title = pedalboardItem.pluginName ?? "#error"; author = ""; presetsUri = ""; - pluginUri = ""; + infoPluginUri = ""; } else { let uiPlugin = this.model.getUiPlugin(pedalboardItem.uri); @@ -386,13 +394,13 @@ export const MainPage = title = uiPlugin.name; author = uiPlugin.author_name; presetsUri = uiPlugin.uri; - if (uiPlugin.description.length > 20) { - pluginUri = uiPlugin.uri; - } + // if (uiPlugin.description.length > 20) { + // } + infoPluginUri = uiPlugin.uri; } } } - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); if (missing) { return (
- +
); } - } - ); + }, + styles + )); export default MainPage \ No newline at end of file diff --git a/react/src/MaterialColors.tsx b/vite/src/pipedal/MaterialColors.tsx similarity index 100% rename from react/src/MaterialColors.tsx rename to vite/src/pipedal/MaterialColors.tsx diff --git a/react/src/MidiBinding.tsx b/vite/src/pipedal/MidiBinding.tsx similarity index 89% rename from react/src/MidiBinding.tsx rename to vite/src/pipedal/MidiBinding.tsx index 766d5b1..53e7c18 100644 --- a/react/src/MidiBinding.tsx +++ b/vite/src/pipedal/MidiBinding.tsx @@ -43,8 +43,8 @@ export default class MidiBinding { result.push(new MidiBinding().deserialize(input[i])); } return result; - } + clone(): MidiBinding { return new MidiBinding().deserialize(this);} equals(other: MidiBinding) : boolean { @@ -62,6 +62,12 @@ export default class MidiBinding { static BINDING_TYPE_NOTE: number = 1; static BINDING_TYPE_CONTROL: number = 2; + setBindingType(bindingType:number) + { + this.bindingType = bindingType; + } + + symbol: string = ""; bindingType: number = MidiBinding.BINDING_TYPE_NONE; @@ -76,9 +82,14 @@ export default class MidiBinding { linearControlType: number = MidiBinding.LINEAR_CONTROL_TYPE; - static LATCH_CONTROL_TYPE: number = 0; + static TRIGGER_ON_RISING_EDGE: number = 0; + static TOGGLE_ON_RISING_EDGE: number = 0; static MOMENTARY_CONTROL_TYPE: number = 1; + static TOGGLE_ON_VALUE: number = 1; + static TOGGLE_ON_ANY: number = 2; + static TRIGGER_ON_ANY: number = 2; - switchControlType: number = MidiBinding.LATCH_CONTROL_TYPE; + + switchControlType: number = MidiBinding.TRIGGER_ON_RISING_EDGE; }; \ No newline at end of file diff --git a/react/src/MidiBindingView.tsx b/vite/src/pipedal/MidiBindingView.tsx similarity index 62% rename from react/src/MidiBindingView.tsx rename to vite/src/pipedal/MidiBindingView.tsx index 2a9c8fc..0387b44 100644 --- a/react/src/MidiBindingView.tsx +++ b/vite/src/pipedal/MidiBindingView.tsx @@ -20,28 +20,40 @@ import { Component } from 'react'; import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import withStyles from '@mui/styles/withStyles'; -import createStyles from '@mui/styles/createStyles'; +import WithStyles from './WithStyles'; +import { withStyles } from "tss-react/mui"; +import {createStyles} from './WithStyles'; + +import { UiPlugin } from './Lv2Plugin'; + import MenuItem from '@mui/material/MenuItem'; import Select from '@mui/material/Select'; import MidiBinding from './MidiBinding'; -import Utility, { nullCast } from './Utility'; +import Utility from './Utility'; import Typography from '@mui/material/Typography'; import MicNoneOutlinedIcon from '@mui/icons-material/MicNoneOutlined'; import MicOutlinedIcon from '@mui/icons-material/MicOutlined'; import IconButton from '@mui/material/IconButton'; import NumericInput from './NumericInput'; -import { UiPlugin } from './Lv2Plugin'; const styles = (theme: Theme) => createStyles({ - controlDiv: { flex: "0 0 auto", marginRight: 12,verticalAlign: "center", height: 48, paddingTop: 8, paddingBottom: 8 }, - controlDiv2: { flex: "0 0 auto", marginRight: 12,verticalAlign: "center", - height: 48, paddingTop: 0, paddingBottom: 0, whiteSpace: "nowrap" } + controlDiv: { flex: "0 0 auto", marginRight: 12, verticalAlign: "center", height: 48, paddingTop: 8, paddingBottom: 8 }, + controlDiv2: { + flex: "0 0 auto", marginRight: 12, verticalAlign: "center", + height: 48, paddingTop: 0, paddingBottom: 0, whiteSpace: "nowrap" + } }); +enum MidiControlType { + None, + Toggle, + Trigger, + Dial, + Select, +} + interface MidiBindingViewProps extends WithStyles { instanceId: number; listen: boolean; @@ -53,13 +65,14 @@ interface MidiBindingViewProps extends WithStyles { interface MidiBindingViewState { + midiControlType: MidiControlType; } const MidiBindingView = - withStyles(styles, { withTheme: true })( + withStyles( class extends Component { model: PiPedalModel; @@ -68,37 +81,50 @@ const MidiBindingView = super(props); this.model = PiPedalModelFactory.getInstance(); this.state = { + midiControlType: this.getControlType() }; } - handleTypeChange(e: any, extra: any) { + handleBindingTypeChange(e: any, extra: any) { let newValue = parseInt(e.target.value); let newBinding = this.props.midiBinding.clone(); - newBinding.bindingType = newValue; + newBinding.setBindingType(newValue); + this.validateSwitchControlType(newBinding); this.props.onChange(this.props.instanceId, newBinding); } handleNoteChange(e: any, extra: any) { let newValue = parseInt(e.target.value); let newBinding = this.props.midiBinding.clone(); newBinding.note = newValue; + this.validateSwitchControlType(newBinding); this.props.onChange(this.props.instanceId, newBinding); } handleControlChange(e: any, extra: any) { let newValue = parseInt(e.target.value); let newBinding = this.props.midiBinding.clone(); newBinding.control = newValue; + this.validateSwitchControlType(newBinding); this.props.onChange(this.props.instanceId, newBinding); } handleLatchControlTypeChange(e: any, extra: any) { let newValue = parseInt(e.target.value); let newBinding = this.props.midiBinding.clone(); newBinding.switchControlType = newValue; + this.validateSwitchControlType(newBinding); + this.props.onChange(this.props.instanceId, newBinding); + } + handleTriggerControlTypeChange(e: any, extra: any) { + let newValue = parseInt(e.target.value); + let newBinding = this.props.midiBinding.clone(); + newBinding.switchControlType = newValue; + this.validateSwitchControlType(newBinding); this.props.onChange(this.props.instanceId, newBinding); } handleLinearControlTypeChange(e: any, extra: any) { let newValue = parseInt(e.target.value); let newBinding = this.props.midiBinding.clone(); newBinding.linearControlType = newValue; + this.validateSwitchControlType(newBinding); this.props.onChange(this.props.instanceId, newBinding); } handleMinChange(value: number): void { @@ -118,7 +144,7 @@ const MidiBindingView = } - generateMidiSelects(): React.ReactNode[] { + generateMidiNoteSelects(): React.ReactNode[] { let result: React.ReactNode[] = []; for (let i = 0; i < 127; ++i) { @@ -129,53 +155,82 @@ const MidiBindingView = return result; } + + validateSwitchControlType(midiBinding: MidiBinding) { + // :-( + + let controlType = this.state.midiControlType; + if (controlType === MidiControlType.Toggle + && midiBinding.bindingType === MidiBinding.BINDING_TYPE_NOTE) { + if (midiBinding.switchControlType !== MidiBinding.TRIGGER_ON_RISING_EDGE // Toggle on Note On. + && midiBinding.switchControlType !== MidiBinding.MOMENTARY_CONTROL_TYPE // Note on/Note off. + ) { + midiBinding.switchControlType = MidiBinding.TRIGGER_ON_RISING_EDGE; + } + } + + } generateControlSelects(): React.ReactNode[] { return Utility.validMidiControllers.map((control) => ( {control.displayName} - ) + ) ); } + getControlType(): MidiControlType { + + if (this.props.midiBinding.symbol === "__bypass") { + return MidiControlType.Toggle; + } + if (!this.props.uiPlugin) return MidiControlType.None; + + let port = this.props.uiPlugin.getControl(this.props.midiBinding.symbol); + + if (!port) return MidiControlType.None; + if (port.trigger_property) { + return MidiControlType.Trigger; + } + if (port.isAbToggle() || port.isOnOffSwitch()) { + return MidiControlType.Toggle; + } + if (port.isSelect()) { + return MidiControlType.Select; + } + return MidiControlType.Dial; + } render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let midiBinding = this.props.midiBinding; let uiPlugin = this.props.uiPlugin; if (!uiPlugin) { return (
); } + let controlType = this.state.midiControlType; + + let showLinearRange = + controlType === MidiControlType.Dial && + midiBinding.bindingType === MidiBinding.BINDING_TYPE_CONTROL + && midiBinding.linearControlType === MidiBinding.LINEAR_CONTROL_TYPE; + + + let canRotaryScale: boolean = + controlType === MidiControlType.Dial && + midiBinding.bindingType === MidiBinding.BINDING_TYPE_CONTROL + && midiBinding.linearControlType === MidiBinding.CIRCULAR_CONTROL_TYPE; + - let canLatch: boolean = false; - let canTrigger: boolean = false; - let showLinearControlTypeSelect: boolean = false; - let isBinaryControl: boolean = false; - let showLinearRange: boolean = false; - let canRotaryScale: boolean = false; - if (this.props.midiBinding.symbol === "__bypass") { - isBinaryControl = true; - canLatch = midiBinding.bindingType !== MidiBinding.BINDING_TYPE_NONE; - } else { - let port = nullCast(uiPlugin!.getControl(this.props.midiBinding.symbol)); - isBinaryControl = (port.isAbToggle() || port.isOnOffSwitch()); - if (midiBinding.bindingType !== MidiBinding.BINDING_TYPE_NONE) { - canLatch = isBinaryControl; - canTrigger = port.trigger_property; - showLinearControlTypeSelect = !(canLatch || canTrigger); - showLinearRange = showLinearControlTypeSelect && midiBinding.linearControlType === MidiBinding.LINEAR_CONTROL_TYPE; - canRotaryScale = showLinearControlTypeSelect && midiBinding.linearControlType === MidiBinding.CIRCULAR_CONTROL_TYPE; - } - } return (
this.handleNoteChange(e, extra)} value={midiBinding.note} - + > { - this.generateMidiSelects() + this.generateMidiNoteSelects() } { - if (this.props.listen) - { + onClick={() => { + if (this.props.listen) { this.props.onListen(-2, "", false) } else { this.props.onListen(this.props.instanceId, this.props.midiBinding.symbol, false) } }} size="large"> - { this.props.listen ? ( + {this.props.listen ? ( ) : ( - + )}
@@ -223,26 +277,25 @@ const MidiBindingView = style={{ width: 80 }} onChange={(e, extra) => this.handleControlChange(e, extra)} value={midiBinding.control} - renderValue={(value)=> { return "CC-" + value}} + renderValue={(value) => { return "CC-" + value }} > { this.generateControlSelects() } { - if (this.props.listen) - { + onClick={() => { + if (this.props.listen) { this.props.onListen(-2, "", false) } else { this.props.onListen(this.props.instanceId, this.props.midiBinding.symbol, true) } }} size="large"> - { this.props.listen ? ( + {this.props.listen ? ( ) : ( - + )} @@ -250,35 +303,58 @@ const MidiBindingView = ) } { - ((canLatch) && + ((controlType === MidiControlType.Toggle && midiBinding.bindingType === MidiBinding.BINDING_TYPE_NOTE) && + ( + +
+ +
+ )) + } + { + ((controlType === MidiControlType.Toggle && midiBinding.bindingType === MidiBinding.BINDING_TYPE_CONTROL) && + ( + +
+ +
+ )) + } + { + (controlType === MidiControlType.Trigger && midiBinding.bindingType === MidiBinding.BINDING_TYPE_CONTROL) && (
- )) - } - { - (canTrigger) && - ( -
- (Trigger) -
) } { - (showLinearControlTypeSelect) && + (controlType === MidiControlType.Dial && midiBinding.bindingType === MidiBinding.BINDING_TYPE_CONTROL) && (
@@ -298,8 +374,8 @@ const MidiBindingView =
Min:  { this.handleMinChange(value); } } - /> + min={0} max={1} onChange={(value) => { this.handleMinChange(value); }} + />
) } @@ -308,7 +384,7 @@ const MidiBindingView =
Max:  { this.handleMaxChange(value); } } /> + min={0} max={1} onChange={(value) => { this.handleMaxChange(value); }} />
) } @@ -317,7 +393,7 @@ const MidiBindingView =
Scale:  { this.handleScaleChange(value); } } /> + min={-100} max={100} onChange={(value) => { this.handleScaleChange(value); }} />
) } @@ -325,6 +401,7 @@ const MidiBindingView = ); } - }); + }, + styles); export default MidiBindingView; \ No newline at end of file diff --git a/react/src/MidiBindingsDialog.tsx b/vite/src/pipedal/MidiBindingsDialog.tsx similarity index 96% rename from react/src/MidiBindingsDialog.tsx rename to vite/src/pipedal/MidiBindingsDialog.tsx index 1fe9991..6810438 100644 --- a/react/src/MidiBindingsDialog.tsx +++ b/vite/src/pipedal/MidiBindingsDialog.tsx @@ -23,9 +23,10 @@ import ResizeResponsiveComponent from './ResizeResponsiveComponent'; import { PiPedalModel, PiPedalModelFactory, ListenHandle } from './PiPedalModel'; import Typography from '@mui/material/Typography'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import AppBar from '@mui/material/AppBar'; import Toolbar from '@mui/material/Toolbar'; import ArrowBackIcon from '@mui/icons-material/ArrowBack'; @@ -34,33 +35,34 @@ import MidiBinding from './MidiBinding'; import MidiBindingView from './MidiBindingView'; import Snackbar from '@mui/material/Snackbar'; import { UiPlugin,makeSplitUiPlugin } from './Lv2Plugin'; +import { css } from '@emotion/react'; const styles = (theme: Theme) => createStyles({ - dialogAppBar: { + dialogAppBar: css({ position: 'relative', top: 0, left: 0 - }, - dialogTitle: { + }), + dialogTitle: css({ marginLeft: theme.spacing(2), flex: "1 1 auto", - }, - pluginTable: { + }), + pluginTable: css({ border: "collapse", width: "100%", - }, - pluginHead: { + }), + pluginHead: css({ borderTop: "1pt #DDD solid", paddingLeft: 22, paddingRight: 22 - }, - bindingTd: { + }), + bindingTd: css({ verticalAlign: "top", paddingLeft: 12, paddingBottom: 8 - }, - nameTd: { + }), + nameTd: css({ paddingLeft: 48, verticalAlign: "top", paddingTop: 12 - }, + }), }); function not_null(value: T | null) { @@ -81,7 +83,7 @@ export interface MidiBindingDialogState { } export const MidiBindingDialog = - withStyles(styles, { withTheme: true })( + withStyles( class extends ResizeResponsiveComponent { model: PiPedalModel; @@ -105,7 +107,7 @@ export const MidiBindingDialog = this.props.onClose(); } - listenTimeoutHandle?: NodeJS.Timeout; + listenTimeoutHandle?: number; listenHandle?: ListenHandle; @@ -183,7 +185,7 @@ export const MidiBindingDialog = this.model.setMidiBinding(instanceId, newBinding); } generateTable(): React.ReactNode[] { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let result: React.ReactNode[] = []; let pedalboard = this.model.pedalboard.get(); @@ -317,7 +319,8 @@ export const MidiBindingDialog = render() { let props = this.props; - let { open, classes } = props; + let { open} = props; + const classes = withStyles.getClasses(props); if (!open) { return (
); } @@ -374,7 +377,8 @@ export const MidiBindingDialog = ); } - }); + }, + styles); export default MidiBindingDialog; \ No newline at end of file diff --git a/vite/src/pipedal/MidiChannelBinding.tsx b/vite/src/pipedal/MidiChannelBinding.tsx new file mode 100644 index 0000000..76feeeb --- /dev/null +++ b/vite/src/pipedal/MidiChannelBinding.tsx @@ -0,0 +1,51 @@ +// Copyright (c) 2024 Robin E. R. Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +export enum MidiDeviceSelection { + DeviceAny = 0, + DeviceNone = 1, + DeviceList = 2 +} + +export default class MidiChannelBinding { + deserialize(input: any) : MidiChannelBinding { + this.deviceSelection = input.deviceSelection; + this.midiDevices = input.midiDevices; + + this.channel = input.channel; + this.acceptProgramChanges = input.acceptProgramChanges; + this.acceptCommonMessages = input.acceptCommonMessages; + return this; + } + + clone() { return new MidiChannelBinding().deserialize(this);} + + deviceSelection: number = MidiDeviceSelection.DeviceAny as number; + midiDevices: string[] = []; + channel: number = -1; + acceptProgramChanges: boolean = true; + acceptCommonMessages: boolean = true; + + + static CreateMissingValue() : MidiChannelBinding { + let result = new MidiChannelBinding(); + return result; + } +} diff --git a/vite/src/pipedal/MidiChannelBindingControl.tsx b/vite/src/pipedal/MidiChannelBindingControl.tsx new file mode 100644 index 0000000..db7b086 --- /dev/null +++ b/vite/src/pipedal/MidiChannelBindingControl.tsx @@ -0,0 +1,141 @@ +// Copyright (c) 2024 Robin E. R. Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import React from 'react'; + +import { Component } from 'react'; +import { Theme } from '@mui/material/styles'; +import WithStyles, {withTheme} from './WithStyles'; +import { withStyles } from "tss-react/mui"; +import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel'; +import { pluginControlStyles } from './PluginControl'; +import MidiChannelBinding from './MidiChannelBinding'; +import Tooltip from '@mui/material/Tooltip'; +import Typography from '@mui/material/Typography'; +import Divider from '@mui/material/Divider'; +import ButtonBase from '@mui/material/ButtonBase'; +import MidiIcon from './svg/ic_midi.svg?react'; +import MidiChannelBindingDialog from './MidiChannelBindingDialog'; + + +export const StandardItemSize = { width: 80, height: 140 } + + + +export interface MidiChannelBindingControlProps extends WithStyles { + midiChannelBinding: MidiChannelBinding + theme: Theme; + onChange: (result: MidiChannelBinding) => void; +} +type MidiChannelBindingControlState = { + dialogOpen: boolean; +}; + +const MidiChannelBindingControl = + withTheme( + withStyles( + class extends Component { + model: PiPedalModel; + + constructor(props: MidiChannelBindingControlProps) { + super(props); + + this.state = { + dialogOpen: false + }; + this.model = PiPedalModelFactory.getInstance(); + + } + + render() { + const classes = withStyles.getClasses(this.props); + let item_width = 80; + return ( +
+ {/* TITLE SECTION */} +
+ + title + + Controls which MIDI messages get forward to the instrument. + + + )} + placement="top-start" arrow enterDelay={1500} enterNextDelay={1500} + > + MIDI + + +
+ {/* CONTROL SECTION */} + +
+ { + this.setState({dialogOpen: true}); + }} + sx={{ + ':hover': { + bgcolor: 'action.hover', // theme.palette.primary.main + color: 'white', + }, + }} + > + + +
+
+ OMNI +
+ {this.state.dialogOpen&&( + { this.setState({dialogOpen: false});}} + onChanged={(midiChannelBinding: MidiChannelBinding)=> {}} + midiDevices={[]} + + /> + + )} +
+ ); + } + }, + pluginControlStyles + )); + +export default MidiChannelBindingControl; + diff --git a/vite/src/pipedal/MidiChannelBindingDialog.tsx b/vite/src/pipedal/MidiChannelBindingDialog.tsx new file mode 100644 index 0000000..e3ba3d5 --- /dev/null +++ b/vite/src/pipedal/MidiChannelBindingDialog.tsx @@ -0,0 +1,201 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ + +// Copyright (c) 2024 Robin E. R. Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +import { useState } from 'react'; +import Button from '@mui/material/Button'; +import DialogTitle from '@mui/material/DialogTitle'; +import DialogActions from '@mui/material/DialogActions'; +import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel'; +import FormControlLabel from '@mui/material/FormControlLabel'; +import ChannelBindingHelpDialog from './ChannelBindingsHelpDialog'; + +import IconButton from '@mui/material/IconButton'; +import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined'; + +import Checkbox from '@mui/material/Checkbox'; +import { AlsaMidiDeviceInfo } from './AlsaMidiDeviceInfo'; +import DialogEx from './DialogEx'; +import MidiChannelBinding, { MidiDeviceSelection } from './MidiChannelBinding'; +import DialogContent from '@mui/material/DialogContent'; +import Typography from '@mui/material/Typography'; +import Select, { SelectChangeEvent } from '@mui/material/Select'; +import MenuItem from '@mui/material/MenuItem'; + + + +export interface MidiChannelBindingDialogProps { + open: boolean; + midiChannelBinding: MidiChannelBinding; + onClose: () => void; + onChanged: (midiChannelBinding: MidiChannelBinding) => void; + midiDevices: AlsaMidiDeviceInfo[]; +} + + + +function MidiChannelBindingDialog(props: MidiChannelBindingDialogProps) { + const { onClose, midiChannelBinding, open } = props; + + const [currentChannel, setCurrentChannel] = useState(midiChannelBinding.channel); + const [allowProgramChanges, setAllowProgramChanges] = useState(midiChannelBinding.acceptCommonMessages); + const [helpDialog, setHelpDialog] = useState(false); + + const model: PiPedalModel = PiPedalModelFactory.getInstance(); + + const handleClose = (): void => { + onClose(); + }; + const handleOk = (): void => { + onClose(); + }; + + const generateDeviceSelect = () => { + let result: React.ReactElement[] = [ + (Any), + (None) + ]; + let i = 2; + for (let midiDevice of model.jackConfiguration.get().inputMidiDevices) { + result.push(({midiDevice.description})); + ++i; + } + return result; + }; + + const getDefaultDeviceSelect = (): number => { + if (midiChannelBinding.deviceSelection === MidiDeviceSelection.DeviceAny as number) { + return 0; + } + if (midiChannelBinding.deviceSelection === MidiDeviceSelection.DeviceNone as number) { + return 1; + } + if (midiChannelBinding.midiDevices.length === 0) { + return 0; + } + let selectedDevice = midiChannelBinding.midiDevices[0]; + + let ix = 2; + for (let midiDevice of model.jackConfiguration.get().inputMidiDevices) { + if (midiDevice.name === selectedDevice) { + return ix; + } + ++ix; + } + return 0; // any. + } + + const [currentDeviceSelect, setCurrentDeviceSelect] = useState(getDefaultDeviceSelect()) + + + const handleDeviceSelecChange = (event: SelectChangeEvent) => { + setCurrentDeviceSelect(parseInt(event.target.value)); + }; + const handleChannelChange = (event: SelectChangeEvent) => { + setCurrentChannel(parseInt(event.target.value)); + }; + + return ( + {}} fullWidth maxWidth="xs" + > + MIDI Channel Filters + +
+
+ MIDI Devices + +
+ +
+ Channels + +
+ +
+ { + setAllowProgramChanges(event.target.checked); + }} + /> + } label="Allow Program Changes" + /> + {false&&( // wait until the implementation stabilizes before exposing the help dialog. + { setHelpDialog(true); }} + size="large"> + + + )} +
+ +
+ + + + + + + + setHelpDialog(false)} + /> + + ); +} + +export default MidiChannelBindingDialog; diff --git a/react/src/ModFileTypes.tsx b/vite/src/pipedal/ModFileTypes.tsx similarity index 94% rename from react/src/ModFileTypes.tsx rename to vite/src/pipedal/ModFileTypes.tsx index 2624106..a03960f 100644 --- a/react/src/ModFileTypes.tsx +++ b/vite/src/pipedal/ModFileTypes.tsx @@ -38,8 +38,8 @@ export const modDirectories: ModDirectory[] = [ {modType: "ir", pipedalPath: "ReverbImpulseFiles", displayName: "Impulse Responses", defaultFileExtensions: ["audio/*"]}, // Impulse Responses {modType: "midiclip", pipedalPath: "shared/midiClips",displayName: "MIDI Clips", defaultFileExtensions: [".mid", ".midi"]}, // MIDI Clips, to be used in sync with host tempo, must have mid or midi file extension {modType: "midisong", pipedalPath: "shared/midiSongs", displayName: "MIDI Songs", defaultFileExtensions: [".mid", ".midi"]}, // MIDI Songs, meant to be used as full-performance/song or backtrack - {modType: "sf2", pipedalPath: "shared/sf2",displayName: "Sound Fonts", defaultFileExtensions: ["sf2", "sf3"]}, // SF2 Instruments, must have sf2 or sf3 file extension - {modType: "sfz", pipedalPath: "shared/sfz",displayName: "Sfz Files", defaultFileExtensions: ["sfz"]}, // SFZ Instruments, must have sfz file extension + {modType: "sf2", pipedalPath: "shared/sf2",displayName: "Sound Fonts", defaultFileExtensions: [".sf2", ".sf3"]}, // SF2 Instruments, must have sf2 or sf3 file extension + {modType: "sfz", pipedalPath: "shared/sfz",displayName: "Sfz Files", defaultFileExtensions: [".sfz"]}, // SFZ Instruments, must have sfz file extension // extensions observed in the field. {modType: "audio", pipedalPath: "shared/audio", displayName: "Audio", defaultFileExtensions: ["audio/*"]}, // all audio files (Ratatoille) {modType: "nammodel", pipedalPath: "NeuralAmpModels", displayName: "Neural Amp Models", defaultFileExtensions: [".nam"]}, // Ratatoille, Mike's NAM. diff --git a/react/src/NoChangePassword.tsx b/vite/src/pipedal/NoChangePassword.tsx similarity index 100% rename from react/src/NoChangePassword.tsx rename to vite/src/pipedal/NoChangePassword.tsx diff --git a/react/src/NumericInput.tsx b/vite/src/pipedal/NumericInput.tsx similarity index 95% rename from react/src/NumericInput.tsx rename to vite/src/pipedal/NumericInput.tsx index 961ef4a..73e50d6 100644 --- a/react/src/NumericInput.tsx +++ b/vite/src/pipedal/NumericInput.tsx @@ -19,9 +19,10 @@ import React, { Component } from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import Input from '@mui/material/Input'; @@ -45,7 +46,7 @@ interface NumericInputState { } export const NumericInput = - withStyles(styles, { withTheme: true })( + withStyles( class extends Component { @@ -129,7 +130,7 @@ export const NumericInput = render() { - //let classes = this.props.classes; + //const classes = withStyles.getClasses(this.props); return ( createStyles({ -}); -interface PedalProps extends WithStyles { +interface PedalProps { plugin: Lv2Plugin; - children?: React.ReactChild | React.ReactChild[]; + children?: React.ReactNode; } @@ -39,7 +33,7 @@ type PedalState = { }; -export const TemporaryDrawer = withStyles(pedalStyles)( +export const TemporaryDrawer = class extends Component { state: PedalState; @@ -57,5 +51,4 @@ export const TemporaryDrawer = withStyles(pedalStyles)( ); } - } -); \ No newline at end of file + }; \ No newline at end of file diff --git a/react/src/Pedalboard.tsx b/vite/src/pipedal/Pedalboard.tsx similarity index 98% rename from react/src/Pedalboard.tsx rename to vite/src/pipedal/Pedalboard.tsx index f1d6faf..ce7ad12 100644 --- a/react/src/Pedalboard.tsx +++ b/vite/src/pipedal/Pedalboard.tsx @@ -19,6 +19,7 @@ import { PiPedalArgumentError } from './PiPedalError'; import MidiBinding from './MidiBinding'; +import MidiChannelBinding from './MidiChannelBinding'; const SPLIT_PEDALBOARD_ITEM_URI = "uri://two-play/pipedal/pedalboard#Split"; @@ -64,6 +65,12 @@ export class PedalboardItem implements Deserializable { this.pluginName = input.pluginName; this.isEnabled = input.isEnabled; this.midiBindings = MidiBinding.deserialize_array(input.midiBindings); + if (input.midiChannelBinding) + { + this.midiChannelBinding = input.midiChannelBinding; + } else { + this.midiChannelBinding = null; + } this.controlValues = ControlValue.deserializeArray(input.controlValues); this.vstState = input.vstState ?? ""; @@ -197,6 +204,7 @@ export class PedalboardItem implements Deserializable { pluginName?: string; controlValues: ControlValue[] = ControlValue.EmptyArray; midiBindings: MidiBinding[] = []; + midiChannelBinding: MidiChannelBinding | null = null; vstState: string = ""; stateUpdateCount: number = 0; lv2State: [boolean,any] = [false,{}]; diff --git a/vite/src/pipedal/PedalboardView.tsx b/vite/src/pipedal/PedalboardView.tsx new file mode 100644 index 0000000..c1fa5fe --- /dev/null +++ b/vite/src/pipedal/PedalboardView.tsx @@ -0,0 +1,1292 @@ +// Copyright (c) 2022 Robin Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import React, { ReactNode, Component, SyntheticEvent } from 'react'; +import { css } from '@emotion/react'; +import {createStyles} from './WithStyles'; + +import WithStyles, {withTheme} from './WithStyles'; +import { withStyles } from "tss-react/mui"; + + +import { Theme } from '@mui/material/styles'; +import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel'; +import { PluginType } from './Lv2Plugin'; +import ButtonBase from '@mui/material/ButtonBase'; +import Typography from '@mui/material/Typography'; +import PluginIcon, { SelectIconUri } from './PluginIcon'; +import { SelectHoverBackground } from './SelectHoverBackground'; +import SvgPathBuilder from './SvgPathBuilder'; +import Draggable from './Draggable' +import Rect from './Rect'; +import { PiPedalStateError } from './PiPedalError'; +import Utility from './Utility'; +import { isDarkMode } from './DarkMode'; +import { + Pedalboard, PedalboardItem, PedalboardSplitItem, SplitType +} from './Pedalboard'; + +import MidiIcon from './svg/ic_midi.svg?react'; + + +const START_CONTROL = Pedalboard.START_CONTROL; +const END_CONTROL = Pedalboard.END_CONTROL; + + +const START_PEDALBOARD_ITEM_URI = Pedalboard.START_PEDALBOARD_ITEM_URI; +const END_PEDALBOARD_ITEM_URI = Pedalboard.END_PEDALBOARD_ITEM_URI; + +const ENABLED_CONNECTOR_COLOR = isDarkMode() ? "#CCC" : "#666"; +const DISABLED_CONNECTOR_COLOR = isDarkMode() ? "#666" : "#CCC"; + + + +const CELL_WIDTH: number = 96; +const CELL_HEIGHT: number = 64; +const FRAME_SIZE: number = 36; + +const STROKE_WIDTH = 3; +const STEREO_STROKE_WIDTH = 6; + + +const I_SVG_STROKE_WIDTH = 3; +const I_SVG_STEREO_STROKE_WIDTH = 6; + +const SVG_STROKE_WIDTH = I_SVG_STROKE_WIDTH.toString(); +const SVG_STEREO_STROKE_WIDTH = I_SVG_STEREO_STROKE_WIDTH.toString(); + + + +const EMPTY_ICON_URL = "img/fx_empty.svg"; +const ERROR_ICON_URL = "img/fx_error.svg"; +const TERMINAL_ICON_URL = "img/fx_terminal.svg"; + +function CalculateConnection(numberOfInputs: number, numberOfOutputs: number) { + if (numberOfInputs === 0) { + return numberOfOutputs; + } + if (numberOfOutputs === 0) { + return numberOfInputs; + } + let result = Math.min(numberOfInputs, numberOfOutputs); + if (result > 2) result = 2; + return result; +} + +const pedalboardStyles = (theme: Theme) => createStyles({ + scrollContainer: { + }, + + container: css({ + position: "relative", + overflow: "visible", + + }), + splitItem: css({ + position: "absolute", + display: "flex", + alignItems: "center", + justifyContent: "center", + + + width: CELL_WIDTH, + height: CELL_HEIGHT + + }), + splitStart: css({ + position: "absolute", + display: "flex", + width: CELL_WIDTH, + height: CELL_HEIGHT, + left: 0, + top: 0 + }), + splitEnd: css({ + position: "absolute", + display: "flex", + width: CELL_WIDTH, + height: CELL_HEIGHT, + right: 0, + top: 0 + }), + buttonDraggable: css({ + display: "flex", + alignItem: "center", + justifyContent: "center", + width: "100%", + height: "100%" + }), + pedalItem: css({ + position: "absolute", + width: CELL_WIDTH, + height: CELL_HEIGHT, + display: "flex", + alignItems: "center", + justifyContent: "center", + }), + midiConnectorDecoration: css({ + position: "absolute", + left: -20, + top: -6, + fill: theme.palette.text.secondary + }), + iconFrame: css({ + + display: "flex", + alignItems: "center", + justifyContent: "center", + position: "relative", + + background: theme.palette.background.default, + marginLeft: (CELL_WIDTH - FRAME_SIZE) / 2, + marginRight: (CELL_WIDTH - FRAME_SIZE) / 2, + marginTop: (CELL_HEIGHT - FRAME_SIZE) / 2, + marginBottom: (CELL_HEIGHT - FRAME_SIZE) / 2, + width: FRAME_SIZE, + height: FRAME_SIZE, + border: isDarkMode() ? "1pt #AAA solid" : "1pt #666 solid", + borderRadius: 6 + }), + borderlessIconFrame: css({ + + display: "flex", + alignItems: "center", + justifyContent: "center", + + background: "transparent", + marginLeft: (CELL_WIDTH - FRAME_SIZE) / 2, + marginRight: (CELL_WIDTH - FRAME_SIZE) / 2, + marginTop: (CELL_HEIGHT - FRAME_SIZE) / 2, + marginBottom: (CELL_HEIGHT - FRAME_SIZE) / 2, + width: FRAME_SIZE, + height: FRAME_SIZE, + border: "0pt #666 solid", + borderRadius: 6 + }), + + pedalIcon: css({ + width: 24, + height: 24, + opacity: 0.8 + }), + connector: css({ + position: "absolute", + width: CELL_WIDTH, + height: CELL_HEIGHT + }), + stroke: css({ + position: "absolute", + background: "#888" + }), + stereoStrokeOuter: css({ + position: "absolute", + background: "#888" + }), + stereoStrokeInner: css({ + position: "absolute", + background: "#888" + }), + +}); + +export type OnSelectHandler = (selectedPedal: number) => void; + +interface PedalboardProps extends WithStyles { + theme: Theme; + selectedId?: number; + onSelectionChanged?: OnSelectHandler; + onDoubleClick?: OnSelectHandler; + hasTinyToolBar: boolean; + enableStructureEditing: boolean; + +} +interface LayoutSize { + width: number; + height: number; +} + +type PedalboardState = { + pedalboard?: Pedalboard; +}; + +const EMPTY_PEDALS: PedalLayout[] = []; + + +function makeChain(model: PiPedalModel, uiItems?: PedalboardItem[]): PedalLayout[] { + let result: PedalLayout[] = []; + if (uiItems) { + for (let i = 0; i < uiItems.length; ++i) { + let item = uiItems[i]; + result.push(new PedalLayout(model, item)); + } + } + return result; +} + +class PedalLayout { + uri: string = ""; + name: string = ""; + pluginType: PluginType = PluginType.Plugin; + iconUrl: string = ""; + + bounds: Rect = new Rect(); + + numberOfInputs: number = 2; + numberOfOutputs: number = 2; + originalInputs: number = 2; + originalOutputs: number = 2; + + pedalItem?: PedalboardItem; + + // Split Layout only. + topChildren: PedalLayout[] = EMPTY_PEDALS; + bottomChildren: PedalLayout[] = EMPTY_PEDALS; + topConnectorY: number = 0; + bottomConnectorY: number = 0; + + + static Start(): PedalLayout { + let t: PedalLayout = new PedalLayout(); + t.uri = START_PEDALBOARD_ITEM_URI; + t.pluginType = PluginType.Terminal; + t.iconUrl = TERMINAL_ICON_URL; + t.numberOfInputs = 0; + t.numberOfOutputs = 2; + return t; + } + static End(): PedalLayout { + let t: PedalLayout = new PedalLayout(); + t.pluginType = PluginType.Terminal; + t.uri = END_PEDALBOARD_ITEM_URI; + t.iconUrl = TERMINAL_ICON_URL; + t.numberOfInputs = 2; + t.numberOfOutputs = 0; + return t; + } + constructor(model?: PiPedalModel, pedalItem?: PedalboardItem) { + if (model === undefined && pedalItem === undefined) { + return; + } + if (model === undefined || pedalItem === undefined) { + throw new Error("Invalid arguments."); + } + this.pedalItem = pedalItem; + this.uri = pedalItem.uri; + if (pedalItem.isSplit()) { + let splitter = pedalItem as PedalboardSplitItem; + + this.pluginType = PluginType.UtilityPlugin; + this.topChildren = makeChain(model, splitter.topChain); + this.bottomChildren = makeChain(model, splitter.bottomChain); + + this.numberOfInputs = 2; + this.numberOfOutputs = 2; + + } else if (pedalItem.isEmpty()) { + + this.pluginType = PluginType.None; + this.iconUrl = EMPTY_ICON_URL; + this.numberOfInputs = 2; + this.numberOfOutputs = 2; + + } else if (pedalItem.uri === START_PEDALBOARD_ITEM_URI) { + this.pluginType = PluginType.UtilityPlugin; + this.iconUrl = TERMINAL_ICON_URL; + this.numberOfInputs = 0; + this.numberOfOutputs = PiPedalModelFactory.getInstance().jackSettings.get().inputAudioPorts.length; + if (this.numberOfOutputs === 0) { + this.numberOfOutputs = 1; + } + + } else if (pedalItem.uri === END_PEDALBOARD_ITEM_URI) { + this.pluginType = PluginType.UtilityPlugin; + this.iconUrl = TERMINAL_ICON_URL; + this.numberOfInputs = PiPedalModelFactory.getInstance().jackSettings.get().outputAudioPorts.length; + if (this.numberOfInputs === 0) { + this.numberOfInputs = 1; + } + this.numberOfOutputs = 0; + } + else { + let uiPlugin = model.getUiPlugin(pedalItem.uri); + if (uiPlugin != null) { + this.pluginType = uiPlugin.plugin_type; + this.iconUrl = SelectIconUri(uiPlugin.plugin_type); + this.name = uiPlugin.label; + this.numberOfInputs = Math.min(uiPlugin.audio_inputs, 2); + this.numberOfOutputs = Math.min(uiPlugin.audio_outputs, 2); + } else { + // default to empty plugin. + this.pluginType = PluginType.ErrorPlugin; + this.name = pedalItem.pluginName ?? "#error"; + this.iconUrl = ERROR_ICON_URL; + this.numberOfInputs = 2; + this.numberOfOutputs = 2; + } + } + this.originalInputs = this.numberOfInputs; + this.originalOutputs = this.numberOfOutputs; + } + isEmpty(): boolean { + return (!this.pedalItem) || this.pedalItem.isEmpty(); + } + isSplitter(): boolean { + return this.pedalItem !== undefined && this.pedalItem.isSplit(); + } + isStart() { + return this.uri === START_PEDALBOARD_ITEM_URI; + } + isEnd() { + return this.uri === END_PEDALBOARD_ITEM_URI; + } +} + +function* chainIterator(layoutChain: PedalLayout[]): Generator { + for (let i = 0; i < layoutChain.length; ++i) { + let item = layoutChain[i]; + yield item; + if (item.isSplitter()) { + let g = chainIterator(item.topChildren); + while (true) { + let v = g.next(); + if (v.done) { + break; + } + yield v.value; + } + g = chainIterator(item.bottomChildren); + while (true) { + let v = g.next(); + if (v.done) { + break; + } + yield v.value; + } + } + } + return; +} + + + +class LayoutParams { + nextId: number = 1; + cx: number = 0; + cy: number = 0; +} + + +const PedalboardView = +withTheme( +withStyles( + class extends Component { + model: PiPedalModel; + + frameRef: React.RefObject; + scrollRef: React.RefObject; + private bgColor: string; + + constructor(props: PedalboardProps) { + super(props); + this.model = PiPedalModelFactory.getInstance(); + + this.bgColor = props.theme.palette.background.default + + if (!props.selectedId) props.selectedId = -1; + this.state = { + pedalboard: this.model.pedalboard.get(), + }; + this.onPedalboardChanged = this.onPedalboardChanged.bind(this); + this.frameRef = React.createRef(); + this.scrollRef = React.createRef(); + this.handleTouchStart = this.handleTouchStart.bind(this); + } + + handleTouchStart(e: any) { + // just has to exist to allow Draggable to receive + // touchyMove. :-/ + } + + onDragEnd(instanceId: number, clientX: number, clientY: number) { + if (!this.props.enableStructureEditing) { + return; + } + if (!this.currentLayout) return; + + if (!this.frameRef.current) return; + + let currentLayout: PedalLayout[] = this.currentLayout; + let frameElement = this.frameRef.current; + + let rc = frameElement.getBoundingClientRect(); + clientX -= rc.left; + clientY -= rc.top; + + let it = chainIterator(currentLayout); + + while (true) { + let v = it.next(); + if (v.done) break; + let item = v.value; + + if (item.isSplitter() && item.pedalItem) { + if (item.bounds.contains(clientX, clientY)) { + if (clientX < item.bounds.x + CELL_WIDTH / 2) { + this.model.movePedalboardItemBefore(instanceId, item.pedalItem.instanceId); + this.setSelection(instanceId); + return; + } else if (clientX > item.bounds.right - CELL_WIDTH / 2) { + this.model.movePedalboardItemAfter(instanceId, item.pedalItem.instanceId); + this.setSelection(instanceId); + return; + + } + } + let yMid = (item.bounds.y + item.bounds.bottom) / 2; + if (clientX >= item.bounds.x + && clientY < yMid && clientY >= item.topChildren[0].bounds.y + + ) { + if (clientX < item.topChildren[0].bounds.x) { + let topPedalItem = item.topChildren[0].pedalItem; + if (topPedalItem) { + this.model.movePedalboardItemBefore(instanceId, topPedalItem.instanceId); + this.setSelection(instanceId); + return; + } + } + let lastTop = item.topChildren[item.topChildren.length - 1]; + if (clientX >= lastTop.bounds.right && clientX < item.bounds.right - CELL_WIDTH / 2) { + if (lastTop.pedalItem) { + this.model.movePedalboardItemAfter(instanceId, lastTop.pedalItem.instanceId); + this.setSelection(instanceId); + return; + } + } + + } + if (clientX >= item.bounds.x + && clientY > yMid && clientY < item.bottomChildren[0].bounds.bottom + ) { + if (clientX < item.bottomChildren[0].bounds.x) { + let bottomPedalItem = item.bottomChildren[0].pedalItem; + if (bottomPedalItem) { + this.model.movePedalboardItemBefore(instanceId, bottomPedalItem.instanceId); + this.setSelection(instanceId); + return; + } + } + let lastBottom = item.bottomChildren[item.bottomChildren.length - 1]; + if (clientX >= lastBottom.bounds.right && clientX < item.bounds.right - CELL_WIDTH / 2) { + if (lastBottom.pedalItem) { + this.model.movePedalboardItemAfter(instanceId, lastBottom.pedalItem.instanceId); + this.setSelection(instanceId); + return; + } + + } + + } + + } else if (item.bounds.contains(clientX, clientY)) { + if (item.isStart()) { + this.model.movePedalboardItemToStart(instanceId); + this.setSelection(instanceId); + return; + } else if (item.isEnd()) { + this.model.movePedalboardItemToEnd(instanceId); + this.setSelection(instanceId); + return; + } else { + if (item.pedalItem) { + let margin = (CELL_WIDTH - FRAME_SIZE) / 2; + if (clientX < item.bounds.x + margin) { + this.model.movePedalboardItemBefore(instanceId, item.pedalItem.instanceId); + } else if (clientX > item.bounds.right - margin) { + this.model.movePedalboardItemAfter(instanceId, item.pedalItem.instanceId); + } else { + this.model.movePedalboardItem(instanceId, item.pedalItem.instanceId); + } + this.setSelection(instanceId); + return; + } + } + + } + } + // delete the plugin. + let newId = this.model.setPedalboardItemEmpty(instanceId); + this.setSelection(newId); + + } + + onPedalboardChanged(value?: Pedalboard) { + this.setState({ pedalboard: value }); + } + + componentDidMount() { + this.scrollRef.current!.addEventListener("touchstart", this.handleTouchStart, { passive: false }); + this.model.pedalboard.addOnChangedHandler(this.onPedalboardChanged); + + } + componentWillUnmount() { + this.scrollRef.current!.removeEventListener("touchstart", this.handleTouchStart); + this.model.pedalboard.removeOnChangedHandler(this.onPedalboardChanged); + } + + offsetLayout_(layoutItems: PedalLayout[], offset: number): void { + for (let i = 0; i < layoutItems.length; ++i) { + let layoutItem = layoutItems[i]; + layoutItem.bounds.y += offset; + if (layoutItem.isSplitter()) { + layoutItem.topConnectorY += offset; + layoutItem.bottomConnectorY += offset; + this.offsetLayout_(layoutItem.topChildren, offset); + this.offsetLayout_(layoutItem.bottomChildren, offset); + } + } + } + + getSplitterIcon(layoutItem: PedalLayout): PluginType { + if (layoutItem.pedalItem === undefined) { + throw new Error("Invalid splitter"); + } + let split = layoutItem.pedalItem as PedalboardSplitItem; + if (split.getSplitType() === SplitType.Ab) { + if (split.isASelected()) { + return PluginType.SplitA; + } else { + return PluginType.SplitB; + + } + } else if (split.getSplitType() === SplitType.Mix) { + return PluginType.SplitMix; //"img/fx_dial.svg"; + } else { + return PluginType.SplitLR; //"img/fx_lr.svg"; + } + } + + doLayout2_(lp: LayoutParams, layoutItems: PedalLayout[]): Rect { + let bounds = new Rect(); + for (let i = 0; i < layoutItems.length; ++i) { + let layoutItem = layoutItems[i]; + if (layoutItem.isSplitter()) { + let x0 = lp.cx; + let y0 = lp.cy; + + layoutItem.bounds.x = x0; + layoutItem.bounds.y = y0; + layoutItem.bounds.height = CELL_HEIGHT; + layoutItem.bounds.width = CELL_WIDTH; + + lp.cx += CELL_WIDTH; + + + let topBounds = this.doLayout2_(lp, layoutItem.topChildren); + if (topBounds.isEmpty()) { + topBounds.x = lp.cx; + topBounds.width = 0; + topBounds.y = y0 - CELL_HEIGHT / 2; + topBounds.height = CELL_HEIGHT; + + } + + + let dyTop = (lp.cy + CELL_HEIGHT / 2) - (topBounds.y + topBounds.height); + + + + this.offsetLayout_(layoutItem.topChildren, dyTop); + topBounds.offset(0, dyTop); + bounds.accumulate(topBounds); + + let topCx = lp.cx; + lp.cx = x0; + lp.cx += CELL_WIDTH; + + let bottomBounds = this.doLayout2_(lp, layoutItem.bottomChildren); + if (bottomBounds.isEmpty()) { + bottomBounds.x = lp.cx; bottomBounds.width = 0; + bottomBounds.y = lp.cy; bottomBounds.height = CELL_HEIGHT; + } + + let dyBottom = (lp.cy + CELL_HEIGHT / 2) - bottomBounds.y; + this.offsetLayout_(layoutItem.bottomChildren, dyBottom) + bottomBounds.offset(0, dyBottom); + bounds.accumulate(bottomBounds); + + lp.cx = Math.max(lp.cx, topCx) + CELL_WIDTH; + lp.cy = y0; + + layoutItem.bounds.width = lp.cx - layoutItem.bounds.x; + bounds.accumulate(layoutItem.bounds); + + if (layoutItem.topChildren.length === 0) { + layoutItem.topConnectorY = bounds.y + CELL_HEIGHT / 2; + } else { + layoutItem.topConnectorY = layoutItem.topChildren[0].bounds.y + CELL_HEIGHT / 2; + } + if (layoutItem.bottomChildren.length === 0) { + layoutItem.bottomConnectorY = bounds.y + bounds.height - CELL_HEIGHT / 2; + } else { + layoutItem.bottomConnectorY = layoutItem.bottomChildren[0].bounds.y + CELL_HEIGHT / 2; + } + } else { + layoutItem.bounds.x = lp.cx; + layoutItem.bounds.y = lp.cy; + lp.cx += CELL_WIDTH; + layoutItem.bounds.width = CELL_WIDTH; + layoutItem.bounds.height = CELL_HEIGHT; + bounds.accumulate(layoutItem.bounds); + + } + } + return bounds; + } + doLayout(layoutItems: PedalLayout[]): LayoutSize { + const TWO_ROW_HEIGHT = 142 - 14; + + if (layoutItems.length === 0) { + // if the current pedalboard is empty, reserve display space anyway. + return { width: 1, height: TWO_ROW_HEIGHT }; + } + + let lp = new LayoutParams(); + + let bounds = this.doLayout2_(lp, layoutItems); + // shift everything down so there are no negative y coordinates. + + if (bounds.height < TWO_ROW_HEIGHT) { + + let extra = Math.floor((TWO_ROW_HEIGHT - Math.ceil(bounds.height)) / 2); + this.offsetLayout_(layoutItems, Math.floor(-bounds.y + extra / 2)); + bounds.height += extra; + + } else { + this.offsetLayout_(layoutItems, -bounds.y); + } + + bounds.height += 14; // for labels that aren't accounted for. + return { width: bounds.width, height: bounds.height }; + + } + + onItemClick(e: SyntheticEvent, instanceId?: number): void { + if (instanceId) { + this.setSelection(instanceId); + } + } + setSelection(instanceId: number) { + if (this.props.onSelectionChanged) { + this.props.onSelectionChanged(instanceId); + } + } + + onItemDoubleClick(event: SyntheticEvent, instanceId?: number): void { + event.preventDefault(); + event.stopPropagation(); + + if (this.props.onDoubleClick && instanceId && this.props.enableStructureEditing) { + this.props.onDoubleClick(instanceId); + } + + } + + onItemLongClick(event: SyntheticEvent, instanceId?: number): void { + if (!instanceId) { + return; + } + event.preventDefault(); + event.stopPropagation(); + + if (!this.props.enableStructureEditing) { + this.setSelection(instanceId); + return; + } + if (!Utility.needsZoomedControls()) { + if (this.props.onDoubleClick && this.props.enableStructureEditing && instanceId) { + this.props.onDoubleClick(instanceId); + } + } + + } + + strokeConnector(output: ReactNode[], channels: number, enabled: Boolean, svgPath: string) { + let color = enabled ? ENABLED_CONNECTOR_COLOR : DISABLED_CONNECTOR_COLOR; + + if (channels === 2) { + output.push(( + + )); + output.push(( + + )); + } else if (channels === 1) { + output.push(( + + )); + } + } + + renderConnector(output: ReactNode[], item: PedalLayout, enabled: boolean): void { + // const classes = withStyles.getClasses(this.props); + let x_ = item.bounds.x + CELL_WIDTH / 2; + let y_ = item.bounds.y + CELL_HEIGHT / 2; + let numberOfOutputs = item.numberOfOutputs; + let color = enabled ? ENABLED_CONNECTOR_COLOR : DISABLED_CONNECTOR_COLOR; + let stereoCenterColor = this.bgColor; + + if (item.originalInputs === 0) { + // break the input paths. + let rx = item.bounds.x + CELL_WIDTH / 2 - FRAME_SIZE / 2 - 4; + let ry = y_ - 4; + + output.push(( + + )); + } + let svgPath = new SvgPathBuilder().moveTo(x_, y_).lineTo(x_ + CELL_WIDTH, y_).toString(); + + + if (numberOfOutputs === 2) { + output.push(( + + )); + output.push(( + + )); + } else if (numberOfOutputs === 1) { + output.push(( + + )); + } else { + output.push(( + + )); + + } + } + renderSplitConnectors(output: ReactNode[], item: PedalLayout, enabled: boolean, shortSplitOutput: boolean,): void { + //const classes = withStyles.getClasses(this.props); + let x_ = item.bounds.x + CELL_WIDTH / 2; + let y_ = item.bounds.y + CELL_HEIGHT / 2; + let yTop = item.topConnectorY; + let yBottom = item.bottomConnectorY; + //let isStereo = item.stereoOutput; + let split = item.pedalItem as PedalboardSplitItem; + + let topEnabled = enabled && split.isASelected(); + let bottomEnabled = enabled && split.isBSelected(); + let topColor = topEnabled ? ENABLED_CONNECTOR_COLOR : DISABLED_CONNECTOR_COLOR; + let bottomColor = bottomEnabled ? ENABLED_CONNECTOR_COLOR : DISABLED_CONNECTOR_COLOR; + + + let topStartPath = new SvgPathBuilder().moveTo(x_, y_).lineTo(x_, yTop).lineTo(x_ + CELL_WIDTH, yTop).toString(); + let bottomStartPath = new SvgPathBuilder().moveTo(x_, y_).lineTo(x_, yBottom).lineTo(x_ + CELL_WIDTH, yBottom).toString(); + + if (item.numberOfInputs === 2 && item.topChildren[0].numberOfInputs === 2) { + output.push(()); + output.push(()); + } else if (item.numberOfInputs !== 0 && item.topChildren[0].numberOfInputs !== 0) { + output.push(()); + } + + if (item.numberOfInputs === 2 && item.bottomChildren[0].numberOfInputs === 2) { + output.push(()); + output.push(()); + + } else if (item.numberOfInputs !== 0 && item.bottomChildren[0].numberOfInputs !== 0) { + output.push(()); + } + + let lastTop = item.topChildren[item.topChildren.length - 1]; + let lastBottom = item.bottomChildren[item.bottomChildren.length - 1]; + + let xTop = lastTop.bounds.right - CELL_WIDTH / 2; + let xBottom = lastBottom.bounds.right - CELL_WIDTH / 2; + + let xEnd = shortSplitOutput ? item.bounds.right : item.bounds.right + CELL_WIDTH / 2; + let xTee0 = item.bounds.right - CELL_WIDTH / 2; + + let firstPath: string; // top or bottom depending on draw order. + let secondPath: string; // top or bottom depending on draw order. + + let firstPathStereo: boolean; + let secondPathStereo: boolean; + let firstPathAbsent: boolean; + let secondPathAbsent: boolean; + let firstPathEnabled: boolean; + let secondPathEnabled: boolean; + let xTee: number; + + let monoAdjustment = (STEREO_STROKE_WIDTH - STROKE_WIDTH) / 2; + + let bottomPathFirst = topEnabled && !bottomEnabled; + let topPathFirst = bottomEnabled && !topEnabled; + + + // Third case: L/R stereo output, when both outputs are mono, requires a third stroke. + let thirdPath: string | null = null; // for L/R stereo output (which can be stereo even if both outputs are mono) + let hasThirdPath = item.numberOfOutputs === 2 && (lastTop.numberOfOutputs !== 2) && (lastBottom.numberOfOutputs !== 2); + + if (hasThirdPath) { + firstPathStereo = false; + secondPathStereo = false; + firstPathAbsent = lastTop.numberOfOutputs === 0 || item.numberOfOutputs === 0; + secondPathAbsent = lastBottom.numberOfOutputs === 0 || item.numberOfOutputs === 0; + xTee = xTee0 - monoAdjustment; + firstPath = new SvgPathBuilder().moveTo(xBottom, yBottom).lineTo(xTee, yBottom).lineTo(xTee, y_).toString(); + + secondPath = new SvgPathBuilder().moveTo(xTop, yTop).lineTo(xTee, yTop).lineTo(xTee, y_).toString(); + + hasThirdPath = true; + thirdPath = new SvgPathBuilder().moveTo(xTee0, y_).lineTo(xEnd, y_).toString(); + firstPathEnabled = bottomEnabled; + secondPathEnabled = topEnabled; + } else if (bottomPathFirst || (topEnabled && lastTop.numberOfOutputs === 2)) { + // draw the bottom path first. + firstPathStereo = item.numberOfOutputs === 2 && lastBottom.numberOfOutputs === 2; + secondPathStereo = item.numberOfOutputs === 2 && lastTop.numberOfOutputs === 2; + firstPathAbsent = item.numberOfOutputs === 0 || lastBottom.numberOfOutputs === 0; + secondPathAbsent = item.numberOfOutputs === 0 || lastTop.numberOfOutputs === 0; + + xTee = firstPathStereo ? xTee0 : xTee0 - monoAdjustment; + firstPath = new SvgPathBuilder().moveTo(xBottom, yBottom).lineTo(xTee, yBottom).lineTo(xTee, y_).toString(); + xTee = secondPathStereo ? xTee0 : xTee0 - monoAdjustment; + + secondPath = new SvgPathBuilder().moveTo(xTop, yTop).lineTo(xTee, yTop).lineTo(xTee, y_).lineTo(xEnd, y_).toString(); + firstPathEnabled = bottomEnabled; + secondPathEnabled = topEnabled; + } else { + // draw the top path first. + firstPathStereo = item.numberOfOutputs === 2 && lastTop.numberOfOutputs === 2; + secondPathStereo = item.numberOfOutputs === 2 && lastBottom.numberOfOutputs === 2; + firstPathAbsent = item.numberOfOutputs === 0 || lastTop.numberOfOutputs === 0; + secondPathAbsent = item.numberOfOutputs === 0 || lastBottom.numberOfOutputs === 0; + + xTee = firstPathStereo ? xTee0 : xTee0 - monoAdjustment; + firstPath = new SvgPathBuilder().moveTo(xTop, yTop).lineTo(xTee, yTop).lineTo(xTee, y_).toString(); + + xTee = secondPathStereo ? xTee0 : xTee0 - monoAdjustment; + secondPath = new SvgPathBuilder().moveTo(xBottom, yBottom).lineTo(xTee, yBottom).lineTo(xTee, y_).lineTo(xEnd, y_).toString(); + + firstPathEnabled = topEnabled; + secondPathEnabled = bottomEnabled; + } + let firstPathColor = firstPathEnabled ? ENABLED_CONNECTOR_COLOR : DISABLED_CONNECTOR_COLOR; + let secondPathColor = secondPathEnabled ? ENABLED_CONNECTOR_COLOR : DISABLED_CONNECTOR_COLOR; + + if (bottomPathFirst || topPathFirst) { + // display stereo strokes with cutoff line. + if (firstPathStereo) { + output.push(( + + )); + output.push(( + + )); + } else if (!firstPathAbsent) { + output.push(( + + )); + } + if (secondPathStereo) { + output.push(( + + )); + output.push(( + + )); + } else if (!secondPathAbsent) { + output.push(( + + )); + } + + } else { + // stereo strokes merge. + if (firstPathStereo) { + output.push(( + + )); + } else if (!firstPathAbsent) { + output.push(( + + )); + } + if (secondPathStereo) { + output.push(( + + )); + } else if (!secondPathAbsent) { + output.push(( + + )); + } + + // draw stereo inner lines. + if (firstPathStereo) { + output.push(( + + )); + } + if (secondPathStereo) { + output.push(( + + )); + + } + } + if (thirdPath != null) { + // stereo output of L/R splitter + output.push(( + + )); + output.push(( + + )); + + + } + } + getScrollContainer() { + let el: HTMLElement | undefined | null = this.scrollRef.current; + // actually not here anymore. :-/ It has a reactive definition in MainPage.tsx now. + while (el) { + if (el.id === "pedalboardScroll") { + return el as HTMLDivElement; + } + el = el.parentElement; + } + throw new PiPedalStateError("scroll container not found."); + } + + pedalButton( + instanceId: number, + iconType: PluginType, + draggable: boolean, + enabled: boolean, + hasBorder: boolean = true, + pluginNotFound: boolean, + hasMidiConnector: boolean + ) + : ReactNode { + const classes = withStyles.getClasses(this.props); + return ( +
{ e.preventDefault(); }}> + {hasMidiConnector && ( +
+ +
+ + )} + + { this.onItemClick(e, instanceId); }} + onDoubleClick={(e: SyntheticEvent) => { this.onItemDoubleClick(e, instanceId); }} + onContextMenu={(e: SyntheticEvent) => { this.onItemLongClick(e, instanceId); }} + > + + this.getScrollContainer()} + onDragEnd={(x, y) => { this.onDragEnd(instanceId, x, y) }} + > + + + + +
+ ); + + } + renderConnectors(output: ReactNode[], layoutChain: PedalLayout[], enabled: boolean, shortSplitOutput: boolean): void { + let length = layoutChain.length - 1; + if (layoutChain.length > 0 && layoutChain[layoutChain.length - 1].isSplitter()) { + ++length; + } + for (let i = 0; i < length; ++i) { + let item = layoutChain[i]; + if (item.isSplitter()) { + let splitter = item.pedalItem as PedalboardSplitItem; + this.renderSplitConnectors(output, item, enabled, i === length - 1 && shortSplitOutput,); + this.renderConnectors(output, item.topChildren, enabled && splitter.isASelected(), false); + this.renderConnectors(output, item.bottomChildren, enabled && splitter.isBSelected(), false); + + } else if (item.uri !== END_PEDALBOARD_ITEM_URI) { + this.renderConnector(output, item, enabled); + + } + } + } + renderConnectorFrame(layoutChain: PedalLayout[], layoutSize: LayoutSize): ReactNode { + let outputs: ReactNode[] = []; + this.renderConnectors(outputs, layoutChain, true, false); + return ( +
+ + + { + outputs + } + + + +
+ ); + + } + + renderChain(layoutChain: PedalLayout[], layoutSize: LayoutSize): ReactNode { + + const classes = withStyles.getClasses(this.props); + + let result: ReactNode[] = []; + + result.push(this.renderConnectorFrame(layoutChain, layoutSize)); + + let it = chainIterator(layoutChain); + while (true) { + let v = it.next(); + if (v.done) break; + let item = v.value; + switch (item.uri) { + case START_PEDALBOARD_ITEM_URI: + result.push(
+
+ + {this.pedalButton(START_CONTROL, item.pluginType, false, true, false, false, false)} +
+
); + break; + case END_PEDALBOARD_ITEM_URI: + result.push(
+
+ + {this.pedalButton(END_CONTROL, item.pluginType, false, true, false, false, false)} +
+
); + break; + default: + if (item.isSplitter()) { + + result.push(
+
+ {this.pedalButton(item.pedalItem?.instanceId ?? -1, this.getSplitterIcon(item), false, true, true, false, false)} +
+
); + + } else { + result.push( +
+ {item.name} +
+ ) + let uiPlugin = this.model.getUiPlugin(item.pedalItem?.uri ?? ""); + let pluginMissing = uiPlugin == null; + + result.push(
+ {this.pedalButton( + item.pedalItem?.instanceId ?? -1, + item.pluginType, + !item.isEmpty(), + item.pedalItem?.isEnabled ?? false, + true, + pluginMissing, + uiPlugin ? ((uiPlugin.has_midi_input !== 0) || (uiPlugin.has_midi_output !== 0)) : false)} + +
); + + } + break; + } + + } + return result; + } + + canInputStero(item: PedalLayout): boolean { + if (item.pedalItem) { + let plugin = this.model.getUiPlugin(item.pedalItem.uri); + if (plugin) { + return plugin.audio_inputs === 2; + } + } + return true; + } + getNumberOfInputs(item: PedalLayout): number { + if (item.pedalItem) { + let plugin = this.model.getUiPlugin(item.pedalItem.uri); + if (plugin) { + return plugin.audio_inputs; + } + } + return 1; + } + getNumberOfOutputs(item: PedalLayout): number { + if (item.pedalItem) { + let plugin = this.model.getUiPlugin(item.pedalItem.uri); + if (plugin) { + return plugin.audio_outputs; + } + } + return 1; + } + + markStereoOutputs(layoutChain: PedalLayout[], numberOfInputs: number, numberOfOutputs: number) { + // analyze forward flow. + this.markStereoForward(layoutChain, numberOfInputs); + // mark items that feed a mono effect as mono. + this.markStereoBackward(layoutChain, numberOfOutputs); + } + + markStereoBackward(layoutChain: PedalLayout[], numberOfOutputs: number): number { + for (let i = layoutChain.length - 1; i >= 0; --i) { + let item = layoutChain[i]; + if (item.isSplitter()) { + item.numberOfOutputs = CalculateConnection(item.numberOfOutputs, numberOfOutputs) + + this.markStereoBackward(item.topChildren, numberOfOutputs); + this.markStereoBackward(item.bottomChildren, numberOfOutputs); + let topInputs = item.topChildren[0].numberOfInputs; + let bottomInputs = item.bottomChildren[0].numberOfInputs; + + let splitItem = item.pedalItem as PedalboardSplitItem; + if (splitItem.getSplitType() !== SplitType.Lr) { + item.numberOfInputs = CalculateConnection(item.numberOfInputs, Math.max(topInputs, bottomInputs)); + } + } else if (item.isEnd()) { + + } else if (item.isStart()) { + item.numberOfOutputs = CalculateConnection(item.numberOfOutputs, numberOfOutputs); + return item.numberOfOutputs; + + } else if (item.isEmpty()) { + if (numberOfOutputs === 0) { + item.numberOfOutputs = 0; + item.numberOfInputs = CalculateConnection(item.numberOfInputs, 2); + } else { + item.numberOfOutputs = CalculateConnection(item.numberOfOutputs, numberOfOutputs); + item.numberOfInputs = CalculateConnection(item.numberOfInputs, numberOfOutputs); + } + } else { + item.numberOfOutputs = CalculateConnection(item.numberOfOutputs, numberOfOutputs); + } + numberOfOutputs = item.numberOfInputs; + } + return numberOfOutputs; + } + markStereoForward(layoutChain: PedalLayout[], numberOfInputs: number): number { + if (layoutChain.length === 0) { + return numberOfInputs; + } + for (let i = 0; i < layoutChain.length; ++i) { + let item = layoutChain[i]; + if (item.isSplitter()) { + let splitter = item.pedalItem as PedalboardSplitItem; + item.numberOfInputs = numberOfInputs; + + let chainInputs = numberOfInputs; + if (splitter.getSplitType() === SplitType.Lr) { + chainInputs = CalculateConnection(numberOfInputs, 1); + } + let topOutputs = this.markStereoForward(item.topChildren, chainInputs); + let bottomOutputs = this.markStereoForward(item.bottomChildren, chainInputs); + + + if (splitter.getSplitType() === SplitType.Ab) { + if (splitter.isASelected()) { + item.numberOfOutputs = topOutputs; + } else { + item.numberOfOutputs = bottomOutputs; + } + } else { + item.numberOfOutputs = (topOutputs >= 1 || bottomOutputs >= 1) ? 2 : 1; + } + } else if (item.isStart()) { + item.numberOfOutputs = Math.min(PiPedalModelFactory.getInstance().jackSettings.get().inputAudioPorts.length, 2); + } else if (item.isEnd()) { + item.numberOfInputs = + CalculateConnection( + Math.min(PiPedalModelFactory.getInstance().jackSettings.get().outputAudioPorts.length, 2), + numberOfInputs); + return item.numberOfInputs; + } else if (item.isEmpty()) { + item.numberOfInputs = numberOfInputs; + if (numberOfInputs === 0) { + item.numberOfOutputs = 2; + } else { + item.numberOfOutputs = item.numberOfInputs; + } + } else { + if (item.numberOfInputs === 0) // zero-input plugins merge their output with the input. + { + item.numberOfInputs = numberOfInputs; + item.numberOfOutputs = Math.max(item.numberOfOutputs, numberOfInputs); + } else { + item.numberOfInputs = CalculateConnection(numberOfInputs, this.getNumberOfInputs(item)); + item.numberOfOutputs = this.getNumberOfOutputs(item); + } + } + numberOfInputs = item.numberOfOutputs; + } + return numberOfInputs; + } + + currentLayout?: PedalLayout[]; + private renderKey: number = 0; + render() { + const classes = withStyles.getClasses(this.props); + this.renderKey = 0; + let layoutChain = makeChain(this.model, this.state.pedalboard?.items); + let start = PedalLayout.Start(); + let end = PedalLayout.End(); + if (layoutChain.length !== 0) { + layoutChain.splice(0, 0, start); + layoutChain.splice(layoutChain.length, 0, end); + this.markStereoOutputs(layoutChain, 2, 2); + } + + let layoutSize = this.doLayout(layoutChain); + + + this.currentLayout = layoutChain; // save for mouse processing &c. + + return ( +
+
+ {this.renderChain(layoutChain, layoutSize)} +
+
+ ); + } + + }, + pedalboardStyles +)); + +export default PedalboardView \ No newline at end of file diff --git a/react/src/PerformanceView.tsx b/vite/src/pipedal/PerformanceView.tsx similarity index 87% rename from react/src/PerformanceView.tsx rename to vite/src/pipedal/PerformanceView.tsx index e89d776..e521535 100644 --- a/react/src/PerformanceView.tsx +++ b/vite/src/pipedal/PerformanceView.tsx @@ -20,9 +20,10 @@ import { Theme } from '@mui/material/styles'; import SaveIconOutline from '@mui/icons-material/Save'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import { PiPedalModel, PiPedalModelFactory, PresetIndex } from './PiPedalModel'; import ResizeResponsiveComponent from './ResizeResponsiveComponent'; import ArrowBackIcon from '@mui/icons-material/ArrowBack'; @@ -40,17 +41,18 @@ import { BankIndex } from './Banks'; import SnapshotEditor from './SnapshotEditor'; import { Snapshot } from './Pedalboard'; import JackStatusView from './JackStatusView'; -import {IDialogStackable, DialogStackState, removeDialogStackEntriesAbove, popDialogStack, pushDialogStack} from './DialogEx'; +import {IDialogStackable, popDialogStack, pushDialogStack} from './DialogStack'; +import { css } from '@emotion/react'; const selectColor = isDarkMode() ? "#888" : "#FFFFFF"; const styles = (theme: Theme) => createStyles({ - frame: { + frame: css({ position: "absolute", display: "flex", flexDirection: "column", flexWrap: "nowrap", justifyContent: "flex-start", left: "0px", top: "0px", bottom: "0px", right: "0px", overflow: "hidden" - }, - select: { // fu fu fu.Overrides for white selector on dark background. + }), + select: css({ // fu fu fu.Overrides for white selector on dark background. '&:before': { borderColor: selectColor, }, @@ -60,17 +62,16 @@ const styles = (theme: Theme) => createStyles({ '&:hover:not(.Mui-disabled):before': { borderColor: selectColor, } - }, - select_icon: { + }), + select_icon: css({ fill: selectColor, - }, + }), }); interface PerformanceViewProps extends WithStyles { open: boolean, onClose: () => void, - theme: Theme } interface PerformanceViewState { @@ -84,7 +85,7 @@ interface PerformanceViewState { export const PerformanceView = - withStyles(styles, { withTheme: true })( + withStyles( class extends ResizeResponsiveComponent implements IDialogStackable { model: PiPedalModel; @@ -104,7 +105,6 @@ export const PerformanceView = }; this.onPresetsChanged = this.onPresetsChanged.bind(this); this.onBanksChanged = this.onBanksChanged.bind(this); - this.handlePopState = this.handlePopState.bind(this); this.onPresetChangedChanged = this.onPresetChangedChanged.bind(this); } @@ -115,8 +115,6 @@ export const PerformanceView = this.props.onClose(); } - private stateWasPopped: boolean = false; - private hasHooks: boolean = false; @@ -129,52 +127,14 @@ export const PerformanceView = if (this.hasHooks) { - this.stateWasPopped = false; - window.addEventListener("popstate",this.handlePopState); - - pushDialogStack(this); - let dialogStackState: DialogStackState = {tag: this.getTag(),previousState: window.history.state as DialogStackState | null}; - window.history.replaceState(dialogStackState,"",window.location.href); - window.history.pushState( - null, - "", - "#" + this.getTag() - ); - } else { - if (!this.stateWasPopped) - { - window.history.back(); - } - } - } - } - - handlePopState(ev: PopStateEvent): any - { - let evTag: DialogStackState | null = ev.state as DialogStackState | null; - if (evTag && evTag.tag === this.getTag()) { - removeDialogStackEntriesAbove(this.getTag()); - - if (!this.stateWasPopped) - { - this.stateWasPopped = true; - popDialogStack (); - if (this.props.open) { - this.props.onClose(); - } - } - window.history.replaceState(evTag.previousState,"",window.location.href); - window.removeEventListener("popstate",this.handlePopState); - - if (window.location.hash === "#menu") // The menu popstate is next? - { - window.history.back(); // then clear off the menu popstate too. - } - ev.stopPropagation(); - } - } - + pushDialogStack(this); + } else { + popDialogStack(this); + } + } + } + onWindowSizeChanged(width: number, height: number): void { this.setState({ wrapSelects: width < 700 }); } @@ -268,13 +228,13 @@ export const PerformanceView = } render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let wrapSelects = this.state.wrapSelects; let presets = this.state.presets; let banks = this.state.banks; return ( -
-
+
+
) } - } + }, + styles ); diff --git a/react/src/PiPedalError.tsx b/vite/src/pipedal/PiPedalError.tsx similarity index 100% rename from react/src/PiPedalError.tsx rename to vite/src/pipedal/PiPedalError.tsx diff --git a/react/src/PiPedalModel.tsx b/vite/src/pipedal/PiPedalModel.tsx similarity index 98% rename from react/src/PiPedalModel.tsx rename to vite/src/pipedal/PiPedalModel.tsx index e001630..b791956 100644 --- a/react/src/PiPedalModel.tsx +++ b/vite/src/pipedal/PiPedalModel.tsx @@ -370,12 +370,6 @@ interface ControlChangedBody { symbol: string; value: number; }; -interface PatchPropertyChangedBody { - clientId: number; - instanceId: number; - propertyUri: string; - value: any; -}; interface Vst3ControlChangedBody { clientId: number; instanceId: number; @@ -483,7 +477,7 @@ export class PiPedalModel //implements PiPedalModel } - private expectDisconnectTimer?: NodeJS.Timeout = undefined; + private expectDisconnectTimer?: number = undefined; cancelExpectDisconnectTimer() { @@ -762,7 +756,7 @@ export class PiPedalModel //implements PiPedalModel } - private updateLaterTimeout?: NodeJS.Timeout = undefined; + private updateLaterTimeout?: number = undefined; private clearPromptForUpdateTimer() { if (this.updateLaterTimeout) { @@ -896,7 +890,7 @@ export class PiPedalModel //implements PiPedalModel return this.webSocket; } - androidReconnectTimeout?: NodeJS.Timeout = undefined; + androidReconnectTimeout?: number = undefined; cancelAndroidReconnectTimer() { if (this.androidReconnectTimeout) { @@ -1014,7 +1008,7 @@ export class PiPedalModel //implements PiPedalModel try { await this.webSocket.connect(); } catch (error) { - this.setError("Failed to connect to server. (" + getErrorMessage(error)); + this.setError("Failed to connect to server. " + getErrorMessage(error) ); return false; } @@ -1119,7 +1113,7 @@ export class PiPedalModel //implements PiPedalModel } - backgroundStateTimeout?: NodeJS.Timeout = undefined; + backgroundStateTimeout?: number = undefined; exitBackgroundState() { if (this.backgroundStateTimeout) { @@ -1361,15 +1355,6 @@ export class PiPedalModel //implements PiPedalModel this.webSocket?.send("setSnapshots", { snapshots: snapshots, selectedSnapshot: selectedSnapshot }); } - private _setPedalboardPropertyValue(instanceId: number, propertyUri: string, value: any): void { - let body: PatchPropertyChangedBody = { - clientId: this.clientId, - instanceId: instanceId, - propertyUri: propertyUri, - value: value - }; - this.webSocket?.send("setPatchProperty", body); - } setInputVolume(volume_db: number): void { this._setInputVolume(volume_db, true); @@ -1488,6 +1473,10 @@ export class PiPedalModel //implements PiPedalModel } + sendPedalboardControlTrigger(instanceId: number, key: string, value: number) : void { + // no state change, no saving the value, just send it to the realtime thread/ + this._setServerControl("previewControl", instanceId, key, value); + } setPedalboardControl(instanceId: number, key: string, value: number): void { @@ -2606,7 +2595,7 @@ export class PiPedalModel //implements PiPedalModel }); } - getFilePropertyDirectoryTree(uiFileProperty: UiFileProperty): Promise { + getFilePropertyDirectoryTree(uiFileProperty: UiFileProperty,selectedPath: string): Promise { return new Promise((resolve, reject) => { let ws = this.webSocket; if (!ws) { @@ -2615,7 +2604,7 @@ export class PiPedalModel //implements PiPedalModel } ws.request( "getFilePropertyDirectoryTree", - uiFileProperty + {fileProperty: uiFileProperty, selectedPath: selectedPath} ).then((result) => { resolve(new FilePropertyDirectoryTree().deserialize(result)); }).catch((e) => { @@ -2990,10 +2979,9 @@ export class PiPedalModel //implements PiPedalModel //window.location.reload(); } - private networkChanging: boolean = false; private networkChanging_expectHotspot = false; - private expectNetworkChangeTimeout?: NodeJS.Timeout = undefined; - private hotspotReconnectTimer?: NodeJS.Timeout = undefined; + private expectNetworkChangeTimeout?: number = undefined; + private hotspotReconnectTimer?: number = undefined; async detectServer(address: string) { let port = window.location.port; @@ -3052,13 +3040,11 @@ export class PiPedalModel //implements PiPedalModel clearTimeout(this.expectNetworkChangeTimeout); this.expectNetworkChangeTimeout = undefined; } - this.networkChanging = false; this.expectDisconnect(ReconnectReason.Disconnected); } onNetworkChanging(hotspotConnected: boolean) { this.cancelOnNetworkChanging(); - this.networkChanging = true; this.networkChanging_expectHotspot = hotspotConnected; this.expectDisconnect(ReconnectReason.HotspotChanging); diff --git a/react/src/PiPedalSocket.tsx b/vite/src/pipedal/PiPedalSocket.tsx similarity index 98% rename from react/src/PiPedalSocket.tsx rename to vite/src/pipedal/PiPedalSocket.tsx index 49315d7..d2257a8 100644 --- a/react/src/PiPedalSocket.tsx +++ b/vite/src/pipedal/PiPedalSocket.tsx @@ -281,7 +281,7 @@ class PiPedalSocket { ws.onerror = (evt: Event) => { ws.onclose = null; ws.onerror = null; - reject("Failed to connect."); + reject("Connection not accepted."); }; ws.onopen = (event: Event) => { ws.onerror = self.handleError.bind(self); @@ -290,7 +290,7 @@ class PiPedalSocket { resolve(ws); }; } catch (e: any){ - reject("Failed to connect. " + e.toString()); + reject("Failed to connect: " + e.toString()); }; }); } diff --git a/react/src/PluginClass.tsx b/vite/src/pipedal/PluginClass.tsx similarity index 100% rename from react/src/PluginClass.tsx rename to vite/src/pipedal/PluginClass.tsx diff --git a/react/src/PluginControl.tsx b/vite/src/pipedal/PluginControl.tsx similarity index 79% rename from react/src/PluginControl.tsx rename to vite/src/pipedal/PluginControl.tsx index dcfdb87..d421348 100644 --- a/react/src/PluginControl.tsx +++ b/vite/src/pipedal/PluginControl.tsx @@ -18,11 +18,13 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import React, { TouchEvent, PointerEvent, ReactNode, Component, SyntheticEvent } from 'react'; +import { css } from '@emotion/react'; import Button from '@mui/material/Button'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles, {withTheme} from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import { UiControl, ScalePoint } from './Lv2Plugin'; import Typography from '@mui/material/Typography'; import Input from '@mui/material/Input'; @@ -31,8 +33,9 @@ import Switch from '@mui/material/Switch'; import Utility, { nullCast } from './Utility'; import MenuItem from '@mui/material/MenuItem'; import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel'; -import { ReactComponent as DialIcon } from './svg/fx_dial.svg'; +import DialIcon from './svg/fx_dial.svg?react'; import { isDarkMode } from './DarkMode'; +import ControlTooltip from './ControlTooltip'; const MIN_ANGLE = -135; const MAX_ANGLE = 135; @@ -51,12 +54,12 @@ export const StandardItemSize = { width: 80, height: 140 } -const styles = (theme: Theme) => createStyles({ - frame: { +export const pluginControlStyles = (theme: Theme) => createStyles({ + frame: css({ position: "relative", margin: "12px" - }, - switchTrack: { + }), + switchTrack: css({ height: '100%', width: '100%', borderRadius: 14 / 2, @@ -66,8 +69,15 @@ const styles = (theme: Theme) => createStyles({ }), backgroundColor: theme.palette.primary.main, opacity: theme.palette.mode === 'light' ? 0.38 : 0.3 - }, - displayValue: { + }), + controlFrame: css({ + display: "flex", flexDirection: "column", alignItems: "center", justifyContent: "space-between", height: 116 + }), + + titleSection: css({ + flex: "0 0 auto", alignSelf: "stretch", marginBottom: 8, marginLeft: 0, marginRight: 0 + }), + displayValue: css({ position: "absolute", top: 0, left: 0, @@ -77,11 +87,18 @@ const styles = (theme: Theme) => createStyles({ background: theme.mainBackground, color: theme.palette.text.secondary, // zIndex: -1, - } + }), + midSection: css({ + flex: "1 1 1", display: "flex", flexFlow: "column nowrap", alignContent: "center", justifyContent: "center" + }), + editSection: css({ + flex: "0 0 0", display: "flex", flexFlow: "column nowrap", justifyContent: "center", position: "relative", width: 60, height: 28, minHeight: 28 + }) + }); -export interface PluginControlProps extends WithStyles { +export interface PluginControlProps extends WithStyles { uiControl?: UiControl; instanceId: number; value: number; @@ -95,15 +112,15 @@ type PluginControlState = { }; const PluginControl = - withStyles(styles, { withTheme: true })( + withTheme(withStyles( class extends Component { - frameRef: React.RefObject; - imgRef: React.RefObject; - inputRef: React.RefObject; - selectRef: React.RefObject; + frameRef: React.RefObject; + imgRef: React.RefObject; + inputRef: React.RefObject; + selectRef: React.RefObject; - displayValueRef: React.RefObject; + displayValueRef: React.RefObject; model: PiPedalModel; @@ -252,7 +269,6 @@ const PluginControl = touchDown: boolean = false; touchIdentifier: number = -1; - private lastclickTimeMs: number = 0; private isTap: boolean = false; onTouchStart(e: TouchEvent) { @@ -485,17 +501,16 @@ const PluginControl = } handleTriggerMouseDown() { let uiControl = this.props.uiControl; - if (uiControl) - { - this.model.setPedalboardControl(this.props.instanceId,uiControl.symbol,1); + if (uiControl) { + let value = uiControl.max_value; + if (uiControl.max_value === uiControl.default_value) { + value = uiControl.min_value; + } + this.model.sendPedalboardControlTrigger(this.props.instanceId, uiControl.symbol, value); } } handleTriggerMouseUp() { - let uiControl = this.props.uiControl; - if (uiControl) - { - this.model.setPedalboardControl(this.props.instanceId,uiControl.symbol,0); - } + // triggers are reset on the audio thread. } previewInputValue(value: number, commitValue: boolean) { let range = this.valueToRange(value); @@ -584,6 +599,7 @@ const PluginControl = ); } if (control.isAbToggle()) { + let classes = withStyles.getClasses(this.props); // unchecked color is not gray. return ( @@ -634,13 +650,39 @@ const PluginControl = } let range: number; if (uiControl.is_logarithmic) { - range = Math.log(value / uiControl.min_value) / Math.log(uiControl.max_value / uiControl.min_value); + let minValue = uiControl.min_value; + if (minValue === 0) // LSP plugins do this. + { + minValue = 0.0001; + } + range = Math.log(value / minValue) / Math.log(uiControl.max_value / minValue); + if (!isFinite(range)) { + if (range < 0) + { + range = 0; + } else { + range = 1.0; + } + } else if (isNaN(range)) { + range = 0; + } if (uiControl.range_steps > 1) { range = Math.round(range * (uiControl.range_steps - 1)) / (uiControl.range_steps - 1); } } else { range = (value - uiControl.min_value) / (uiControl.max_value - uiControl.min_value); + if (!isFinite(range)) { + if (range < 0) + { + range = 0; + } else { + range = 1.0; + } + } else if (isNaN(range)) { + range = 0; + } } + if (range > 1) range = 1; if (range < 0) range = 0; return range; @@ -660,7 +702,17 @@ const PluginControl = value = uiControl.min_value; } else { if (uiControl.is_logarithmic) { - value = uiControl.min_value * Math.pow(uiControl.max_value / uiControl.min_value, range); + let minValue = uiControl.min_value; + if (minValue === 0) // LSP controls. + { + minValue = 0.0001; + } + value = minValue * Math.pow(uiControl.max_value / minValue, range); + if (!isFinite(value)) { + value = uiControl.max_value; + } else if (isNaN(value)) { + value = uiControl.min_value; + } } else { value = range * (uiControl.max_value - uiControl.min_value) + uiControl.min_value; } @@ -692,7 +744,7 @@ const PluginControl = uiControl?: UiControl = undefined; render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let t = this.props.uiControl; if (!t) { return (
#Error
); @@ -715,42 +767,83 @@ const PluginControl = } let item_width: number | undefined = isSelect ? 160 : 80; - if (isTrigger) - { + if (isTrigger) { item_width = undefined; } return ( -
+
{/* TITLE SECTION */} -
- {isTrigger ? "\u00A0" : control.name} +
+ + {isTrigger ? "\u00A0" : control.name} +
{/* CONTROL SECTION */} -
- {isTrigger ? ( - + + ) : ( + + ) + ) - > - {control.name} - - ) : ((isSelect || isAbSwitch || isOnOffSwitch) ? ( this.makeSelect(control, value) ) : ( @@ -771,12 +864,12 @@ const PluginControl =
{/* LABEL/EDIT SECTION*/} -
+
{(!(isSelect || isOnOffSwitch || isTrigger)) && ( (isAbSwitch) ? ( - {switchText} ) : (
@@ -818,7 +911,8 @@ const PluginControl = touchPointerId: number = 0; - } - ); + }, + pluginControlStyles + )); export default PluginControl; \ No newline at end of file diff --git a/react/src/PluginControlView.tsx b/vite/src/pipedal/PluginControlView.tsx similarity index 77% rename from react/src/PluginControlView.tsx rename to vite/src/pipedal/PluginControlView.tsx index 9027588..7d07a58 100644 --- a/react/src/PluginControlView.tsx +++ b/vite/src/pipedal/PluginControlView.tsx @@ -19,9 +19,11 @@ import { ReactNode } from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles, {withTheme} from './WithStyles'; +import {createStyles} from './WithStyles'; +import { css } from '@emotion/react'; + +import { withStyles } from "tss-react/mui"; import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel'; import { UiPlugin, UiControl, UiFileProperty, UiFrequencyPlot, ScalePoint } from './Lv2Plugin'; import { @@ -40,6 +42,9 @@ import JsonAtom from './JsonAtom'; import PluginOutputControl from './PluginOutputControl'; import Units from './Units'; import ToobFrequencyResponseView from './ToobFrequencyResponseView'; +import Tooltip from '@mui/material/Tooltip'; +import MidiChannelBindingControl from './MidiChannelBindingControl'; +import MidiChannelBinding from './MidiChannelBinding'; export const StandardItemSize = { width: 80, height: 110 }; @@ -81,7 +86,7 @@ let endPluginInfo: UiPlugin = const styles = (theme: Theme) => createStyles({ - frame: { + frame: css({ display: "block", position: "relative", flexDirection: "row", @@ -89,70 +94,114 @@ const styles = (theme: Theme) => createStyles({ paddingTop: "8px", paddingBottom: "0px", height: "100%", + overflowX: "hidden", + overflowY: "hidden" + }), + frameScrollLandscape: css({ + display: "block", + position: "absolute", + left: 0, top: 0, right: 0, bottom:0, + flexDirection: "row", + flexWrap: "nowrap", + paddingTop: "0px", + paddingBottom: "0px", overflowX: "auto", + overflowY: "hidden" + }), + frameScrollPortrait: css({ + display: "block", + position: "absolute", + left: 0, top: 0, right: 0, bottom:0, + flexDirection: "row", + flexWrap: "nowrap", + paddingTop: "0px", + paddingBottom: "0px", + overflowX: "hidden", overflowY: "auto" - }, - vuMeterL: { - position: "fixed", + }), + vuMeterL: css({ + position: "absolute", + left: 0, top: 0, paddingLeft: 6, paddingRight: 4, - paddingBottom: 24, - left: 0, + paddingBottom: 12, // cover bottom line of a portgroup in landscape. background: theme.mainBackground, zIndex: 3 - }, - vuMeterR: { - position: "fixed", - right: 0, - marginRight: 22, + }), + vuMeterR: css({ + position: "absolute", + right: 0, top: 0, + marginRight: 20, // has to potentially clear a scrollbar. paddingLeft: 4, - paddingBottom: 24, + paddingBottom: 12, background: theme.mainBackground, zIndex: 3 - }, - vuMeterRLandscape: { - position: "fixed", - right: 0, - paddingRight: 22, + }), + vuMeterRLandscape: css({ + position: "absolute", + right: 0, top: 0, + paddingRight: 6, paddingLeft: 12, - paddingBottom: 24, + paddingBottom: 12, // cover bottom line of a portgroup in landscape. background: theme.mainBackground, zIndex: 3 - }, + }), - normalGrid: { + normalGrid: css({ position: "relative", - paddingLeft: 22, - paddingRight: 34, + paddingLeft: 30, + paddingRight: 30, + paddingTop: 8, flex: "1 1 auto", display: "flex", flexDirection: "row", flexWrap: "wrap", justifyContent: "flex-start", alignItems: "flex_start", + rowGap: 14, + height: "fit-content" - }, - landscapeGrid: { - paddingLeft: 40, - // marginRight: 40, : bug in chrome layout engine wrt/ right margin/padding. See the spacer div added after all controls in render() with provides the same effect. + + }), + landscapeGrid: css({ + paddingLeft: 40, paddingRight: 40, paddingTop: 8, + // marginRight: 40, : bug in chrome layout engine wrt/ right margin/padding. + // See the spacer div added after all controls in render() with provides the same effect. display: "flex", flexDirection: "row", flexWrap: "nowrap", - justifyContent: "flex-start", alignItems: "flex_start", - flex: "0 0 auto" - }, - portgroupControlPadding: { + justifyContent: "flex-start", alignItems: "flex-start", + overflowX: "hidden", + overflowY: "hidden", + flex: "0 0 auto", + width: "fit-content" + }), + portgroupControlPadding: css({ flex: "0 0 auto", marginTop: 12, marginBottom: 8 - }, - controlPadding: { + }), + + controlPadding: css({ flex: "0 0 auto", marginTop: 0, - marginBottom: 0 + marginBottom: 0, + height: 116 - }, - portGroup: { + }), + controlPair: css({ + display: "flex", flexFlow: "row nowrap", + flex: "0 0 auto", + height: 116 + }), + controlSpacer: css({ + display: "none", + minWidth: 0, + width: 0, + height: 116 + }), + + portGroup: css({ marginLeft: 8, marginTop: 0, marginRight: 8, @@ -168,8 +217,8 @@ const styles = (theme: Theme) => createStyles({ display: "flex", flexDirection: "row", flexWrap: "wrap", flex: "0 1 auto", - }, - portGroupLandscape: { + }), + portGroupLandscape: css({ marginLeft: 8, marginTop: 0, marginRight: 8, @@ -182,12 +231,14 @@ const styles = (theme: Theme) => createStyles({ border: "2pt #AAA solid", borderRadius: 8, elevation: 12, - display: "flex", + display: "inline-flex", textOverflow: "ellipsis", flexDirection: "row", flexWrap: "nowrap", - flex: "0 0 auto" - }, - portGroupTitle: { + flex: "0 0 auto", + width: "fit-content", + minWidth: "max-content" + }), + portGroupTitle: css({ position: "absolute", top: -15, background: theme.mainBackground, @@ -197,13 +248,20 @@ const styles = (theme: Theme) => createStyles({ paddingLeft: 8, paddingRight: 8, margin_right: 28 - }, - portGroupControls: { + }), + portGroupControls: css({ display: "flex", flexDirection: "row", flexWrap: "wrap", paddingTop: 6, paddingBottom: 8 - } + }), + portGroupControlsLandscape: css({ + display: "flex", + flexFlow: "row nowrap", + width: "fit-content", + paddingTop: 6, + paddingBottom: 8 + }) }); @@ -246,7 +304,7 @@ type PluginControlViewState = { }; const PluginControlView = - withStyles(styles, { withTheme: true })( + withTheme(withStyles( class extends ResizeResponsiveComponent { model: PiPedalModel; @@ -367,13 +425,46 @@ const PluginControlView = { this.onControlValueChanged(controlValue!.key, value) }} onPreviewChange={(value: number) => { this.onPreviewChange(controlValue!.key, value) }} - requestIMEEdit={(uiControl, value) => this.requestImeEdit(uiControl, value)} + requestIMEEdit={(uiControl: any, value: any) => this.requestImeEdit(uiControl, value)} /> )); } + push_control(controls:ControlNodes, pluginControl: UiControl,controlValues: ControlValue[]) + { + // combine lamps with their previous control + if ((pluginControl.isLamp() || pluginControl.isDbVu()) && controls.length !== 0) + { + const classes = withStyles.getClasses(this.props); + let newControl = this.makeStandardControl(pluginControl,controlValues); + let previousControl = controls[controls.length-1]; + if (!(previousControl instanceof ControlGroup)) { + let pair = ( +
+ {previousControl as ReactNode} + {newControl} +
+ ); + controls[controls.length-1] = pair; + // push a spacer control in order to make placing of extended controls predictable. + // (e.g.. inserting at position 4 still places the extended control after four previous controls + controls.push(( + +
+ )); + } else { + controls.push(newControl); + } + + } else { + controls.push( + this.makeStandardControl(pluginControl, controlValues) + ) + } + } + getStandardControlNodes(plugin: UiPlugin, controlValues: ControlValue[]): ControlNodes { let result: ControlNodes = []; let portGroupMap: { [id: string]: ControlGroup } = {}; @@ -393,10 +484,9 @@ const PluginControlView = while (i + 1 < plugin.controls.length && plugin.controls[i + 1].port_group === pluginControl.port_group) { ++i; pluginControl = plugin.controls[i]; + if (!pluginControl.isHidden()) { - groupControls.push( - this.makeStandardControl(pluginControl, controlValues) - ) + this.push_control(groupControls,pluginControl,controlValues); indexes.push(pluginControl.index); } } @@ -406,9 +496,7 @@ const PluginControlView = ) portGroupMap[pluginControl.port_group] = controlGroup; } else { - result.push( - this.makeStandardControl(pluginControl, controlValues) - ); + this.push_control(result,pluginControl,controlValues); } } } @@ -527,7 +615,7 @@ const PluginControlView = controlKeyIndex: number = 0; controlNodesToNodes(nodes: (ReactNode | ControlGroup)[]): ReactNode[] { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let isLandscapeGrid = this.state.landscapeGrid; let hasGroups = this.hasGroups(nodes); @@ -553,9 +641,14 @@ const PluginControlView = result.push((
- {controlGroup.name} + + {controlGroup.name} +
-
+
{ controls } @@ -581,10 +674,24 @@ const PluginControlView = static endPluginInfo: UiPlugin = makeIoPluginInfo("Output", Pedalboard.END_PEDALBOARD_ITEM_URI); + midiBindingControl(pedalboardItem: PedalboardItem): ReactNode { + if (!pedalboardItem.midiChannelBinding) { + return false; + } + return ( + { + + }} + /> + ) + } + + render(): ReactNode { this.controlKeyIndex = 0; - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let pedalboardItem: PedalboardItem; let pedalboard = this.model.pedalboard.get(); if (this.props.instanceId === Pedalboard.START_CONTROL) { @@ -618,6 +725,7 @@ const PluginControlView = let gridClass = this.state.landscapeGrid ? classes.landscapeGrid : classes.normalGrid; + let scrollClass = this.state.landscapeGrid ? classes.frameScrollLandscape : classes.frameScrollPortrait; let vuMeterRClass = this.state.landscapeGrid ? classes.vuMeterRLandscape : classes.vuMeterR; let controlNodes: ControlNodes; @@ -630,6 +738,16 @@ const PluginControlView = let nodes = this.controlNodesToNodes(controlNodes); + if (plugin.has_midi_input && !pedalboardItem.midiChannelBinding) + { + pedalboardItem.midiChannelBinding = MidiChannelBinding.CreateMissingValue(); + + } + if (pedalboardItem.midiChannelBinding) { + nodes.push(this.midiBindingControl(pedalboardItem)); + } + + return (
@@ -638,21 +756,25 @@ const PluginControlView =
-
- { - nodes - } -
- { - (!this.state.landscapeGrid) && ( -
- ) - } +
+
+ { + nodes + } + {/* Extra space to allow scrolling right to the end in lascape especially */} +
+ { + (!this.state.landscapeGrid) && ( +
+ ) + } +
{this.state.showFileDialog && ( { this.setState({ showFileDialog: false }); @@ -688,8 +810,9 @@ const PluginControlView = } - } - ); + }, + styles + )); export default PluginControlView; diff --git a/react/src/PluginIcon.tsx b/vite/src/pipedal/PluginIcon.tsx similarity index 73% rename from react/src/PluginIcon.tsx rename to vite/src/pipedal/PluginIcon.tsx index 5e6e6c0..a273a61 100644 --- a/react/src/PluginIcon.tsx +++ b/vite/src/pipedal/PluginIcon.tsx @@ -19,53 +19,53 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import { PiPedalModelFactory } from "./PiPedalModel"; import { PluginType } from './Lv2Plugin'; -import { ReactComponent as FxSimulatorIcon } from './svg/fx_simulator.svg'; -import { ReactComponent as FxPhaserIcon } from './svg/fx_phaser.svg'; -import { ReactComponent as FxFilterIcon } from './svg/fx_filter.svg'; -import { ReactComponent as FxDelayIcon } from './svg/fx_delay.svg'; +import FxSimulatorIcon from './svg/fx_simulator.svg?react'; +import FxPhaserIcon from './svg/fx_phaser.svg?react'; +import FxFilterIcon from './svg/fx_filter.svg?react'; +import FxDelayIcon from './svg/fx_delay.svg?react'; -import { ReactComponent as FxAmplifierIcon } from './svg/fx_amplifier.svg'; -import { ReactComponent as FxChorusIcon } from './svg/fx_chorus.svg'; -import { ReactComponent as FxModulatorIcon } from './svg/fx_modulator.svg'; -import { ReactComponent as FxReverbIcon } from './svg/fx_reverb.svg'; -import { ReactComponent as FxDistortionIcon } from './svg/fx_distortion.svg'; -import { ReactComponent as FxFlangerIcon } from './svg/fx_flanger.svg'; -import { ReactComponent as FxFilterHpIcon } from './svg/fx_filter_hp.svg'; -import { ReactComponent as FxParametricEqIcon } from './svg/fx_parametric_eq.svg'; -import { ReactComponent as FxEqIcon } from './svg/fx_eq.svg'; -import { ReactComponent as FxUtilityIcon } from './svg/fx_utility.svg'; -import { ReactComponent as FxCompressorIcon } from './svg/fx_compressor.svg'; -import { ReactComponent as FxLimiterIcon } from './svg/fx_limiter.svg'; -import { ReactComponent as FxConstantIcon } from './svg/fx_constant.svg'; -import { ReactComponent as FxFunctionIcon } from './svg/fx_function.svg'; -import { ReactComponent as FxGateIcon } from './svg/fx_gate.svg'; -import { ReactComponent as FxConverterIcon } from './svg/fx_converter.svg'; -import { ReactComponent as FxGeneratorIcon } from './svg/fx_generator.svg'; -import { ReactComponent as FxOscillatorIcon } from './svg/fx_oscillator.svg'; -import { ReactComponent as FxInstrumentIcon } from './svg/fx_instrument.svg'; -import { ReactComponent as FxMixerIcon } from './svg/fx_mixer.svg'; -import { ReactComponent as FxPitchIcon } from './svg/fx_pitch.svg'; -import { ReactComponent as FxSpatialIcon } from './svg/fx_spatial.svg'; -import { ReactComponent as FxSpectralIcon } from './svg/fx_spectral.svg'; -import { ReactComponent as FxAnalyzerIcon } from './svg/fx_analyzer.svg'; -import { ReactComponent as FxPluginIcon } from './svg/fx_plugin.svg'; -import { ReactComponent as SplitAIcon } from './svg/fx_split_a.svg'; -import { ReactComponent as SplitBIcon } from './svg/fx_split_b.svg'; -import { ReactComponent as SplitMixIcon } from './svg/fx_dial.svg'; -import { ReactComponent as SplitLrIcon } from './svg/fx_lr.svg'; -import { ReactComponent as FxEmptyIcon } from './svg/fx_empty.svg'; +import FxAmplifierIcon from './svg/fx_amplifier.svg?react'; +import FxChorusIcon from './svg/fx_chorus.svg?react'; +import FxModulatorIcon from './svg/fx_modulator.svg?react'; +import FxReverbIcon from './svg/fx_reverb.svg?react'; +import FxDistortionIcon from './svg/fx_distortion.svg?react'; +import FxFlangerIcon from './svg/fx_flanger.svg?react'; +import FxFilterHpIcon from './svg/fx_filter_hp.svg?react'; +import FxParametricEqIcon from './svg/fx_parametric_eq.svg?react'; +import FxEqIcon from './svg/fx_eq.svg?react'; +import FxUtilityIcon from './svg/fx_utility.svg?react'; +import FxCompressorIcon from './svg/fx_compressor.svg?react'; +import FxLimiterIcon from './svg/fx_limiter.svg?react'; +import FxConstantIcon from './svg/fx_constant.svg?react'; +import FxFunctionIcon from './svg/fx_function.svg?react'; +import FxGateIcon from './svg/fx_gate.svg?react'; +import FxConverterIcon from './svg/fx_converter.svg?react'; +import FxGeneratorIcon from './svg/fx_generator.svg?react'; +import FxOscillatorIcon from './svg/fx_oscillator.svg?react'; +import FxInstrumentIcon from './svg/fx_instrument.svg?react'; +import FxMixerIcon from './svg/fx_mixer.svg?react'; +import FxPitchIcon from './svg/fx_pitch.svg?react'; +import FxSpatialIcon from './svg/fx_spatial.svg?react'; +import FxSpectralIcon from './svg/fx_spectral.svg?react'; +import FxAnalyzerIcon from './svg/fx_analyzer.svg?react'; +import FxPluginIcon from './svg/fx_plugin.svg?react'; +import SplitAIcon from './svg/fx_split_a.svg?react'; +import SplitBIcon from './svg/fx_split_b.svg?react'; +import SplitMixIcon from './svg/fx_dial.svg?react'; +import SplitLrIcon from './svg/fx_lr.svg?react'; +import FxEmptyIcon from './svg/fx_empty.svg?react'; -import { ReactComponent as FxTerminalIcon } from './svg/fx_terminal.svg'; +import FxTerminalIcon from './svg/fx_terminal.svg?react'; -import {isDarkMode} from './DarkMode'; -import { Color } from '@mui/material'; +import { isDarkMode } from './DarkMode'; @@ -92,9 +92,8 @@ export interface PluginIconProps extends WithStyles { export function SelectSvgIcon(plugin_type: PluginType, className: string, size: number = 24, opacity: number = 1.0, missingPlugin: boolean = false) { let color = ""; - if (missingPlugin) - { - color = isDarkMode()? "#C00000": "#B00000"; + if (missingPlugin) { + color = isDarkMode() ? "#C00000" : "#B00000"; } let myStyle = { width: size, height: size, opacity: opacity, color: color, fill: color }; switch (plugin_type) { @@ -176,8 +175,8 @@ export function SelectSvgIcon(plugin_type: PluginType, className: string, size: case PluginType.Terminal: return ; - default: - case PluginType.Plugin: + default: + case PluginType.Plugin: return ; } } @@ -252,50 +251,23 @@ export function SelectBaseIcon(plugin_type: PluginType): string { } } -var colors: string[] = [ - "#14003d", - "#630651", - "#005010", - "#281431", - "#5E0012", - "#401222", - "#3B1502" -]; - -// eslint-disable-next-line @typescript-eslint/no-unused-vars -function colorFromHash(uri: string) { - let hash = hashString(uri); - - return colors[hash % colors.length]; - -} - -function hashString(str: string): number { - var hash = 0, i, chr; - for (i = 0; i < str.length; i++) { - chr = str.charCodeAt(i); - hash = ((hash << 5) - hash) + chr; - hash |= 0; // Convert to 32bit integer - } - if (hash < 0) return -hash; - return hash; -} export function SelectIconUri(plugin_type: PluginType) { let icon = SelectBaseIcon(plugin_type); return PiPedalModelFactory.getInstance().svgImgUrl(icon); } -const PluginIcon = withStyles(styles)((props: PluginIconProps) => { - const { classes, pluginType, opacity,pluginMissing } = props; +const PluginIcon = withStyles((props: PluginIconProps) => { + const { pluginType, opacity, pluginMissing } = props; + const classes = withStyles.getClasses(props); - let pluginMissing_ : boolean = pluginMissing??false; + let pluginMissing_: boolean = pluginMissing ?? false; let size: number = 24; if (props.size) size = props.size; let topVal: number = (props.offsetY ?? 0); - let svgIcon = SelectSvgIcon(pluginType, classes.icon, size, opacity,pluginMissing_); + let svgIcon = SelectSvgIcon(pluginType, classes.icon, size, opacity, pluginMissing_); if (svgIcon) { return svgIcon; } @@ -312,6 +284,7 @@ const PluginIcon = withStyles(styles)((props: PluginIconProps) => { // mask: maskText, WebkitMask: maskText, WebkitMaskSize: size + "px", maskSize: size + "px" }} // > 
// ); -}); +}, + styles); export default PluginIcon; \ No newline at end of file diff --git a/react/src/PluginInfoDialog.tsx b/vite/src/pipedal/PluginInfoDialog.tsx similarity index 72% rename from react/src/PluginInfoDialog.tsx rename to vite/src/pipedal/PluginInfoDialog.tsx index 6d9e887..ce184d9 100644 --- a/react/src/PluginInfoDialog.tsx +++ b/vite/src/pipedal/PluginInfoDialog.tsx @@ -19,9 +19,10 @@ import React from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import Button from '@mui/material/Button'; import DialogEx from './DialogEx'; import MuiDialogTitle from '@mui/material/DialogTitle'; @@ -36,24 +37,22 @@ import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined'; import { UiPlugin, UiControl } from './Lv2Plugin'; import PluginIcon from './PluginIcon'; import { Remark } from 'react-remark'; +import { css } from '@emotion/react'; - /* eslint-disable */ -let myTheme: Theme| undefined = undefined; -const styles = (theme: Theme) => -{ - myTheme = theme; + +const styles = (theme: Theme) => { return createStyles({ root: { margin: 0, padding: theme.spacing(2), }, - closeButton: { + closeButton: css({ position: 'absolute', right: theme.spacing(1), top: theme.spacing(1), color: theme.palette.grey[500], - }, + }), icon: { fill: theme.palette.text.primary, opacity: 0.6 @@ -84,18 +83,23 @@ export interface PluginInfoDialogTitleProps extends WithStyles { // ); // }); -const PluginInfoDialogContent = withStyles((theme: Theme) => ({ - root: { - padding: theme.spacing(2), - }, -}))(MuiDialogContent); +const PluginInfoDialogContent = withStyles( + MuiDialogContent, + (theme: Theme) => ({ + root: { + padding: theme.spacing(2), + } + }) +); -const PluginInfoDialogActions = withStyles((theme: Theme) => ({ - root: { - margin: 0, - padding: theme.spacing(1), - }, -}))(MuiDialogActions); +const PluginInfoDialogActions = withStyles(MuiDialogActions, + (theme: Theme) => ({ + root: { + margin: 0, + padding: theme.spacing(1), + }, + }) +); export interface PluginInfoProps extends WithStyles { plugin_uri: string @@ -151,25 +155,26 @@ function makeControls(controls: UiControl[]) { break; } } + hasComments = true; if (hasComments) { let trs: React.ReactElement[] = []; for (let i = 0; i < controls.length; ++i) { let control = controls[i]; if (!(control.not_on_gui) && control.is_input) - trs.push(( - - - - {control.name} - - - - - {control.comment} - - - - )); + trs.push(( + + + + {control.name} + + + + + {control.comment} + + + + )); } return ( @@ -200,11 +205,12 @@ function makeControls(controls: UiControl[]) { -const PluginInfoDialog = withStyles(styles)((props: PluginInfoProps) => { +const PluginInfoDialog = withStyles((props: PluginInfoProps) => { let model = PiPedalModelFactory.getInstance(); const [open, setOpen] = React.useState(false); - let { classes, plugin_uri } = props; + let { plugin_uri } = props; + let classes = withStyles.getClasses(props); const handleClickOpen = () => { setOpen(true); @@ -235,7 +241,7 @@ const PluginInfoDialog = withStyles(styles)((props: PluginInfoProps) => { {open && ( - @@ -258,18 +264,18 @@ const PluginInfoDialog = withStyles(styles)((props: PluginInfoProps) => {
-
+
Author:  {(plugin.author_homepage !== "") ? ( - {plugin.author_name} + {plugin.author_name} ) : ( {plugin.author_name} ) - + }
@@ -286,40 +292,44 @@ const PluginInfoDialog = withStyles(styles)((props: PluginInfoProps) => { { makeControls(plugin.controls) } - - Description: - - + )} - @@ -327,6 +337,7 @@ const PluginInfoDialog = withStyles(styles)((props: PluginInfoProps) => { )}
); -}); +}, +styles); export default PluginInfoDialog; diff --git a/react/src/PluginOutputControl.tsx b/vite/src/pipedal/PluginOutputControl.tsx similarity index 51% rename from react/src/PluginOutputControl.tsx rename to vite/src/pipedal/PluginOutputControl.tsx index 2ed160a..d4e8642 100644 --- a/react/src/PluginOutputControl.tsx +++ b/vite/src/pipedal/PluginOutputControl.tsx @@ -19,26 +19,59 @@ import React, { Component } from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import { UiControl } from './Lv2Plugin'; import Typography from '@mui/material/Typography'; -import { PiPedalModel, PiPedalModelFactory, MonitorPortHandle,State } from './PiPedalModel'; -import {isDarkMode} from './DarkMode'; +import { PiPedalModel, PiPedalModelFactory, MonitorPortHandle, State } from './PiPedalModel'; +import { isDarkMode } from './DarkMode'; import GxTunerControl from './GxTunerControl'; import Units from './Units'; +import ControlTooltip from './ControlTooltip'; +import { css } from '@emotion/react'; +function makeLedGradient(color: string) { + if (color === "green") { + if (isDarkMode()) { + return "radial-gradient(circle at center, #0F0 0, #0F0 20%, #333 100%)"; + } else { + return "radial-gradient(circle at center, #4F4 0, #4F4 40%, #464 100%)"; + } + } + if (color === "blue") { + if (isDarkMode()) { + return "radial-gradient(circle at center, #00F 0, #00F 20%, #333 100%)"; + } else { + return "radial-gradient(circle at center, #44F 0, #44F 40%, #446 100%)"; + } + } + if (color === "yellow") { + if (isDarkMode()) { + return "radial-gradient(circle at center, #FF0 0, #FF0 20%, #333 100%)"; + } else { + return "radial-gradient(circle at center, #FF4 0, #FF4 40%, #664 100%)"; + } + } + if (isDarkMode()) { + return "radial-gradient(circle at center, #F000 0, #F00 20%, #333 100%)"; + } else { + return "radial-gradient(circle at center, #F44 0, #F44 40%, #644 100%)"; + } + +} + const styles = (theme: Theme) => createStyles({ - frame: { + frame: css({ position: "relative", margin: "12px" - }, - switchTrack: { + }), + switchTrack: css({ height: '100%', width: '100%', borderRadius: 14 / 2, @@ -48,8 +81,8 @@ const styles = (theme: Theme) => createStyles({ }), backgroundColor: theme.palette.secondary.main, opacity: theme.palette.mode === 'light' ? 0.38 : 0.3 - }, - displayValue: { + }), + displayValue: css({ position: "absolute", top: 0, left: 0, @@ -59,7 +92,26 @@ const styles = (theme: Theme) => createStyles({ background: "white", color: "#666", // zIndex: -1, - } + }), + controlFrame: css({ + display: "flex", flexDirection: "column", alignItems: "center", justifyContent: "space-between", height: 116 + }), + + titleSection: css({ + flex: "0 0 auto", alignSelf:"stretch", marginBottom: 8, marginLeft: 0, marginRight: 0 + }), + + midSection: css({ + flex: "1 1 1", display: "flex",flexFlow: "column nowrap",alignContent: "center",justifyContent: "center" + }), + + editSection: css({ + flex: "0 0 28", position: "relative", width: 60, height: 28, minHeight: 28 + }), + editSectionNoContent: css({ + flex: "0 0 28", position: "relative", width: 1, height: 28, minHeight: 28 + }) + }); @@ -73,15 +125,14 @@ type PluginOutputControlState = { }; const PluginOutputControl = - withStyles(styles, { withTheme: true })( - class extends Component - { + withStyles( + class extends Component { private model: PiPedalModel; - private vuRef: React.RefObject; - private dbVuRef: React.RefObject; - private dbVuTelltaleRef: React.RefObject; - private lampRef: React.RefObject; + private vuRef: React.RefObject; + private dbVuRef: React.RefObject; + private dbVuTelltaleRef: React.RefObject; + private lampRef: React.RefObject; constructor(props: PluginOutputControlProps) { @@ -98,10 +149,8 @@ const PluginOutputControl = this.onConnectionStateChanged = this.onConnectionStateChanged.bind(this); } - private onConnectionStateChanged(state: State) - { - if (state === State.Ready) - { + private onConnectionStateChanged(state: State) { + if (state === State.Ready) { this.unsubscribe(); this.subscribe(); } @@ -127,40 +176,36 @@ const PluginOutputControl = } componentDidUpdate(prevProps: Readonly, prevState: Readonly, snapshot?: any): void { - if (prevProps.instanceId !== this.props.instanceId) - { + if (prevProps.instanceId !== this.props.instanceId) { this.unsubscribe(); this.subscribe(); } } - private VU_HEIGHT = 60-4; - private DB_VU_HEIGHT = 60-4; + private VU_HEIGHT = 60 - 4; + private DB_VU_HEIGHT = 60 - 4; private animationHandle: number | undefined = undefined; - + private dbVuTelltale = -96.0; private dbVuValue = -96.0; private dbVuHoldTime = 0.0; private requestDbVuAnimation() { - if (!this.animationHandle) - { + if (!this.animationHandle) { this.animationHandle = requestAnimationFrame( - ()=> { + () => { let value = this.dbVuValue; let range = this.vuMap(value); - let top = range-this.VU_HEIGHT; + let top = range - this.VU_HEIGHT; if (top > 0) top = 0; - - if (value > this.dbVuTelltale) - { + + if (value > this.dbVuTelltale) { this.dbVuTelltale = value; - this.dbVuHoldTime = Date.now()+2000; + this.dbVuHoldTime = Date.now() + 2000; } - if (this.dbVuRef.current) - { - this.dbVuRef.current.style.marginTop = top+"px"; + if (this.dbVuRef.current) { + this.dbVuRef.current.style.marginTop = top + "px"; } this.animationHandle = undefined; this.updateDbVuTelltale(); @@ -171,19 +216,16 @@ const PluginOutputControl = updateDbVuTelltale() { let telltaleDone = true; - if (this.dbVuHoldTime !== 0) - { + if (this.dbVuHoldTime !== 0) { telltaleDone = false; let t = Date.now(); - if (t >= this.dbVuHoldTime) - { - let dt = t-this.dbVuHoldTime; - let telltaleValue = this.dbVuTelltale-30*dt/1000; - if (telltaleValue < -200) - { + if (t >= this.dbVuHoldTime) { + let dt = t - this.dbVuHoldTime; + let telltaleValue = this.dbVuTelltale - 30 * dt / 1000; + if (telltaleValue < -200) { telltaleValue = -200; telltaleDone = true; - } + } this.dbVuTelltale = telltaleValue; this.dbVuHoldTime = t; @@ -191,49 +233,41 @@ const PluginOutputControl = let y = this.dbVuMap(this.dbVuTelltale); if (y < 0) y = 0; - if (this.dbVuTelltaleRef.current) - { + if (this.dbVuTelltaleRef.current) { let telltaleStyle = this.dbVuTelltaleRef.current.style; telltaleStyle.marginTop = y + "px"; let telltaleColor = "#0C0"; - if (this.dbVuTelltale >= 0) - { + if (this.dbVuTelltale >= 0) { telltaleColor = "#F00"; - } else if (this.dbVuTelltale >= -10) - { + } else if (this.dbVuTelltale >= -10) { telltaleColor = "#FF0"; } telltaleStyle.background = telltaleColor; } } - if (!telltaleDone) - { + if (!telltaleDone) { this.requestDbVuAnimation(); } } private updateValue(value: number) { - if (this.lampRef.current) - { + if (this.lampRef.current) { let control = this.props.uiControl; - let range = (value-control.min_value)/(control.max_value-control.min_value); - this.lampRef.current.style.opacity = range +""; - } else if (this.dbVuRef.current) - { + let range = (value - control.min_value) / (control.max_value - control.min_value); + this.lampRef.current.style.opacity = range + ""; + } else if (this.dbVuRef.current) { this.dbVuValue = value; this.requestDbVuAnimation(); } else if (this.vuRef.current) { let control = this.props.uiControl; - let range = (value-control.min_value)/(control.max_value-control.min_value); - let top = this.VU_HEIGHT-range*this.VU_HEIGHT; + let range = (value - control.min_value) / (control.max_value - control.min_value); + let top = this.VU_HEIGHT - range * this.VU_HEIGHT; - if (!this.animationHandle) - { + if (!this.animationHandle) { this.animationHandle = requestAnimationFrame( - ()=> { - if (this.vuRef.current) - { - this.vuRef.current.style.marginTop = top+"px"; + () => { + if (this.vuRef.current) { + this.vuRef.current.style.marginTop = top + "px"; } this.animationHandle = undefined; } @@ -268,7 +302,10 @@ const PluginOutputControl = } } - isShortSelect(control: UiControl) { + isShortSelectOrText(control: UiControl) { + if (control.scale_points.length === 0) { + return true; + } for (let scale_point of control.scale_points) { if (scale_point.label.length > 12) return false; } @@ -284,18 +321,18 @@ const PluginOutputControl = dbVuMap(value: number): number { let control = this.props.uiControl; - let y = (control.max_value-value)*this.DB_VU_HEIGHT/(control.max_value-control.min_value); + let y = (control.max_value - value) * this.DB_VU_HEIGHT / (control.max_value - control.min_value); return y; } vuMap(value: number): number { let control = this.props.uiControl; - let y = (control.max_value-value)*this.VU_HEIGHT/(control.max_value-control.min_value); + let y = (control.max_value - value) * this.VU_HEIGHT / (control.max_value - control.min_value); return y; } - render() { + const classes = withStyles.getClasses(this.props); let control: UiControl = this.props.uiControl; @@ -309,75 +346,86 @@ const PluginOutputControl = } } - let isSelect = control.isOutputSelect(); + let isText = control.isOutputText(); - let item_width: number | undefined = isSelect ? 160 : 80; - if (isSelect) { - if (this.isShortSelect(control)) { + let item_width: number | undefined = isText ? 160 : 80; + if (isText) { + if (this.isShortSelectOrText(control)) { item_width = 80; } } - if (control.isTuner()) - { + if (control.isTuner()) { item_width = undefined; return (
- +
); - } else if (control.isDbVu()) - { + } else if (control.isDbVu()) { item_width = undefined; let redLevel = this.dbVuMap(0); let yellowLevel = this.dbVuMap(-10); return ( -
+
{/* TITLE SECTION */} -
- {control.name === "" ? "\u00A0" : control.name} +
+ + {control.name === "" ? "\u00A0" : control.name} +
{/* CONTROL SECTION */} -
-
+
+
-
-
-
+
+
+
-
-
+
+
+
+ +
); } else if (control.isVu()) { + // yyx: convert this to a horizontal progress bar. item_width = undefined; return ( -
+
{/* TITLE SECTION */} -
- {control.name === "" ? "\u00A0" : control.name} +
+ + {control.name === "" ? "\u00A0" : control.name} +
{/* CONTROL SECTION */} -
-
+
+
@@ -386,96 +434,125 @@ const PluginOutputControl =
{/* LABEL/EDIT SECTION*, strictly a placeholder for visual alignment purposes.*/} -
-   +
); } else if (control.isLamp()) { item_width = undefined; - let attachedLamp = control.name === "" || control.name === "\u00A0" ; + let attachedLamp = control.name === "" || control.name === "\u00A0"; + + let ledGradient: string; + if (this.props.uiControl.pipedal_ledColor.length === 0) { + ledGradient = (isDarkMode() ? "radial-gradient(circle at center, #F00 0, #F00 20%, #333 100%)" + : "radial-gradient(circle at center, #F44 0, #F44 40%, #644 100%)"); + } else { + ledGradient = makeLedGradient(this.props.uiControl.pipedal_ledColor); + } return ( -
+
{/* TITLE SECTION */} -
- {control.name === "" ? "\u00A0": (control.name)} +
+ + {control.name === "" ? "\u00A0" : (control.name)} +
{/* CONTROL SECTION */} -
-
-
+
+
+
{/* LABEL/EDIT SECTION*, strictly a placeholder for visual alignment purposes.*/} -
-   +
); - } if (control.isOutputSelect()) { + } if (control.isOutputText()) { return ( -
+
{/* TITLE SECTION */} -
- {control.name} +
+ + {control.name === "" ? "\u00A0": control.name} +
+ {/* CONTROL SECTION */} -
+
{text}
{/* LABEL/EDIT SECTION*, strictly a placeholder for visual alignment purposes.*/} -
-   +
); - }else { + } else { return ( -
+
{/* TITLE SECTION */} -
- {control.name} +
+ + {control.name} +
{/* CONTROL SECTION */} -
- +
+ {text}
{/* LABEL/EDIT SECTION*, strictly a placeholder for visual alignment purposes.*/} -
-   +
); } } - } + }, + styles ); export default PluginOutputControl; \ No newline at end of file diff --git a/react/src/PluginPreset.tsx b/vite/src/pipedal/PluginPreset.tsx similarity index 100% rename from react/src/PluginPreset.tsx rename to vite/src/pipedal/PluginPreset.tsx diff --git a/react/src/PluginPresetSelector.tsx b/vite/src/pipedal/PluginPresetSelector.tsx similarity index 96% rename from react/src/PluginPresetSelector.tsx rename to vite/src/pipedal/PluginPresetSelector.tsx index 6a1f0f4..8aa2f2a 100644 --- a/react/src/PluginPresetSelector.tsx +++ b/vite/src/pipedal/PluginPresetSelector.tsx @@ -21,9 +21,10 @@ import { SyntheticEvent, Component } from 'react'; import IconButton from '@mui/material/IconButton'; import { PiPedalModel, PiPedalModelFactory, PluginPresetsChangedHandle } from './PiPedalModel'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import withStyles from '@mui/styles/withStyles'; -import createStyles from '@mui/styles/createStyles'; +import WithStyles from './WithStyles'; +import { withStyles } from "tss-react/mui"; +import {createStyles} from './WithStyles'; + import PluginPresetsDialog from './PluginPresetsDialog'; import Menu from '@mui/material/Menu'; import MenuItem from '@mui/material/MenuItem'; @@ -33,8 +34,8 @@ import {PluginUiPresets} from './PluginPreset'; import Divider from "@mui/material/Divider"; -import {ReactComponent as PluginPresetsIcon} from "./svg/ic_pluginpreset.svg"; -import {ReactComponent as PluginPresetIcon} from "./svg/ic_pluginpreset2.svg"; +import PluginPresetsIcon from "./svg/ic_pluginpreset.svg?react"; +import PluginPresetIcon from "./svg/ic_pluginpreset2.svg?react"; interface PluginPresetSelectorProps extends WithStyles { pluginUri?: string; @@ -74,7 +75,7 @@ const styles = (theme: Theme) => createStyles({ const PluginPresetSelector = - withStyles(styles, { withTheme: true })( + withStyles( class extends Component { model: PiPedalModel; @@ -282,10 +283,10 @@ const PluginPresetSelector = } render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); - //let classes = this.props.classes; - //let classes = this.props.classes; + //const classes = withStyles.getClasses(this.props); + //const classes = withStyles.getClasses(this.props); if ((!this.props.pluginUri)) { return (
); @@ -340,6 +341,7 @@ const PluginPresetSelector = ); } - }); + }, + styles); export default PluginPresetSelector; diff --git a/react/src/PluginPresetsDialog.tsx b/vite/src/pipedal/PluginPresetsDialog.tsx similarity index 94% rename from react/src/PluginPresetsDialog.tsx rename to vite/src/pipedal/PluginPresetsDialog.tsx index 0ab5dac..2573c78 100644 --- a/react/src/PluginPresetsDialog.tsx +++ b/vite/src/pipedal/PluginPresetsDialog.tsx @@ -27,7 +27,7 @@ import DialogEx from './DialogEx'; import AppBar from '@mui/material/AppBar'; import Toolbar from '@mui/material/Toolbar'; import DraggableGrid, { ScrollDirection } from './DraggableGrid'; -import MoreVertIcon from '@mui/icons-material//MoreVert'; +import MoreVertIcon from '@mui/icons-material/MoreVert'; import ListItemIcon from '@mui/material/ListItemIcon'; import ListItemText from '@mui/material/ListItemText'; import Menu from '@mui/material/Menu'; @@ -37,19 +37,23 @@ import UploadPresetDialog from './UploadPresetDialog'; import {PluginUiPresets,PluginUiPreset} from './PluginPreset'; import SelectHoverBackground from './SelectHoverBackground'; -import CloseIcon from '@mui/icons-material//Close'; -import ArrowBackIcon from '@mui/icons-material//ArrowBack'; -import EditIcon from '@mui/icons-material//Edit'; +import CloseIcon from '@mui/icons-material/Close'; +import ArrowBackIcon from '@mui/icons-material/ArrowBack'; +import EditIcon from '@mui/icons-material/Edit'; import RenameDialog from './RenameDialog'; import Slide, {SlideProps} from '@mui/material/Slide'; -import { createStyles, Theme } from '@mui/material/styles'; -import { WithStyles, withStyles} from '@mui/styles'; -import {ReactComponent as PluginPresetIcon} from "./svg/ic_pluginpreset2.svg"; +import {createStyles} from './WithStyles'; -import { ReactComponent as DownloadIcon} from './svg/file_download_black_24dp.svg'; -import { ReactComponent as UploadIcon} from './svg/file_upload_black_24dp.svg'; +import { Theme } from '@mui/material/styles'; +import WithStyles from './WithStyles'; +import { withStyles } from "tss-react/mui"; +import PluginPresetIcon from "./svg/ic_pluginpreset2.svg?react"; + +import DownloadIcon from './svg/file_download_black_24dp.svg?react'; +import UploadIcon from './svg/file_upload_black_24dp.svg?react'; +import { css } from '@emotion/react'; interface PluginPresetsDialogProps extends WithStyles { @@ -78,27 +82,27 @@ interface PluginPresetsDialogState { const styles = (theme: Theme) => createStyles({ - listIcon: { + listIcon: css({ width: 24, height: 24, opacity: 0.6,fill: theme.palette.text.primary - }, - dialogAppBar: { + }), + dialogAppBar: css({ position: 'relative', top: 0, left: 0 - }, - itemBackground: { + }), + itemBackground: css({ background: theme.palette.background.paper - }, - dialogActionBar: { + }), + dialogActionBar: css({ position: 'relative', top: 0, left: 0, background: "black" - }, - dialogTitle: { + }), + dialogTitle: css({ marginLeft: theme.spacing(2), textOverflow: "ellipsis", flex: "1 1", - }, - itemFrame: { + }), + itemFrame: css({ display: "flex", flexDirection: "row", flexWrap: "nowrap", @@ -108,19 +112,19 @@ const styles = (theme: Theme) => createStyles({ textAlign: "left", justifyContent: "center", paddingLeft: 8 - }, - iconFrame: { + }), + iconFrame: css({ flex: "0 0 auto", - }, - itemIcon: { + }), + itemIcon: css({ width: 24, height: 24, margin: 12, opacity: 0.6, fill: theme.palette.text.primary - }, - itemLabel: { + }), + itemLabel: css({ flex: "1 1 1px", marginLeft: 8 - } + }) }); @@ -132,8 +136,7 @@ const Transition = React.forwardRef(function Transition( }); -const PluginPresetsDialog = withStyles(styles, { withTheme: true })( - +const PluginPresetsDialog = withStyles( class extends Component { model: PiPedalModel; @@ -257,7 +260,7 @@ const PluginPresetsDialog = withStyles(styles, { withTheme: true })( mapElement(el: any): React.ReactNode { let presetEntry = el as PluginUiPreset; - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let selectedItem = this.state.selectedItem; return (
@@ -346,7 +349,7 @@ const PluginPresetsDialog = withStyles(styles, { withTheme: true })( render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let actionBarClass = this.props.isEditDialog ? classes.dialogAppBar : classes.dialogActionBar; let defaultSelectedIndex = this.getSelectedIndex(); @@ -495,8 +498,8 @@ const PluginPresetsDialog = withStyles(styles, { withTheme: true })( } - } - + }, + styles ); export default PluginPresetsDialog; \ No newline at end of file diff --git a/react/src/PresetDialog.tsx b/vite/src/pipedal/PresetDialog.tsx similarity index 95% rename from react/src/PresetDialog.tsx rename to vite/src/pipedal/PresetDialog.tsx index 5d5f9c6..5c7e5f8 100644 --- a/react/src/PresetDialog.tsx +++ b/vite/src/pipedal/PresetDialog.tsx @@ -18,6 +18,7 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import React, { SyntheticEvent,Component } from 'react'; +import { css } from '@emotion/react'; import {isDarkMode} from './DarkMode'; import IconButton from '@mui/material/IconButton'; import Typography from '@mui/material/Typography'; @@ -28,7 +29,7 @@ import DialogEx from './DialogEx'; import AppBar from '@mui/material/AppBar'; import Toolbar from '@mui/material/Toolbar'; import DraggableGrid, { ScrollDirection } from './DraggableGrid'; -import MoreVertIcon from '@mui/icons-material//MoreVert'; +import MoreVertIcon from '@mui/icons-material/MoreVert'; import ListItemIcon from '@mui/material/ListItemIcon'; import ListItemText from '@mui/material/ListItemText'; import Menu from '@mui/material/Menu'; @@ -37,16 +38,20 @@ import Fade from '@mui/material/Fade'; import UploadPresetDialog from './UploadPresetDialog'; import SelectHoverBackground from './SelectHoverBackground'; -import CloseIcon from '@mui/icons-material//Close'; -import ArrowBackIcon from '@mui/icons-material//ArrowBack'; -import EditIcon from '@mui/icons-material//Edit'; +import CloseIcon from '@mui/icons-material/Close'; +import ArrowBackIcon from '@mui/icons-material/ArrowBack'; +import EditIcon from '@mui/icons-material/Edit'; import RenameDialog from './RenameDialog'; import Slide, {SlideProps} from '@mui/material/Slide'; -import { createStyles, Theme } from '@mui/material/styles'; -import { WithStyles, withStyles} from '@mui/styles'; -import { ReactComponent as DownloadIcon} from './svg/file_download_black_24dp.svg'; -import { ReactComponent as UploadIcon} from './svg/file_upload_black_24dp.svg'; +import {createStyles} from './WithStyles'; + +import { Theme } from '@mui/material/styles'; +import WithStyles from './WithStyles'; +import { withStyles } from "tss-react/mui"; + +import DownloadIcon from './svg/file_download_black_24dp.svg?react'; +import UploadIcon from './svg/file_upload_black_24dp.svg?react'; interface PresetDialogProps extends WithStyles { @@ -73,26 +78,26 @@ interface PresetDialogState { const styles = (theme: Theme) => createStyles({ - listIcon: { + listIcon: css({ width: 24, height: 24, opacity: 0.6, fill: theme.palette.text.primary - }, - dialogAppBar: { + }), + dialogAppBar: css({ position: 'relative', top: 0, left: 0 - }, - dialogActionBar: { + }), + dialogActionBar: css({ position: 'relative', top: 0, left: 0, background: "black" - }, - dialogTitle: { + }), + dialogTitle: css({ marginLeft: theme.spacing(2), flex: 1, - }, - itemBackground: { + }), + itemBackground: css({ background: theme.palette.background.paper - }, - itemFrame: { + }), + itemFrame: css({ display: "flex", flexDirection: "row", flexWrap: "nowrap", @@ -102,18 +107,18 @@ const styles = (theme: Theme) => createStyles({ textAlign: "left", justifyContent: "center", paddingLeft: 8 - }, - iconFrame: { + }), + iconFrame: css({ flex: "0 0 auto", - }, - itemIcon: { + }), + itemIcon: css({ width: 24, height: 24, margin: 12, opacity: 0.6 - }, - itemLabel: { + }), + itemLabel: css({ flex: "1 1 1px", marginLeft: 8 - } + }) }); @@ -125,8 +130,7 @@ const Transition = React.forwardRef(function Transition( }); -const PresetDialog = withStyles(styles, { withTheme: true })( - +const PresetDialog = withStyles( class extends Component { model: PiPedalModel; @@ -246,7 +250,7 @@ const PresetDialog = withStyles(styles, { withTheme: true })( mapElement(el: any): React.ReactNode { let presetEntry = el as PresetIndexEntry; - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let selectedItem = this.isEditMode() ? this.state.selectedItem : this.state.presets.selectedInstanceId; return (
@@ -332,7 +336,7 @@ const PresetDialog = withStyles(styles, { withTheme: true })( render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let actionBarClass = this.props.isEditDialog ? classes.dialogAppBar : classes.dialogActionBar; let defaultSelectedIndex = this.getSelectedIndex(); @@ -472,8 +476,8 @@ const PresetDialog = withStyles(styles, { withTheme: true })( } - } - + }, + styles ); export default PresetDialog; \ No newline at end of file diff --git a/react/src/PresetSelector.tsx b/vite/src/pipedal/PresetSelector.tsx similarity index 98% rename from react/src/PresetSelector.tsx rename to vite/src/pipedal/PresetSelector.tsx index b9776a2..05cf62e 100644 --- a/react/src/PresetSelector.tsx +++ b/vite/src/pipedal/PresetSelector.tsx @@ -23,9 +23,10 @@ import { PiPedalModel, PiPedalModelFactory, PresetIndex } from './PiPedalModel'; import SaveIconOutline from '@mui/icons-material/Save'; import MoreVertIcon from '@mui/icons-material/MoreVert'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import withStyles from '@mui/styles/withStyles'; -import createStyles from '@mui/styles/createStyles'; +import WithStyles from './WithStyles'; +import { withStyles } from "tss-react/mui"; +import {createStyles} from './WithStyles'; + import PresetDialog from './PresetDialog'; import Menu from '@mui/material/Menu'; import MenuItem from '@mui/material/MenuItem'; @@ -78,7 +79,7 @@ const styles = (theme: Theme) => createStyles({ const PresetSelector = - withStyles(styles, { withTheme: true })( + withStyles( class extends Component { model: PiPedalModel; @@ -290,9 +291,9 @@ const PresetSelector = } render() { - //let classes = this.props.classes; + //const classes = withStyles.getClasses(this.props); let presets = this.state.presets; - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); return (
{ - refText: React.RefObject; + refText: React.RefObject; constructor(props: RadioSelectDialogProps) { super(props); diff --git a/react/src/Rect.tsx b/vite/src/pipedal/Rect.tsx similarity index 100% rename from react/src/Rect.tsx rename to vite/src/pipedal/Rect.tsx diff --git a/react/src/Rectangle.tsx b/vite/src/pipedal/Rectangle.tsx similarity index 100% rename from react/src/Rectangle.tsx rename to vite/src/pipedal/Rectangle.tsx diff --git a/react/src/RenameDialog.tsx b/vite/src/pipedal/RenameDialog.tsx similarity index 95% rename from react/src/RenameDialog.tsx rename to vite/src/pipedal/RenameDialog.tsx index cafe277..c795c60 100644 --- a/react/src/RenameDialog.tsx +++ b/vite/src/pipedal/RenameDialog.tsx @@ -43,7 +43,7 @@ export interface RenameDialogState { export default class RenameDialog extends ResizeResponsiveComponent { - refText: React.RefObject; + refText: React.RefObject; constructor(props: RenameDialogProps) { super(props); @@ -125,8 +125,10 @@ export default class RenameDialog extends ResizeResponsiveComponent { onClick: () => void; onClearFilterClick: () => void; onApplyFilter: () => void; - inputRef?: React.RefObject; + inputRef?: React.RefObject; showSearchIcon?: boolean } @@ -48,11 +49,10 @@ interface SearchControlProps extends WithStyles { interface SearchControlState { } -const SearchControl = withStyles(styles, { withTheme: true })( - +const SearchControl = withTheme(withStyles( class extends React.Component { - defaultInputRef: React.RefObject; + defaultInputRef: React.RefObject; constructor(props: SearchControlProps) { super(props); @@ -61,7 +61,7 @@ const SearchControl = withStyles(styles, { withTheme: true })( }; this.defaultInputRef = React.createRef(); } - getInputRef(): React.RefObject { + getInputRef(): React.RefObject { if (this.props.inputRef) { return this.props.inputRef; } @@ -146,7 +146,8 @@ const SearchControl = withStyles(styles, { withTheme: true })(
); } - } -); + }, + styles +)); export default SearchControl; diff --git a/react/src/SearchFilter.tsx b/vite/src/pipedal/SearchFilter.tsx similarity index 100% rename from react/src/SearchFilter.tsx rename to vite/src/pipedal/SearchFilter.tsx diff --git a/react/src/SelectChannelsDialog.tsx b/vite/src/pipedal/SelectChannelsDialog.tsx similarity index 90% rename from react/src/SelectChannelsDialog.tsx rename to vite/src/pipedal/SelectChannelsDialog.tsx index c79f7e4..e274adc 100644 --- a/react/src/SelectChannelsDialog.tsx +++ b/vite/src/pipedal/SelectChannelsDialog.tsx @@ -20,7 +20,6 @@ import { useState } from 'react'; import Button from '@mui/material/Button'; import List from '@mui/material/List'; -import ListItem from '@mui/material/ListItem'; import ListItemText from '@mui/material/ListItemText'; import DialogTitle from '@mui/material/DialogTitle'; import DialogActions from '@mui/material/DialogActions'; @@ -28,6 +27,7 @@ import DialogEx from './DialogEx'; import FormControlLabel from '@mui/material/FormControlLabel'; import Checkbox from '@mui/material/Checkbox'; +import { ListItemButton } from '@mui/material'; @@ -108,14 +108,14 @@ function SelectChannelsDialog(props: SelectChannelsDialogProps) { Select Channels {availableChannels.map((channel) => ( - + toggleSelect(channel)} style={{marginLeft: 24}} /> } label={makeChannelName(channel)} /> - + ) )} @@ -173,15 +173,15 @@ function SelectChannelsDialog(props: SelectChannelsDialogProps) { > - handleListItemClick("Stereo")} key={"Stereo"} selected={selectionKey === "Stereo"} > + handleListItemClick("Stereo")} key={"Stereo"} selected={selectionKey === "Stereo"} > - - handleListItemClick("Left")} key={"LeftChannel"} selected={selectionKey === "Left"} > + + handleListItemClick("Left")} key={"LeftChannel"} selected={selectionKey === "Left"} > - - handleListItemClick("Right")} key={"RightChannel"} selected={selectionKey === "Right"}> + + handleListItemClick("Right")} key={"RightChannel"} selected={selectionKey === "Right"}> - + ); diff --git a/react/src/SelectHoverBackground.tsx b/vite/src/pipedal/SelectHoverBackground.tsx similarity index 89% rename from react/src/SelectHoverBackground.tsx rename to vite/src/pipedal/SelectHoverBackground.tsx index 1285f44..060136c 100644 --- a/react/src/SelectHoverBackground.tsx +++ b/vite/src/pipedal/SelectHoverBackground.tsx @@ -21,31 +21,33 @@ import React,{ Component, SyntheticEvent } from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; + +import {createStyles} from './WithStyles'; +import { withStyles } from "tss-react/mui"; +import { css } from '@emotion/react'; const styles = ({ palette }: Theme) => createStyles({ - frame: { + frame: css({ position: "absolute", width: "100%", height: "100%" - }, - hover: { + }), + hover: css({ position: "absolute", width: "100%", height: "100%", background: palette.action.hover, //opacity: palette.action.hoverOpacity - }, - selected: { + }), + selected: css({ position: "absolute", width: "100%", height: "100%", background: palette.action.selected, //opacity: palette.action.selectedOpacity - } + }) }); @@ -55,7 +57,6 @@ interface HoverProps extends WithStyles { selected: boolean; showHover?: boolean; borderRadius?: number; - theme: Theme; children?: React.ReactNode; } @@ -64,7 +65,7 @@ interface HoverState { export const SelectHoverBackground = - withStyles(styles, { withTheme: true })( + withStyles( class extends Component { constructor(props: HoverProps) { @@ -98,11 +99,11 @@ export const SelectHoverBackground = } - private selfRef: React.RefObject; - private hoverElementRef: React.RefObject; + private selfRef: React.RefObject; + private hoverElementRef: React.RefObject; render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let isSelected = this.props.selected; return (
{ this.handleMouseOver(e); }} onMouseLeave={(e) => { this.handleMouseLeave(e) }} @@ -115,7 +116,8 @@ export const SelectHoverBackground =
); } - } + }, + styles ); export default SelectHoverBackground; diff --git a/react/src/SelectMidiChannelsDialog.tsx b/vite/src/pipedal/SelectMidiChannelsDialog.tsx similarity index 97% rename from react/src/SelectMidiChannelsDialog.tsx rename to vite/src/pipedal/SelectMidiChannelsDialog.tsx index 23b74a5..22a57e6 100644 --- a/react/src/SelectMidiChannelsDialog.tsx +++ b/vite/src/pipedal/SelectMidiChannelsDialog.tsx @@ -20,7 +20,7 @@ import { useState } from 'react'; import Button from '@mui/material/Button'; import List from '@mui/material/List'; -import ListItem from '@mui/material/ListItem'; +import ListItemButton from '@mui/material/ListItemButton'; import DialogTitle from '@mui/material/DialogTitle'; import DialogActions from '@mui/material/DialogActions'; import FormControlLabel from '@mui/material/FormControlLabel'; @@ -99,14 +99,14 @@ function SelectMidiChannelsDialog(props: SelectMidiChannelsDialogProps) { Select MIDI Device {availableChannels.map((channel) => ( - + toggleSelect(channel)} key={channel.name} /> } label={channel.description} /> - + ) )} diff --git a/react/src/SelectThemeDialog.tsx b/vite/src/pipedal/SelectThemeDialog.tsx similarity index 100% rename from react/src/SelectThemeDialog.tsx rename to vite/src/pipedal/SelectThemeDialog.tsx diff --git a/react/src/SettingsDialog.tsx b/vite/src/pipedal/SettingsDialog.tsx similarity index 98% rename from react/src/SettingsDialog.tsx rename to vite/src/pipedal/SettingsDialog.tsx index a08b7b5..3cca4ef 100644 --- a/react/src/SettingsDialog.tsx +++ b/vite/src/pipedal/SettingsDialog.tsx @@ -29,7 +29,7 @@ import ButtonBase from "@mui/material/ButtonBase"; import AppBar from '@mui/material/AppBar'; import Button from '@mui/material/Button'; import Toolbar from '@mui/material/Toolbar'; -import ArrowBackIcon from '@mui/icons-material//ArrowBack'; +import ArrowBackIcon from '@mui/icons-material/ArrowBack'; import JackConfiguration, { JackChannelSelection } from './Jack'; import Divider from '@mui/material/Divider'; import SelectChannelsDialog from './SelectChannelsDialog'; @@ -49,11 +49,14 @@ import SystemMidiBindingsDialog from './SystemMidiBindingsDialog'; import SelectThemeDialog from './SelectThemeDialog'; import Slide, { SlideProps } from '@mui/material/Slide'; -import { createStyles, Theme } from '@mui/material/styles'; -import { WithStyles, withStyles } from '@mui/styles'; +import {createStyles} from './WithStyles'; + +import { Theme } from '@mui/material/styles'; +import { withStyles } from "tss-react/mui"; +import WithStyles from './WithStyles'; import { canScaleWindow, getWindowScaleOptions, getWindowScaleText, setWindowScale, getWindowScale } from './WindowScale'; import OptionsDialog from './OptionsDialog'; - +import { css } from '@emotion/react'; interface SettingsDialogProps extends WithStyles { @@ -98,56 +101,56 @@ interface SettingsDialogState { const styles = (theme: Theme) => createStyles({ - dialogAppBar: { + dialogAppBar: css({ position: 'relative', top: 0, left: 0 - }, - dialogTitle: { + }), + dialogTitle: css({ marginLeft: theme.spacing(2), flex: 1, - }, - cpuStatusColor: { + }), + cpuStatusColor: css({ color: theme.palette.text.secondary, opacity: 0.7 - }, - sectionHead: { + }), + sectionHead: css({ marginLeft: 24, marginRight: 24, marginTop: 16, paddingBottom: 12 - }, - textBlock: { + }), + textBlock: css({ marginLeft: 24, marginRight: 24, marginTop: 16, paddingBottom: 0, opacity: 0.95 - }, - textBlockIndented: { + }), + textBlockIndented: css({ marginLeft: 40, marginRight: 24, marginTop: 16, paddingBottom: 0, opacity: 0.95 - }, + }), - setting: { + setting: css({ minHeight: 64, width: "100%", textAlign: "left", paddingLeft: 22, paddingRight: 22 - }, - primaryItem: { + }), + primaryItem: css({ - }, - secondaryItem: { + }), + secondaryItem: css({ - } + }) }); @@ -161,8 +164,7 @@ const Transition = React.forwardRef(function Transition( -const SettingsDialog = withStyles(styles, { withTheme: true })( - +const SettingsDialog = withStyles( class extends Component { model: PiPedalModel; @@ -308,7 +310,7 @@ const SettingsDialog = withStyles(styles, { withTheme: true })( mounted: boolean = false; active: boolean = false; - timerHandle?: NodeJS.Timeout; + timerHandle?: number; tick() { this.model.getJackStatus() @@ -539,7 +541,8 @@ const SettingsDialog = withStyles(styles, { withTheme: true })( this.props.onClose(); } render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); + let isConfigValid = this.state.jackConfiguration.isValid; let selectedChannels: string[] = this.state.showInputSelectDialog ? this.state.jackSettings.inputAudioPorts : this.state.jackSettings.outputAudioPorts; let disableShutdown = this.state.shuttingDown || this.state.restarting; @@ -1002,7 +1005,8 @@ const SettingsDialog = withStyles(styles, { withTheme: true })( } - } + }, + styles ); diff --git a/react/src/SnapshotButton.tsx b/vite/src/pipedal/SnapshotButton.tsx similarity index 99% rename from react/src/SnapshotButton.tsx rename to vite/src/pipedal/SnapshotButton.tsx index 2348450..5c656ac 100644 --- a/react/src/SnapshotButton.tsx +++ b/vite/src/pipedal/SnapshotButton.tsx @@ -22,7 +22,6 @@ * SOFTWARE. */ -import React from 'react'; import Typography from '@mui/material/Typography'; import IconButton from '@mui/material/IconButton'; import ButtonBase from '@mui/material/ButtonBase'; diff --git a/react/src/SnapshotColors.tsx b/vite/src/pipedal/SnapshotColors.tsx similarity index 84% rename from react/src/SnapshotColors.tsx rename to vite/src/pipedal/SnapshotColors.tsx index 3908c9b..f20721f 100644 --- a/react/src/SnapshotColors.tsx +++ b/vite/src/pipedal/SnapshotColors.tsx @@ -22,14 +22,14 @@ * SOFTWARE. */ -const darkcolors: string[] = -[ - "#b71C1C","#880E4F","#4A148c","#311B92","#1A237E","#0D47A1","#01579B","#006064","#004D40" -]; +// const darkcolors: string[] = +// [ +// "#b71C1C","#880E4F","#4A148c","#311B92","#1A237E","#0D47A1","#01579B","#006064","#004D40" +// ]; -const lighcolors: string[] = [ - "#FFcDD2","#F8BBd0","#E1BEE7","#D1c4E9","#C5CAE9","#BBDEFB","#B3E5FC","#B2EbF2","B2DFDB" -]; +// const lighcolors: string[] = [ +// "#FFcDD2","#F8BBd0","#E1BEE7","#D1c4E9","#C5CAE9","#BBDEFB","#B3E5FC","#B2EbF2","B2DFDB" +// ]; export function getLightSnapshotcolors() { let result:string[] = []; for (let h = 0; h < 360; h += 30) diff --git a/react/src/SnapshotDialog.tsx b/vite/src/pipedal/SnapshotDialog.tsx similarity index 94% rename from react/src/SnapshotDialog.tsx rename to vite/src/pipedal/SnapshotDialog.tsx index 9207334..f1a725b 100644 --- a/react/src/SnapshotDialog.tsx +++ b/vite/src/pipedal/SnapshotDialog.tsx @@ -30,7 +30,6 @@ import DialogContent from '@mui/material/DialogContent'; import DialogTitle from '@mui/material/DialogTitle'; import ArrowBackIcon from '@mui/icons-material/ArrowBack'; import IconButton from '@mui/material/IconButton'; -import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel'; import ResizeResponsiveComponent from './ResizeResponsiveComponent'; import { TransitionProps } from '@mui/material/transitions'; @@ -38,12 +37,6 @@ import Fade from '@mui/material/Fade'; import Slide from '@mui/material/Slide'; import SnapshotPanel from './SnapshotPanel'; -const styles = { - dialogPaper: { - minHeight: '80vh', - maxHeight: '80vh', - }, -}; const FadeTransition = React.forwardRef(function Transition( @@ -78,11 +71,9 @@ export interface SnapshotDialogState { }; export default class SnapshotDialog extends ResizeResponsiveComponent { - private model: PiPedalModel; constructor(props: SnapshotDialogProps) { super(props); - this.model = PiPedalModelFactory.getInstance(); this.state = { fullScreen: this.getFullScreen(), }; diff --git a/vite/src/pipedal/SnapshotEditor.tsx b/vite/src/pipedal/SnapshotEditor.tsx new file mode 100644 index 0000000..63fd2e1 --- /dev/null +++ b/vite/src/pipedal/SnapshotEditor.tsx @@ -0,0 +1,364 @@ +// Copyright (c) 2024 Robin Davies +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import WithStyles from './WithStyles'; +import { css } from '@emotion/react'; +import ArrowBackIcon from '@mui/icons-material/ArrowBack'; +import CloseIcon from '@mui/icons-material/Close'; +import AppBar from '@mui/material/AppBar'; +import Toolbar from '@mui/material/Toolbar'; +import CssBaseline from '@mui/material/CssBaseline'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; +import IconButton from '@mui/material/IconButton'; +import FullscreenIcon from '@mui/icons-material/Fullscreen'; +import FullscreenExitIcon from '@mui/icons-material/FullscreenExit'; +import ResizeResponsiveComponent from './ResizeResponsiveComponent'; +import { PiPedalModelFactory, PiPedalModel, State, ZoomedControlInfo } from './PiPedalModel'; +import ZoomedUiControl from './ZoomedUiControl' +import MainPage from './MainPage'; +import JackStatusView from './JackStatusView'; +import { Theme } from '@mui/material/styles'; +import { isDarkMode } from './DarkMode'; +import Typography from '@mui/material/Typography'; +import TextField from '@mui/material/TextField'; +import { Snapshot } from './Pedalboard'; +import ColorDropdownButton, { DropdownAlignment } from './ColorDropdownButton'; +import { getBackgroundColor } from './MaterialColors'; + + +const selectColor = isDarkMode() ? "#888" : "#FFFFFF"; + + +const appStyles = (theme: Theme) => createStyles({ + "&": css({ // :root + colorScheme: (isDarkMode() ? "dark" : "light") + }), + + + mainFrame: css({ + overflow: "hidden", + display: "flex", + flexFlow: "column", + marginTop: 8, + flex: "1 1 100%" + }), + heroContent: css({ + backgroundColor: theme.mainBackground, + position: "relative", + height: "100%", + width: "100%" + }), + shadowCatcher: css({ + backgroundColor: theme.mainBackground + }), + + select: css({ // fu fu fu.Overrides for white selector on dark background. + '&:before': { + borderColor: selectColor, + }, + '&:after': { + borderColor: selectColor, + }, + '&:hover:not(.Mui-disabled):before': { + borderColor: selectColor, + } + }), + select_icon: css({ + fill: selectColor, + }) + + +}); + + +function supportsFullScreen(): boolean { + let doc: any = window.document; + let docEl: any = doc.documentElement; + var requestFullScreen = docEl.requestFullscreen || docEl.mozRequestFullScreen || docEl.webkitRequestFullScreen || docEl.msRequestFullscreen; + return (!!requestFullScreen); + +} + +function setFullScreen(value: boolean) { + let doc: any = window.document; + let docEl: any = doc.documentElement; + + var requestFullScreen = docEl.requestFullscreen || docEl.mozRequestFullScreen || docEl.webkitRequestFullScreen || docEl.msRequestFullscreen; + var cancelFullScreen = doc.exitFullscreen || doc.mozCancelFullScreen || doc.webkitExitFullscreen || doc.msExitFullscreen; + + if (!doc.fullscreenElement && !doc.mozFullScreenElement && !doc.webkitFullscreenElement && !doc.msFullscreenElement) { + requestFullScreen.call(docEl); + } + else { + cancelFullScreen.call(doc); + } +} + +type SnapshotEditorState = { + zoomedControlInfo: ZoomedControlInfo | undefined; + zoomedControlOpen: boolean; + + canFullScreen: boolean; + isFullScreen: boolean; + isDebug: boolean; + collapseLabel: boolean; + + showStatusMonitor: boolean; + name: string, + color: string + +}; +interface SnapshotEditorProps extends WithStyles { + onClose: () => void; + onOk: (snapshotIndex: number, name: string, color: string, newSnapshots: (Snapshot | null)[]) => void; + snapshotIndex: number; +} + +const SnapshotEditor = withStyles( + class extends ResizeResponsiveComponent { + // Before the component mounts, we initialise our state + + model_: PiPedalModel; + + getCollapseLabel() { + return this.windowSize.width < 500; + } + + constructor(props: SnapshotEditorProps) { + super(props); + this.model_ = PiPedalModelFactory.getInstance(); + + this.model_.zoomedUiControl.addOnChangedHandler( + () => { + this.setState({ + zoomedControlOpen: this.model_.zoomedUiControl.get() !== undefined, + zoomedControlInfo: this.model_.zoomedUiControl.get() + }); + } + ); + + let snapshot = this.model_.pedalboard.get().snapshots[this.props.snapshotIndex] ?? new Snapshot(); + this.state = { + zoomedControlOpen: false, + zoomedControlInfo: this.model_.zoomedUiControl.get(), + canFullScreen: supportsFullScreen() && !this.model_.isAndroidHosted(), + isFullScreen: !!document.fullscreenElement, + showStatusMonitor: this.model_.showStatusMonitor.get(), + isDebug: true, + name: snapshot.name, + color: snapshot.color, + collapseLabel: this.getCollapseLabel() + + }; + + this.showStatusMonitorHandler = this.showStatusMonitorHandler.bind(this); + } + + showStatusMonitorHandler() { + this.setState({ + showStatusMonitor: this.model_.showStatusMonitor.get() + }); + } + toggleFullScreen(): void { + setFullScreen(this.state.isFullScreen); + this.setState({ isFullScreen: !this.state.isFullScreen }); + } + + componentDidMount() { + + super.componentDidMount(); + this.model_.showStatusMonitor.addOnChangedHandler(this.showStatusMonitorHandler); + + } + + + updateOverscroll(): void { + if (this.model_.serverVersion) { + // no pull-down refresh on android devices once we're ready (unless we're debug) + let preventOverscroll = + this.model_.state.get() === State.Ready + && !this.model_.debug; + + let overscrollBehavior = preventOverscroll ? "none" : "auto"; + document.body.style.overscrollBehavior = overscrollBehavior; + } + } + + componentDidUpdate() { + } + + componentWillUnmount() { + super.componentWillUnmount(); + this.model_.banks.removeOnChangedHandler(this.showStatusMonitorHandler); + } + + onWindowSizeChanged(width: number, height: number): void { + super.onWindowSizeChanged(width, height); + this.setState({ + collapseLabel: this.getCollapseLabel() + }); + + } + + handleOk() { + let currentPedalboard = this.model_.pedalboard.get(); + let selectedSnapshot = this.props.snapshotIndex; + let currentSnapshot: Snapshot | null = currentPedalboard.snapshots[selectedSnapshot]; + if (!currentSnapshot) { + this.props.onClose(); + return; + } + + let changed = this.state.name !== currentSnapshot.name + || this.state.color !== currentSnapshot.color + || currentSnapshot.isModified; + if (!changed) { + this.props.onClose(); + return; + } + let newSnapshots = Snapshot.cloneSnapshots(currentPedalboard.snapshots); + let newSnapshot = this.model_.pedalboard.get().makeSnapshot(); + newSnapshot.name = this.state.name; + newSnapshot.color = this.state.color; + newSnapshots[selectedSnapshot] = newSnapshot; + this.model_.setSnapshots(newSnapshots, selectedSnapshot); + + this.props.onOk(selectedSnapshot, this.state.name, this.state.color, newSnapshots); + + + } + + render() { + + const classes = withStyles.getClasses(this.props); + + return ( + +
{ + if (!this.model_.debug) { + e.preventDefault(); e.stopPropagation(); + } + }} + > + + + + { this.handleOk(); }} + size="large"> + + + {!this.state.collapseLabel && ( + + {'Snapshot ' + (this.props.snapshotIndex + 1)} + + )} + +
+ { + this.setState({ name: ev.target.value }); + }} + /> +
+ { + this.setState({ color: newColor }); + }} /> + {this.state.canFullScreen && + { this.toggleFullScreen(); }} + color="inherit" + size="medium"> + {this.state.isFullScreen ? ( + + ) : ( + + + )} + + + } + { this.props.onClose(); }} + color="inherit" + size="medium"> + + + + + +
+
+
+ +
+ +
+
+ + { this.setState({ zoomedControlOpen: false }); }} + onDialogClosed={() => { this.model_.zoomedUiControl.set(undefined); } + } + /> + {this.state.showStatusMonitor && ()} +
+ ); + } + }, + appStyles +); + +export default SnapshotEditor; diff --git a/react/src/SnapshotPanel.tsx b/vite/src/pipedal/SnapshotPanel.tsx similarity index 100% rename from react/src/SnapshotPanel.tsx rename to vite/src/pipedal/SnapshotPanel.tsx diff --git a/react/src/SnapshotPropertiesDialog.tsx b/vite/src/pipedal/SnapshotPropertiesDialog.tsx similarity index 99% rename from react/src/SnapshotPropertiesDialog.tsx rename to vite/src/pipedal/SnapshotPropertiesDialog.tsx index f828742..a70f205 100644 --- a/react/src/SnapshotPropertiesDialog.tsx +++ b/vite/src/pipedal/SnapshotPropertiesDialog.tsx @@ -22,7 +22,7 @@ * SOFTWARE. */ -import React from 'react'; + import Button from '@mui/material/Button'; import TextField from '@mui/material/TextField'; import Typography from '@mui/material/Typography'; diff --git a/react/src/SplitControlView.tsx b/vite/src/pipedal/SplitControlView.tsx similarity index 96% rename from react/src/SplitControlView.tsx rename to vite/src/pipedal/SplitControlView.tsx index 45a560b..2ff7930 100644 --- a/react/src/SplitControlView.tsx +++ b/vite/src/pipedal/SplitControlView.tsx @@ -19,9 +19,10 @@ import { ReactNode } from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel'; import { UiPlugin } from './Lv2Plugin'; import { @@ -31,12 +32,13 @@ import PluginControl from './PluginControl'; import ResizeResponsiveComponent from './ResizeResponsiveComponent'; import VuMeter from './VuMeter'; import { SplitAbControl, SplitTypeControl, SplitMixControl, SplitPanLeftControl,SplitVolLeftControl,SplitPanRightControl,SplitVolRightControl } from './SplitUiControls'; +import { css } from '@emotion/react'; const LANDSCAPE_HEIGHT_BREAK = 500; const styles = (theme: Theme) => createStyles({ - frame: { + frame: css({ display: "block", position: "relative", flexDirection: "row", @@ -46,8 +48,8 @@ const styles = (theme: Theme) => createStyles({ height: "100%", overflowX: "auto", overflowY: "auto" - }, - vuMeterL: { + }), + vuMeterL: css({ position: "fixed", paddingLeft: 12, paddingRight: 12, @@ -55,8 +57,8 @@ const styles = (theme: Theme) => createStyles({ background: theme.mainBackground, zIndex: 3 - }, - vuMeterR: { + }), + vuMeterR: css({ position: "fixed", right: 0, marginRight: 22, @@ -64,8 +66,8 @@ const styles = (theme: Theme) => createStyles({ background: theme.mainBackground, zIndex: 3 - }, - vuMeterRLandscape: { + }), + vuMeterRLandscape: css({ position: "fixed", right: 0, paddingRight: 22, @@ -73,9 +75,9 @@ const styles = (theme: Theme) => createStyles({ background: theme.mainBackground, zIndex: 3 - }, + }), - normalGrid: { + normalGrid: css({ position: "relative", paddingLeft: 40, paddingRight: 40, @@ -83,19 +85,18 @@ const styles = (theme: Theme) => createStyles({ display: "flex", flexDirection: "row", flexWrap: "wrap", justifyContent: "flex-start", alignItems: "flex_start" - }, - landscapeGrid: { + }), + landscapeGrid: css({ paddingLeft: 40, marginRight: 40, display: "inline-flex", flexDirection: "row", flexWrap: "nowrap", justifyContent: "flex-start", alignItems: "flex_start", height: "100%" - } + }) }); interface SplitControlViewProps extends WithStyles { - theme: Theme; instanceId: number; item: PedalboardSplitItem; } @@ -104,7 +105,7 @@ type SplitControlViewState = { }; const SplitControlView = - withStyles(styles, { withTheme: true })( + withStyles( class extends ResizeResponsiveComponent { model: PiPedalModel; @@ -161,7 +162,7 @@ const SplitControlView = render(): ReactNode { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let pedalboardItem = this.model.pedalboard.get().getItem(this.props.instanceId); if (!pedalboardItem) @@ -277,7 +278,8 @@ const SplitControlView = } - } + }, + styles ); export default SplitControlView; diff --git a/react/src/SplitUiControls.tsx b/vite/src/pipedal/SplitUiControls.tsx similarity index 96% rename from react/src/SplitUiControls.tsx rename to vite/src/pipedal/SplitUiControls.tsx index e7206dc..4e4b7cd 100644 --- a/react/src/SplitUiControls.tsx +++ b/vite/src/pipedal/SplitUiControls.tsx @@ -38,6 +38,8 @@ export const SplitTypeControl: UiControl = new UiControl().deserialize({ not_on_gui: false, toggled_property: false, trigger_property: false, + pipedal_ledColor: "", + scale_points: ScalePoint.deserialize_array( [ { value: 0, label: "A/B" }, @@ -62,6 +64,7 @@ export const SplitAbControl: UiControl = new UiControl().deserialize({ not_on_gui: false, toggled_property: false, trigger_property: false, + pipedal_ledColor: "", scale_points: ScalePoint.deserialize_array( [ { value: 0, label: "A" }, @@ -87,6 +90,8 @@ export const SplitMixControl: UiControl = new UiControl().deserialize({ toggled_property: false, trigger_property: false, + pipedal_ledColor: "", + scale_points: [] }); @@ -105,6 +110,7 @@ export const SplitPanLeftControl: UiControl = new UiControl().deserialize({ not_on_gui: false, toggled_property: false, trigger_property: false, + pipedal_ledColor: "", scale_points: [] }); @@ -124,6 +130,7 @@ export const SplitVolLeftControl: UiControl = new UiControl().deserialize({ not_on_gui: false, toggled_property: false, trigger_property: false, + pipedal_ledColor: "", units: Units.db, scale_points: [ @@ -150,6 +157,7 @@ export const SplitPanRightControl: UiControl = new UiControl().deserialize({ not_on_gui: false, toggled_property: false, trigger_property: false, + pipedal_ledColor: "", scale_points: [] }); @@ -169,6 +177,7 @@ export const SplitVolRightControl: UiControl = new UiControl().deserialize({ not_on_gui: false, toggled_property: false, trigger_property: false, + pipedal_ledColor: "", units: Units.db, scale_points: [ diff --git a/react/src/StringBuilder.tsx b/vite/src/pipedal/StringBuilder.tsx similarity index 100% rename from react/src/StringBuilder.tsx rename to vite/src/pipedal/StringBuilder.tsx diff --git a/react/src/SvgPathBuilder.tsx b/vite/src/pipedal/SvgPathBuilder.tsx similarity index 100% rename from react/src/SvgPathBuilder.tsx rename to vite/src/pipedal/SvgPathBuilder.tsx diff --git a/react/src/SystemMidiBindingView.tsx b/vite/src/pipedal/SystemMidiBindingView.tsx similarity index 97% rename from react/src/SystemMidiBindingView.tsx rename to vite/src/pipedal/SystemMidiBindingView.tsx index a0e2b9f..0d3ab11 100644 --- a/react/src/SystemMidiBindingView.tsx +++ b/vite/src/pipedal/SystemMidiBindingView.tsx @@ -26,9 +26,10 @@ import { Component } from 'react'; import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import withStyles from '@mui/styles/withStyles'; -import createStyles from '@mui/styles/createStyles'; +import WithStyles from './WithStyles'; +import { withStyles } from "tss-react/mui"; +import {createStyles} from './WithStyles'; + import MenuItem from '@mui/material/MenuItem'; import Select from '@mui/material/Select'; import MidiBinding from './MidiBinding'; @@ -63,7 +64,7 @@ interface SystemMidiBindingViewState { const SystemMidiBindingView = - withStyles(styles, { withTheme: true })( + withStyles( class extends Component { model: PiPedalModel; @@ -143,7 +144,7 @@ const SystemMidiBindingView = render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let midiBinding = this.props.midiBinding; return ( @@ -213,6 +214,8 @@ const SystemMidiBindingView = ); } - }); + }, + styles + ); export default SystemMidiBindingView; \ No newline at end of file diff --git a/react/src/SystemMidiBindingsDialog.tsx b/vite/src/pipedal/SystemMidiBindingsDialog.tsx similarity index 95% rename from react/src/SystemMidiBindingsDialog.tsx rename to vite/src/pipedal/SystemMidiBindingsDialog.tsx index 52ad0e0..736f4d5 100644 --- a/react/src/SystemMidiBindingsDialog.tsx +++ b/vite/src/pipedal/SystemMidiBindingsDialog.tsx @@ -24,14 +24,16 @@ import React, { SyntheticEvent } from 'react'; +import { css } from '@emotion/react'; import DialogEx from './DialogEx'; import ResizeResponsiveComponent from './ResizeResponsiveComponent'; import { PiPedalModel, PiPedalModelFactory, ListenHandle } from './PiPedalModel'; import Typography from '@mui/material/Typography'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import AppBar from '@mui/material/AppBar'; import Toolbar from '@mui/material/Toolbar'; import ArrowBackIcon from '@mui/icons-material/ArrowBack'; @@ -41,37 +43,37 @@ import SystemMidiBindingView from './SystemMidiBindingView'; import Snackbar from '@mui/material/Snackbar'; const styles = (theme: Theme) => createStyles({ - dialogAppBar: { + dialogAppBar: css({ position: 'relative', top: 0, left: 0 - }, - dialogTitle: { + }), + dialogTitle: css({ marginLeft: theme.spacing(2), flex: "1 1 auto", - }, - pluginTable: { + }), + pluginTable: css({ borderCollapse: "collapse", width: "100%", - }, - pluginHead: { + }), + pluginHead: css({ borderTop: "1pt #DDD solid", paddingLeft: 22, paddingRight: 22 - }, - bindingTd: { + }), + bindingTd: css({ verticalAlign: "top", paddingLeft: 12, paddingBottom: 8 - }, - nameTd: { + }), + nameTd: css({ paddingLeft: 16, verticalAlign: "top", paddingTop: 12 - }, - plainRow: { + }), + plainRow: css({ borderWidth: "1px 0px 0px 0px", borderStyle: "solid", borderColor: "transparent" - }, - dividerRow: { + }), + dividerRow: css({ borderWidth: "1px 0px 0px 0px", borderStyle: "solid", borderColor: theme.palette.divider - } + }) }); @@ -105,7 +107,7 @@ export interface SystemMidiBindingDialogState { } export const SystemMidiBindingDialog = - withStyles(styles, { withTheme: true })( + withStyles( class extends ResizeResponsiveComponent { model: PiPedalModel; @@ -185,7 +187,7 @@ export const SystemMidiBindingDialog = this.props.onClose(); } - listenTimeoutHandle?: NodeJS.Timeout; + listenTimeoutHandle?: number; listenHandle?: ListenHandle; @@ -268,7 +270,7 @@ export const SystemMidiBindingDialog = this.model.setSystemMidiBinding(instanceId, newBinding); } generateTable(): React.ReactNode[] { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let result: React.ReactNode[] = []; let items = this.state.systemMidiBindings; @@ -319,7 +321,9 @@ export const SystemMidiBindingDialog = render() { let props = this.props; - let { open, classes } = props; + let { open} = props; + + const classes = withStyles.getClasses(this.props); if (!open) { return (
); } @@ -375,7 +379,9 @@ export const SystemMidiBindingDialog = ); } - }); + }, + styles + ); export default SystemMidiBindingDialog; \ No newline at end of file diff --git a/react/src/TemporaryDrawer.tsx b/vite/src/pipedal/TemporaryDrawer.tsx similarity index 92% rename from react/src/TemporaryDrawer.tsx rename to vite/src/pipedal/TemporaryDrawer.tsx index ffcca26..6c87b0f 100644 --- a/react/src/TemporaryDrawer.tsx +++ b/vite/src/pipedal/TemporaryDrawer.tsx @@ -18,9 +18,10 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import React, { Component } from 'react'; -import { WithStyles } from '@mui/styles'; -import withStyles from '@mui/styles/withStyles'; -import createStyles from '@mui/styles/createStyles'; +import WithStyles from './WithStyles'; +import { withStyles } from "tss-react/mui"; +import {createStyles} from './WithStyles'; + import IconButton from '@mui/material/Toolbar'; import Drawer from '@mui/material/Drawer'; @@ -55,14 +56,14 @@ interface DrawerProps extends WithStyles { position: Anchor; is_open: boolean; onClose?: CloseEventHandler; - children?: React.ReactChild | React.ReactChild[]; + children?: React.ReactNode; } type DrawerState = { is_open: boolean; } -export const TemporaryDrawer = withStyles(drawerStyles)( +export const TemporaryDrawer = withStyles( class extends Component { constructor(props: DrawerProps) { @@ -84,7 +85,7 @@ export const TemporaryDrawer = withStyles(drawerStyles)( } render() { - const { classes } = this.props; + const classes = withStyles.getClasses(this.props); return ( @@ -111,5 +112,6 @@ export const TemporaryDrawer = withStyles(drawerStyles)(
); } - } + }, + drawerStyles ); diff --git a/react/src/TextFieldEx.tsx b/vite/src/pipedal/TextFieldEx.tsx similarity index 99% rename from react/src/TextFieldEx.tsx rename to vite/src/pipedal/TextFieldEx.tsx index 4e7705e..9facc9d 100644 --- a/react/src/TextFieldEx.tsx +++ b/vite/src/pipedal/TextFieldEx.tsx @@ -3,7 +3,8 @@ import React from 'react'; import TextField, { TextFieldProps } from '@mui/material/TextField'; import { withStyles, WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; +import {createStyles} from './WithStyles'; + import { Theme } from '@mui/material/styles'; import Modal from '@mui/material/Modal'; diff --git a/react/src/ToobCabSimView.tsx b/vite/src/pipedal/ToobCabSimView.tsx similarity index 94% rename from react/src/ToobCabSimView.tsx rename to vite/src/pipedal/ToobCabSimView.tsx index 02dda9e..97e936e 100644 --- a/react/src/ToobCabSimView.tsx +++ b/vite/src/pipedal/ToobCabSimView.tsx @@ -20,9 +20,10 @@ import React from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import IControlViewFactory from './IControlViewFactory'; import { PiPedalModelFactory, PiPedalModel } from "./PiPedalModel"; @@ -45,7 +46,7 @@ interface ToobCabSimState { } const ToobCabSimView = - withStyles(styles, { withTheme: true })( + withStyles( class extends React.Component implements ControlViewCustomization { @@ -75,7 +76,8 @@ const ToobCabSimView = customizationId={this.customizationId} />); } - } + }, + styles ); diff --git a/react/src/ToobFrequencyResponseView.tsx b/vite/src/pipedal/ToobFrequencyResponseView.tsx similarity index 97% rename from react/src/ToobFrequencyResponseView.tsx rename to vite/src/pipedal/ToobFrequencyResponseView.tsx index 554972b..4a07ed3 100644 --- a/react/src/ToobFrequencyResponseView.tsx +++ b/vite/src/pipedal/ToobFrequencyResponseView.tsx @@ -20,9 +20,10 @@ import React from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import { PiPedalModelFactory, PiPedalModel, State } from "./PiPedalModel"; import Utility from './Utility'; @@ -60,13 +61,13 @@ interface ToobFrequencyResponseState { } const ToobFrequencyResponseView = - withStyles(styles, { withTheme: true })( + withStyles( class extends React.Component { model: PiPedalModel; customizationId: number = 1; - pathRef: React.RefObject; + pathRef: React.RefObject; constructor(props: ToobFrequencyResponseProps) { super(props); @@ -286,7 +287,7 @@ const ToobFrequencyResponseView = this.logMax = Math.log(this.fMax); - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); return (
@@ -296,7 +297,8 @@ const ToobFrequencyResponseView =
); } - } + }, + styles ); diff --git a/react/src/ToobInputStageView.tsx b/vite/src/pipedal/ToobInputStageView.tsx similarity index 94% rename from react/src/ToobInputStageView.tsx rename to vite/src/pipedal/ToobInputStageView.tsx index 66838fe..8f4f601 100644 --- a/react/src/ToobInputStageView.tsx +++ b/vite/src/pipedal/ToobInputStageView.tsx @@ -20,9 +20,10 @@ import React from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import IControlViewFactory from './IControlViewFactory'; import { PiPedalModelFactory, PiPedalModel } from "./PiPedalModel"; @@ -45,7 +46,7 @@ interface ToobInputStageState { } const ToobInputStageView = - withStyles(styles, { withTheme: true })( + withStyles( class extends React.Component implements ControlViewCustomization { @@ -77,7 +78,8 @@ const ToobInputStageView = customizationId={this.customizationId} />); } - } + }, + styles ); diff --git a/react/src/ToobMLView.tsx b/vite/src/pipedal/ToobMLView.tsx similarity index 96% rename from react/src/ToobMLView.tsx rename to vite/src/pipedal/ToobMLView.tsx index dc69c76..b33f18f 100644 --- a/react/src/ToobMLView.tsx +++ b/vite/src/pipedal/ToobMLView.tsx @@ -20,9 +20,10 @@ import React from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import IControlViewFactory from './IControlViewFactory'; import { PiPedalModelFactory, PiPedalModel, MonitorPortHandle } from "./PiPedalModel"; @@ -43,11 +44,11 @@ interface ToobMLState { } const ToobMLView = - withStyles(styles, { withTheme: true })( + withStyles( class extends React.Component implements ControlViewCustomization { model: PiPedalModel; - gainRef: React.RefObject; + gainRef: React.RefObject; customizationId: number = 1; @@ -142,7 +143,8 @@ const ToobMLView = customizationId={this.customizationId} />); } - } + }, + styles ); diff --git a/react/src/ToobPowerStage2View.tsx b/vite/src/pipedal/ToobPowerStage2View.tsx similarity index 97% rename from react/src/ToobPowerStage2View.tsx rename to vite/src/pipedal/ToobPowerStage2View.tsx index 9fe1641..868f694 100644 --- a/react/src/ToobPowerStage2View.tsx +++ b/vite/src/pipedal/ToobPowerStage2View.tsx @@ -20,9 +20,10 @@ import React from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import IControlViewFactory from './IControlViewFactory'; import { PiPedalModelFactory, PiPedalModel, State,ListenHandle } from "./PiPedalModel"; @@ -46,7 +47,7 @@ interface ToobPowerstage2State { } const ToobPowerstage2View = - withStyles(styles, { withTheme: true })( + withStyles( class extends React.Component implements ControlViewCustomization { @@ -177,7 +178,8 @@ const ToobPowerstage2View = customizationId={this.customizationId} />); } - } + }, + styles ); diff --git a/react/src/ToobSpectrumAnalyzerView.tsx b/vite/src/pipedal/ToobSpectrumAnalyzerView.tsx similarity index 94% rename from react/src/ToobSpectrumAnalyzerView.tsx rename to vite/src/pipedal/ToobSpectrumAnalyzerView.tsx index 9391f9a..0e600ba 100644 --- a/react/src/ToobSpectrumAnalyzerView.tsx +++ b/vite/src/pipedal/ToobSpectrumAnalyzerView.tsx @@ -20,9 +20,10 @@ import React from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import IControlViewFactory from './IControlViewFactory'; import { PiPedalModelFactory, PiPedalModel } from "./PiPedalModel"; @@ -46,7 +47,7 @@ interface ToobSpectrumAnalyzerState { } const ToobSpectrumAnalyzerView = - withStyles(styles, { withTheme: true })( + withStyles( class extends React.Component implements ControlViewCustomization { @@ -76,7 +77,8 @@ const ToobSpectrumAnalyzerView = customizationId={this.customizationId} />); } - } + }, + styles ); diff --git a/react/src/ToobSpectrumResponseView.tsx b/vite/src/pipedal/ToobSpectrumResponseView.tsx similarity index 97% rename from react/src/ToobSpectrumResponseView.tsx rename to vite/src/pipedal/ToobSpectrumResponseView.tsx index 424f97d..62b78e4 100644 --- a/react/src/ToobSpectrumResponseView.tsx +++ b/vite/src/pipedal/ToobSpectrumResponseView.tsx @@ -21,9 +21,10 @@ import React from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import { PiPedalModelFactory, PiPedalModel, State, ListenHandle } from "./PiPedalModel"; import { StandardItemSize } from './PluginControlView'; @@ -65,7 +66,7 @@ interface ToobSpectrumResponseState { } const ToobSpectrumResponseView = - withStyles(styles, { withTheme: true })( + withStyles( class extends React.Component { model: PiPedalModel; @@ -162,7 +163,6 @@ const ToobSpectrumResponseView = } private isMonitoring: boolean = false; - private hClock?: NodeJS.Timeout; private hAtomOutput?: ListenHandle; private maybeStartMonitoring(wantsMonitoring: boolean = true) { @@ -276,7 +276,7 @@ const ToobSpectrumResponseView = render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); return (
{/*
@@ -312,7 +312,8 @@ const ToobSpectrumResponseView =
); } - } + }, + styles ); diff --git a/react/src/ToobToneStackView.tsx b/vite/src/pipedal/ToobToneStackView.tsx similarity index 95% rename from react/src/ToobToneStackView.tsx rename to vite/src/pipedal/ToobToneStackView.tsx index 41eea1d..99d4ee0 100644 --- a/react/src/ToobToneStackView.tsx +++ b/vite/src/pipedal/ToobToneStackView.tsx @@ -20,9 +20,10 @@ import React from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import IControlViewFactory from './IControlViewFactory'; import { PiPedalModelFactory, PiPedalModel,ControlValueChangedHandle } from "./PiPedalModel"; @@ -45,7 +46,7 @@ interface ToobToneStackState { } const ToobToneStackView = - withStyles(styles, { withTheme: true })( + withStyles( class extends React.Component implements ControlViewCustomization { @@ -109,7 +110,8 @@ const ToobToneStackView = customizationId={this.customizationId} />); } - } + }, + styles ); diff --git a/react/src/ToobWaveShapeView.tsx b/vite/src/pipedal/ToobWaveShapeView.tsx similarity index 98% rename from react/src/ToobWaveShapeView.tsx rename to vite/src/pipedal/ToobWaveShapeView.tsx index 715291c..822050f 100644 --- a/react/src/ToobWaveShapeView.tsx +++ b/vite/src/pipedal/ToobWaveShapeView.tsx @@ -20,9 +20,10 @@ import React from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; -import withStyles from '@mui/styles/withStyles'; +import WithStyles from './WithStyles'; +import {createStyles} from './WithStyles'; + +import { withStyles } from "tss-react/mui"; import { PiPedalModelFactory, PiPedalModel, State, ControlValueChangedHandle } from "./PiPedalModel"; import { StandardItemSize } from './PluginControlView'; @@ -114,7 +115,7 @@ export class BidirectionalVuPeak { const ToobWaveShapeView = - withStyles(styles, { withTheme: true })( + withStyles( class extends React.Component { model: PiPedalModel; @@ -409,7 +410,7 @@ const ToobWaveShapeView = } render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let data = this.state.data; @@ -442,7 +443,8 @@ const ToobWaveShapeView =
); } - } + }, + styles ); diff --git a/react/src/Units.tsx b/vite/src/pipedal/Units.tsx similarity index 97% rename from react/src/Units.tsx rename to vite/src/pipedal/Units.tsx index 9a1af10..2819942 100644 --- a/react/src/Units.tsx +++ b/vite/src/pipedal/Units.tsx @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Robin Davies +// Copyright (c) 2024 Robin E. R. Davies // // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in diff --git a/react/src/UpdateDialog.tsx b/vite/src/pipedal/UpdateDialog.tsx similarity index 99% rename from react/src/UpdateDialog.tsx rename to vite/src/pipedal/UpdateDialog.tsx index 43e7f58..6e53948 100644 --- a/react/src/UpdateDialog.tsx +++ b/vite/src/pipedal/UpdateDialog.tsx @@ -22,7 +22,6 @@ * SOFTWARE. */ -import React from 'react'; import Button from '@mui/material/Button'; import Typography from '@mui/material/Typography'; import Divider from '@mui/material/Divider'; @@ -76,17 +75,14 @@ export default class UpdateDialog extends ResizeResponsiveComponent
); + return (); case FileUploadStatus.Uploaded: - return (
); + return ( + ); case FileUploadStatus.Uploading: - return (); + + return (); + default: - return (); - } + return () + } + + } + getIcon(status: FileUploadStatus) { + let size = 16; + + //let top = 0; + + return ( +
+ { + this.innerGetIcon(status) + } +
+ ); } makeBrowserAcceptList() { let result = UiFileType.MergeMimeTypes(this.props.fileProperty.fileTypes); @@ -368,9 +385,13 @@ export default class UploadFileDialog extends ResizeResponsiveComponent -
+
{this.getIcon(upload.status)} - {upload.name} + {upload.name}
diff --git a/react/src/UploadPresetDialog.tsx b/vite/src/pipedal/UploadPresetDialog.tsx similarity index 100% rename from react/src/UploadPresetDialog.tsx rename to vite/src/pipedal/UploadPresetDialog.tsx diff --git a/react/src/Utility.tsx b/vite/src/pipedal/Utility.tsx similarity index 100% rename from react/src/Utility.tsx rename to vite/src/pipedal/Utility.tsx diff --git a/react/src/VirtualKeyboardHandler.tsx b/vite/src/pipedal/VirtualKeyboardHandler.tsx similarity index 99% rename from react/src/VirtualKeyboardHandler.tsx rename to vite/src/pipedal/VirtualKeyboardHandler.tsx index 93b75de..cb8689f 100644 --- a/react/src/VirtualKeyboardHandler.tsx +++ b/vite/src/pipedal/VirtualKeyboardHandler.tsx @@ -41,7 +41,6 @@ export default class VirtualKeyboardHandler this.virtualKeyboard = navigator["virtualKeyboard"]; if (this.virtualKeyboard) { - alert("Has Virtual keyboard!"); this.virtualKeyboard.addEventListener("geometryChange",this.handleGeometryChange); } } diff --git a/react/src/VuMeter.tsx b/vite/src/pipedal/VuMeter.tsx similarity index 94% rename from react/src/VuMeter.tsx rename to vite/src/pipedal/VuMeter.tsx index c524eef..c77fbe0 100644 --- a/react/src/VuMeter.tsx +++ b/vite/src/pipedal/VuMeter.tsx @@ -19,8 +19,10 @@ import React, { Component } from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import {createStyles,withStyles} from '@mui/styles'; +import WithStyles, {withTheme} from './WithStyles'; +import { withStyles } from "tss-react/mui"; +import { css } from '@emotion/react'; + import { PiPedalModel, State,PiPedalModelFactory, VuUpdateInfo, VuSubscriptionHandle } from './PiPedalModel'; @@ -95,8 +97,8 @@ class TelltaleState { const LEFT_X = BORDER_THICKNESS; const RIGHT_X = BORDER_THICKNESS + + CHANNEL_WIDTH + BORDER_THICKNESS; -const styles = (theme: Theme) => createStyles({ - frame: { +const styles = (theme: Theme) => ({ + frame: css({ position: "relative", width: CHANNEL_WIDTH + 2*BORDER_THICKNESS, borderTop: BORDER_THICKNESS + "px black solid", @@ -106,8 +108,8 @@ const styles = (theme: Theme) => createStyles({ overflow: "hidden", marginLeft: (CHANNEL_WIDTH+BORDER_THICKNESS)/2, marginRight: (CHANNEL_WIDTH+BORDER_THICKNESS)/2 - }, - frameStereo: { + }), + frameStereo: css({ position: "relative", width: 2*CHANNEL_WIDTH + 3*BORDER_THICKNESS, borderTop: BORDER_THICKNESS + "px black solid", @@ -115,14 +117,14 @@ const styles = (theme: Theme) => createStyles({ height: DISPLAY_HEIGHT, background: "black", overflow: "hidden", - }, - monoTextFrame: { + }), + monoTextFrame: css({ display: "flex",flexFlow: "column nowrap", alignItems: "center", textAlign: "center" - }, - stereoTextFrame: { + }), + stereoTextFrame: css({ display: "flex",flexFlow: "column nowrap", alignItems: "center", textAlign: "center" - }, - vuTextFrame: { + }), + vuTextFrame: css({ color: theme.palette.text.secondary, display: "table-cell", position: "relative", @@ -132,32 +134,32 @@ const styles = (theme: Theme) => createStyles({ fontSize: "11px", justifyContent: "center", alignItems: "center" - }, - redFrameL: { + }), + redFrameL: css({ position: "absolute", top: "100%", left: LEFT_X, width: CHANNEL_WIDTH, height: DISPLAY_HEIGHT - 2, background: "#F00" - }, - yellowFrameL: { + }), + yellowFrameL: css({ top: "100%", left: LEFT_X, width: CHANNEL_WIDTH, position: "absolute", height: DISPLAY_HEIGHT - 2, background: "#CC0" - }, - greenFrameL: { + }), + greenFrameL: css({ top: "100%", left: LEFT_X, width: CHANNEL_WIDTH, position: "absolute", height: DISPLAY_HEIGHT - 2, background: "#0C2" - }, - indicatorL: { + }), + indicatorL: css({ position: "absolute", left: LEFT_X, width: CHANNEL_WIDTH, @@ -165,32 +167,32 @@ const styles = (theme: Theme) => createStyles({ top: "100%", background: "#F00" - }, - redFrameR: { + }), + redFrameR: css({ position: "absolute", top: "100%", left: RIGHT_X, width: CHANNEL_WIDTH, height: DISPLAY_HEIGHT - 2, background: "#F00" - }, - yellowFrameR: { + }), + yellowFrameR: css({ top: "100%", left: RIGHT_X, width: CHANNEL_WIDTH, position: "absolute", height: DISPLAY_HEIGHT - 2, background: "#CC0" - }, - greenFrameR: { + }), + greenFrameR: css({ top: "100%", left: RIGHT_X, width: CHANNEL_WIDTH, position: "absolute", height: DISPLAY_HEIGHT - 2, background: "#0C2" - }, - indicatorR: { + }), + indicatorR: css({ position: "absolute", left: RIGHT_X, width: CHANNEL_WIDTH, @@ -198,7 +200,7 @@ const styles = (theme: Theme) => createStyles({ top: "100%", background: "#F00" - } + }) }); @@ -229,11 +231,11 @@ function dbToY(db: number): number { } export const VuMeter = - withStyles(styles, { withTheme: true })( + withTheme(withStyles( class extends Component { - divRef: React.RefObject = React.createRef(); - textRef: React.RefObject = React.createRef(); + divRef: React.RefObject = React.createRef(); + textRef: React.RefObject = React.createRef(); model: PiPedalModel; yZero: number; @@ -441,7 +443,7 @@ export const VuMeter = render() { let displayText = this.props.displayText??false; - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); if (displayText) { return ( @@ -461,7 +463,7 @@ export const VuMeter = renderVus() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); if (!this.state.isStereo) { return (
@@ -507,8 +509,9 @@ export const VuMeter = this.removeVuSubscription(); this.model.state.removeOnChangedHandler(this.onStateChanged); } - } - ); + }, + styles + )); export default VuMeter; diff --git a/react/src/WifiChannel.tsx b/vite/src/pipedal/WifiChannel.tsx similarity index 100% rename from react/src/WifiChannel.tsx rename to vite/src/pipedal/WifiChannel.tsx diff --git a/react/src/WifiConfigDialog.tsx b/vite/src/pipedal/WifiConfigDialog.tsx similarity index 99% rename from react/src/WifiConfigDialog.tsx rename to vite/src/pipedal/WifiConfigDialog.tsx index 7e35386..e90aafe 100644 --- a/react/src/WifiConfigDialog.tsx +++ b/vite/src/pipedal/WifiConfigDialog.tsx @@ -33,9 +33,10 @@ import ResizeResponsiveComponent from './ResizeResponsiveComponent'; import WifiConfigSettings from './WifiConfigSettings'; import Typography from '@mui/material/Typography'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import withStyles from '@mui/styles/withStyles'; -import createStyles from '@mui/styles/createStyles'; +import WithStyles from './WithStyles'; +import { withStyles } from "tss-react/mui"; +import {createStyles} from './WithStyles'; + import Select from '@mui/material/Select'; import FormControl from '@mui/material/FormControl'; import InputLabel from '@mui/material/InputLabel'; @@ -91,11 +92,11 @@ export interface WifiConfigState { let gCountryCodeOptions: { id: string, label: string }[] | undefined = undefined; -const WifiConfigDialog = withStyles(styles, { withTheme: true })( +const WifiConfigDialog = withStyles( class extends ResizeResponsiveComponent { - refName: React.RefObject; - refPassword: React.RefObject; + refName: React.RefObject; + refPassword: React.RefObject; model: PiPedalModel; constructor(props: WifiConfigProps) { @@ -373,7 +374,7 @@ const WifiConfigDialog = withStyles(styles, { withTheme: true })( render() { let props = this.props; - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); let { open, onClose } = props; const handleClose = () => { @@ -701,6 +702,7 @@ const WifiConfigDialog = withStyles(styles, { withTheme: true })( ); } - }); + }, + styles); export default WifiConfigDialog; \ No newline at end of file diff --git a/react/src/WifiConfigSettings.tsx b/vite/src/pipedal/WifiConfigSettings.tsx similarity index 100% rename from react/src/WifiConfigSettings.tsx rename to vite/src/pipedal/WifiConfigSettings.tsx diff --git a/react/src/WifiDirectConfigDialog.tsx b/vite/src/pipedal/WifiDirectConfigDialog.tsx similarity index 97% rename from react/src/WifiDirectConfigDialog.tsx rename to vite/src/pipedal/WifiDirectConfigDialog.tsx index 679a2ab..90909e6 100644 --- a/react/src/WifiDirectConfigDialog.tsx +++ b/vite/src/pipedal/WifiDirectConfigDialog.tsx @@ -35,25 +35,18 @@ import Switch from '@mui/material/Switch'; import FormControlLabel from '@mui/material/FormControlLabel'; import ResizeResponsiveComponent from './ResizeResponsiveComponent'; import WifiDirectConfigSettings from './WifiDirectConfigSettings'; -import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import withStyles from '@mui/styles/withStyles'; -import createStyles from '@mui/styles/createStyles'; + +//import { withStyles } from "tss-react/mui"; import MenuItem from '@mui/material/MenuItem'; import WifiChannel from './WifiChannel'; import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel'; -const styles = (theme: Theme) => createStyles({ - pgraph: { - paddingBottom: 16 - } -}); declare let crypto: any; const NBSP = "\u00A0"; -export interface WifiDirectConfigProps extends WithStyles { +export interface WifiDirectConfigProps { open: boolean, wifiDirectConfigSettings: WifiDirectConfigSettings, onOk: (wifiDirectConfigSettings: WifiDirectConfigSettings) => void, @@ -79,11 +72,11 @@ export interface WifiDirectConfigState { -const WifiDirectConfigDialog = withStyles(styles, { withTheme: true })( +const WifiDirectConfigDialog = class extends ResizeResponsiveComponent { - refName: React.RefObject; - refPassword: React.RefObject; + refName: React.RefObject; + refPassword: React.RefObject; model: PiPedalModel; constructor(props: WifiDirectConfigProps) { @@ -516,6 +509,6 @@ const WifiDirectConfigDialog = withStyles(styles, { withTheme: true })( ); } - }); + }; export default WifiDirectConfigDialog; \ No newline at end of file diff --git a/react/src/WifiDirectConfigSettings.tsx b/vite/src/pipedal/WifiDirectConfigSettings.tsx similarity index 100% rename from react/src/WifiDirectConfigSettings.tsx rename to vite/src/pipedal/WifiDirectConfigSettings.tsx diff --git a/react/src/WindowScale.tsx b/vite/src/pipedal/WindowScale.tsx similarity index 100% rename from react/src/WindowScale.tsx rename to vite/src/pipedal/WindowScale.tsx diff --git a/vite/src/pipedal/WithStyles.tsx b/vite/src/pipedal/WithStyles.tsx new file mode 100644 index 0000000..19a1e87 --- /dev/null +++ b/vite/src/pipedal/WithStyles.tsx @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2025 Robin E. R. Davies + * All rights reserved. + + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +import React from 'react'; + +import { Theme, useTheme } from '@mui/material/styles'; + +export function createStyles(style: T): T { + return style; +} + +export default + interface WithStyles any> { + className?: string; + classes?: Partial, string>>; + +} + +export interface WithTheme { + theme: Theme; +} + + +// export function XXwithTheme(Component: React.ComponentType>) { +// return function ( +// Component: React.ComponentType +// ) { +// return function (props: Omit): React.JSX.Element { + +// const theme = useTheme(); +// const newProps = { ...props, theme: theme } as T; +// return +// } +// }; +// }; + + + + +export function withTheme(Component: React.ComponentType) { + return function (props: Omit): React.JSX.Element { + + const theme = useTheme(); + const newProps = {theme: theme, ...props} as PROPS; + return React.createElement(Component,newProps); + } +}; + + + \ No newline at end of file diff --git a/vite/src/pipedal/XxxSnippet.tsx b/vite/src/pipedal/XxxSnippet.tsx new file mode 100644 index 0000000..6a037fb --- /dev/null +++ b/vite/src/pipedal/XxxSnippet.tsx @@ -0,0 +1,58 @@ + +import React from 'react'; +import { withStyles } from "tss-react/mui"; +import { css } from '@emotion/react'; + +import { Theme } from "@mui/material"; + + + + +// const styles : (theme: Theme) => Record +const styles + = ((theme: Theme) => { + return { + root: { + color: theme.palette.primary.main + }, + frame: css({ + margin: "12px", + color: "red", + position: "absolute", + height: '100%', + width: '100%', + borderRadius: 14 / 2, + zIndex: -1, + transition: theme.transitions.create(['opacity', 'background-color'], { + duration: theme.transitions.duration.shortest + }), + backgroundColor: theme.palette.secondary.main, + opacity: theme.palette.mode === 'light' ? 0.38 : 0.3, + //position: "absolute" + + }) + + } +}); + +export interface DummyProps { + className?: string; + classes?: Partial, string>>; + +}; + + +class DummyBase extends React.Component { + render() { + const classes = withStyles.getClasses(this.props); + return (
); + } +} + +const Dummy = withStyles( + DummyBase, + styles +); + +export default Dummy; + diff --git a/react/src/ZoomedDial.tsx b/vite/src/pipedal/ZoomedDial.tsx similarity index 97% rename from react/src/ZoomedDial.tsx rename to vite/src/pipedal/ZoomedDial.tsx index 4d168d6..e657d65 100644 --- a/react/src/ZoomedDial.tsx +++ b/vite/src/pipedal/ZoomedDial.tsx @@ -18,11 +18,12 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import React, { TouchEvent, PointerEvent, SyntheticEvent } from 'react'; import { Theme } from '@mui/material/styles'; -import { WithStyles } from '@mui/styles'; -import withStyles from '@mui/styles/withStyles'; -import createStyles from '@mui/styles/createStyles'; +import WithStyles from './WithStyles'; +import { withStyles } from "tss-react/mui"; +import {createStyles} from './WithStyles'; + import { PiPedalModel, PiPedalModelFactory, ZoomedControlInfo } from './PiPedalModel'; -import { ReactComponent as DialIcon } from './svg/fx_dial.svg'; +import DialIcon from './svg/fx_dial.svg?react'; const SELECTED_OPACITY = 0.8; const DEFAULT_OPACITY = 0.6; @@ -45,7 +46,6 @@ const styles = (theme: Theme) => createStyles({ interface ZoomedDialProps extends WithStyles { - theme: Theme, size: number, controlInfo: ZoomedControlInfo | undefined, @@ -58,12 +58,12 @@ interface ZoomedDialState { } -const ZoomedDial = withStyles(styles, { withTheme: true })( +const ZoomedDial = withStyles( class extends React.Component { model: PiPedalModel = PiPedalModelFactory.getInstance(); - imgRef: React.RefObject = React.createRef(); + imgRef: React.RefObject = React.createRef(); constructor(props: ZoomedDialProps) { super(props); @@ -395,7 +395,7 @@ const ZoomedDial = withStyles(styles, { withTheme: true })( render() { - let classes = this.props.classes; + const classes = withStyles.getClasses(this.props); return ( ); } - } + }, + styles ); export default ZoomedDial; diff --git a/react/src/ZoomedUiControl.tsx b/vite/src/pipedal/ZoomedUiControl.tsx similarity index 97% rename from react/src/ZoomedUiControl.tsx rename to vite/src/pipedal/ZoomedUiControl.tsx index 06d71b7..b8b1d57 100644 --- a/react/src/ZoomedUiControl.tsx +++ b/vite/src/pipedal/ZoomedUiControl.tsx @@ -23,8 +23,11 @@ import Select from '@mui/material/Select'; import Switch from '@mui/material/Switch'; import { UiControl, ScalePoint } from './Lv2Plugin'; import { Theme } from '@mui/material/styles'; -import { WithStyles, withStyles } from '@mui/styles'; -import createStyles from '@mui/styles/createStyles'; +import WithStyles, {withTheme} from './WithStyles'; +import { withStyles } from "tss-react/mui"; + +import {createStyles} from './WithStyles'; + import { ZoomedControlInfo } from './PiPedalModel'; import DialogEx from './DialogEx'; import Typography from '@mui/material/Typography'; @@ -73,7 +76,7 @@ const Transition = React.forwardRef(function Transition( */ -const ZoomedUiControl = withStyles(styles, { withTheme: true })( +const ZoomedUiControl = withTheme(withStyles( class extends React.Component { @@ -152,6 +155,8 @@ const ZoomedUiControl = withStyles(styles, { withTheme: true })( } makeSelect(control: UiControl, value: number): ReactNode { + const classes = withStyles.getClasses(this.props); + if (control.isOnOffSwitch()) { // normal gray unchecked state. return ( @@ -170,7 +175,7 @@ const ZoomedUiControl = withStyles(styles, { withTheme: true })( this.onCheckChanged(event.target.checked); }} classes={{ - track: this.props.classes.switchTrack + track: classes.switchTrack }} style={{ color: this.props.theme.palette.primary.main }} /> @@ -289,7 +294,7 @@ const ZoomedUiControl = withStyles(styles, { withTheme: true })( ); } - } -); + }, + styles)); export default ZoomedUiControl; diff --git a/react/src/logo.svg b/vite/src/pipedal/logo.svg similarity index 100% rename from react/src/logo.svg rename to vite/src/pipedal/logo.svg diff --git a/react/src/react-app-env.d.ts b/vite/src/pipedal/react-app-env.d.ts similarity index 100% rename from react/src/react-app-env.d.ts rename to vite/src/pipedal/react-app-env.d.ts diff --git a/react/src/svg/drive_file_rename_outline_black_24dp.svg b/vite/src/pipedal/svg/drive_file_rename_outline_black_24dp.svg similarity index 100% rename from react/src/svg/drive_file_rename_outline_black_24dp.svg rename to vite/src/pipedal/svg/drive_file_rename_outline_black_24dp.svg diff --git a/react/src/svg/file_download_black_24dp.svg b/vite/src/pipedal/svg/file_download_black_24dp.svg similarity index 100% rename from react/src/svg/file_download_black_24dp.svg rename to vite/src/pipedal/svg/file_download_black_24dp.svg diff --git a/react/src/svg/file_upload_black_24dp.svg b/vite/src/pipedal/svg/file_upload_black_24dp.svg similarity index 100% rename from react/src/svg/file_upload_black_24dp.svg rename to vite/src/pipedal/svg/file_upload_black_24dp.svg diff --git a/react/src/svg/fx_amplifier.svg b/vite/src/pipedal/svg/fx_amplifier.svg similarity index 100% rename from react/src/svg/fx_amplifier.svg rename to vite/src/pipedal/svg/fx_amplifier.svg diff --git a/react/src/svg/fx_analyzer.svg b/vite/src/pipedal/svg/fx_analyzer.svg similarity index 100% rename from react/src/svg/fx_analyzer.svg rename to vite/src/pipedal/svg/fx_analyzer.svg diff --git a/react/src/svg/fx_chorus.svg b/vite/src/pipedal/svg/fx_chorus.svg similarity index 100% rename from react/src/svg/fx_chorus.svg rename to vite/src/pipedal/svg/fx_chorus.svg diff --git a/react/src/svg/fx_compressor.svg b/vite/src/pipedal/svg/fx_compressor.svg similarity index 100% rename from react/src/svg/fx_compressor.svg rename to vite/src/pipedal/svg/fx_compressor.svg diff --git a/react/src/svg/fx_constant.svg b/vite/src/pipedal/svg/fx_constant.svg similarity index 100% rename from react/src/svg/fx_constant.svg rename to vite/src/pipedal/svg/fx_constant.svg diff --git a/react/src/svg/fx_converter.svg b/vite/src/pipedal/svg/fx_converter.svg similarity index 100% rename from react/src/svg/fx_converter.svg rename to vite/src/pipedal/svg/fx_converter.svg diff --git a/react/src/svg/fx_delay.svg b/vite/src/pipedal/svg/fx_delay.svg similarity index 100% rename from react/src/svg/fx_delay.svg rename to vite/src/pipedal/svg/fx_delay.svg diff --git a/react/src/svg/fx_dial.svg b/vite/src/pipedal/svg/fx_dial.svg similarity index 100% rename from react/src/svg/fx_dial.svg rename to vite/src/pipedal/svg/fx_dial.svg diff --git a/react/src/svg/fx_distortion.svg b/vite/src/pipedal/svg/fx_distortion.svg similarity index 100% rename from react/src/svg/fx_distortion.svg rename to vite/src/pipedal/svg/fx_distortion.svg diff --git a/react/src/svg/fx_empty.svg b/vite/src/pipedal/svg/fx_empty.svg similarity index 100% rename from react/src/svg/fx_empty.svg rename to vite/src/pipedal/svg/fx_empty.svg diff --git a/react/src/svg/fx_eq.svg b/vite/src/pipedal/svg/fx_eq.svg similarity index 100% rename from react/src/svg/fx_eq.svg rename to vite/src/pipedal/svg/fx_eq.svg diff --git a/react/src/svg/fx_error.svg b/vite/src/pipedal/svg/fx_error.svg similarity index 100% rename from react/src/svg/fx_error.svg rename to vite/src/pipedal/svg/fx_error.svg diff --git a/react/src/svg/fx_filter.svg b/vite/src/pipedal/svg/fx_filter.svg similarity index 100% rename from react/src/svg/fx_filter.svg rename to vite/src/pipedal/svg/fx_filter.svg diff --git a/react/src/svg/fx_filter_hp.svg b/vite/src/pipedal/svg/fx_filter_hp.svg similarity index 100% rename from react/src/svg/fx_filter_hp.svg rename to vite/src/pipedal/svg/fx_filter_hp.svg diff --git a/react/src/svg/fx_flanger.svg b/vite/src/pipedal/svg/fx_flanger.svg similarity index 100% rename from react/src/svg/fx_flanger.svg rename to vite/src/pipedal/svg/fx_flanger.svg diff --git a/react/src/svg/fx_flanger2.svg b/vite/src/pipedal/svg/fx_flanger2.svg similarity index 100% rename from react/src/svg/fx_flanger2.svg rename to vite/src/pipedal/svg/fx_flanger2.svg diff --git a/react/src/svg/fx_function.svg b/vite/src/pipedal/svg/fx_function.svg similarity index 100% rename from react/src/svg/fx_function.svg rename to vite/src/pipedal/svg/fx_function.svg diff --git a/react/src/svg/fx_gate.svg b/vite/src/pipedal/svg/fx_gate.svg similarity index 100% rename from react/src/svg/fx_gate.svg rename to vite/src/pipedal/svg/fx_gate.svg diff --git a/react/src/svg/fx_generator.svg b/vite/src/pipedal/svg/fx_generator.svg similarity index 100% rename from react/src/svg/fx_generator.svg rename to vite/src/pipedal/svg/fx_generator.svg diff --git a/react/src/svg/fx_instrument.svg b/vite/src/pipedal/svg/fx_instrument.svg similarity index 100% rename from react/src/svg/fx_instrument.svg rename to vite/src/pipedal/svg/fx_instrument.svg diff --git a/react/src/svg/fx_limiter.svg b/vite/src/pipedal/svg/fx_limiter.svg similarity index 100% rename from react/src/svg/fx_limiter.svg rename to vite/src/pipedal/svg/fx_limiter.svg diff --git a/react/src/svg/fx_lr.svg b/vite/src/pipedal/svg/fx_lr.svg similarity index 100% rename from react/src/svg/fx_lr.svg rename to vite/src/pipedal/svg/fx_lr.svg diff --git a/react/src/svg/fx_mixer.svg b/vite/src/pipedal/svg/fx_mixer.svg similarity index 100% rename from react/src/svg/fx_mixer.svg rename to vite/src/pipedal/svg/fx_mixer.svg diff --git a/react/src/svg/fx_modulator.svg b/vite/src/pipedal/svg/fx_modulator.svg similarity index 100% rename from react/src/svg/fx_modulator.svg rename to vite/src/pipedal/svg/fx_modulator.svg diff --git a/react/src/svg/fx_oscillator.svg b/vite/src/pipedal/svg/fx_oscillator.svg similarity index 100% rename from react/src/svg/fx_oscillator.svg rename to vite/src/pipedal/svg/fx_oscillator.svg diff --git a/react/src/svg/fx_parametric_eq.svg b/vite/src/pipedal/svg/fx_parametric_eq.svg similarity index 100% rename from react/src/svg/fx_parametric_eq.svg rename to vite/src/pipedal/svg/fx_parametric_eq.svg diff --git a/react/src/svg/fx_phaser.svg b/vite/src/pipedal/svg/fx_phaser.svg similarity index 100% rename from react/src/svg/fx_phaser.svg rename to vite/src/pipedal/svg/fx_phaser.svg diff --git a/react/src/svg/fx_pitch.svg b/vite/src/pipedal/svg/fx_pitch.svg similarity index 100% rename from react/src/svg/fx_pitch.svg rename to vite/src/pipedal/svg/fx_pitch.svg diff --git a/react/src/svg/fx_plugin.svg b/vite/src/pipedal/svg/fx_plugin.svg similarity index 100% rename from react/src/svg/fx_plugin.svg rename to vite/src/pipedal/svg/fx_plugin.svg diff --git a/react/src/svg/fx_reverb.svg b/vite/src/pipedal/svg/fx_reverb.svg similarity index 100% rename from react/src/svg/fx_reverb.svg rename to vite/src/pipedal/svg/fx_reverb.svg diff --git a/react/src/svg/fx_simulator.svg b/vite/src/pipedal/svg/fx_simulator.svg similarity index 100% rename from react/src/svg/fx_simulator.svg rename to vite/src/pipedal/svg/fx_simulator.svg diff --git a/react/src/svg/fx_spatial.svg b/vite/src/pipedal/svg/fx_spatial.svg similarity index 100% rename from react/src/svg/fx_spatial.svg rename to vite/src/pipedal/svg/fx_spatial.svg diff --git a/react/src/svg/fx_spectral.svg b/vite/src/pipedal/svg/fx_spectral.svg similarity index 100% rename from react/src/svg/fx_spectral.svg rename to vite/src/pipedal/svg/fx_spectral.svg diff --git a/react/src/svg/fx_split_a.svg b/vite/src/pipedal/svg/fx_split_a.svg similarity index 100% rename from react/src/svg/fx_split_a.svg rename to vite/src/pipedal/svg/fx_split_a.svg diff --git a/react/src/svg/fx_split_b.svg b/vite/src/pipedal/svg/fx_split_b.svg similarity index 100% rename from react/src/svg/fx_split_b.svg rename to vite/src/pipedal/svg/fx_split_b.svg diff --git a/react/src/svg/fx_terminal.svg b/vite/src/pipedal/svg/fx_terminal.svg similarity index 100% rename from react/src/svg/fx_terminal.svg rename to vite/src/pipedal/svg/fx_terminal.svg diff --git a/react/src/svg/fx_utility.svg b/vite/src/pipedal/svg/fx_utility.svg similarity index 100% rename from react/src/svg/fx_utility.svg rename to vite/src/pipedal/svg/fx_utility.svg diff --git a/react/src/svg/ic_bank.svg b/vite/src/pipedal/svg/ic_bank.svg similarity index 100% rename from react/src/svg/ic_bank.svg rename to vite/src/pipedal/svg/ic_bank.svg diff --git a/react/src/svg/ic_edit_banks.svg b/vite/src/pipedal/svg/ic_edit_banks.svg similarity index 100% rename from react/src/svg/ic_edit_banks.svg rename to vite/src/pipedal/svg/ic_edit_banks.svg diff --git a/react/src/svg/ic_help_outline.svg b/vite/src/pipedal/svg/ic_help_outline.svg similarity index 100% rename from react/src/svg/ic_help_outline.svg rename to vite/src/pipedal/svg/ic_help_outline.svg diff --git a/react/src/svg/ic_midi.svg b/vite/src/pipedal/svg/ic_midi.svg similarity index 100% rename from react/src/svg/ic_midi.svg rename to vite/src/pipedal/svg/ic_midi.svg diff --git a/react/src/svg/ic_pluginpreset.svg b/vite/src/pipedal/svg/ic_pluginpreset.svg similarity index 100% rename from react/src/svg/ic_pluginpreset.svg rename to vite/src/pipedal/svg/ic_pluginpreset.svg diff --git a/react/src/svg/ic_pluginpreset2.svg b/vite/src/pipedal/svg/ic_pluginpreset2.svg similarity index 100% rename from react/src/svg/ic_pluginpreset2.svg rename to vite/src/pipedal/svg/ic_pluginpreset2.svg diff --git a/react/src/svg/ic_presets.svg b/vite/src/pipedal/svg/ic_presets.svg similarity index 100% rename from react/src/svg/ic_presets.svg rename to vite/src/pipedal/svg/ic_presets.svg diff --git a/react/src/svg/ic_save_bank_as.svg b/vite/src/pipedal/svg/ic_save_bank_as.svg similarity index 100% rename from react/src/svg/ic_save_bank_as.svg rename to vite/src/pipedal/svg/ic_save_bank_as.svg diff --git a/react/src/svg/ic_settings.svg b/vite/src/pipedal/svg/ic_settings.svg similarity index 100% rename from react/src/svg/ic_settings.svg rename to vite/src/pipedal/svg/ic_settings.svg diff --git a/react/src/svg/old_delete_outline_24dp.svg b/vite/src/pipedal/svg/old_delete_outline_24dp.svg similarity index 100% rename from react/src/svg/old_delete_outline_24dp.svg rename to vite/src/pipedal/svg/old_delete_outline_24dp.svg diff --git a/react/src/svg/snapshot_0.svg b/vite/src/pipedal/svg/snapshot_0.svg similarity index 100% rename from react/src/svg/snapshot_0.svg rename to vite/src/pipedal/svg/snapshot_0.svg diff --git a/react/src/svg/snapshot_1.svg b/vite/src/pipedal/svg/snapshot_1.svg similarity index 100% rename from react/src/svg/snapshot_1.svg rename to vite/src/pipedal/svg/snapshot_1.svg diff --git a/react/src/svg/snapshot_2.svg b/vite/src/pipedal/svg/snapshot_2.svg similarity index 100% rename from react/src/svg/snapshot_2.svg rename to vite/src/pipedal/svg/snapshot_2.svg diff --git a/react/src/svg/snapshot_3.svg b/vite/src/pipedal/svg/snapshot_3.svg similarity index 100% rename from react/src/svg/snapshot_3.svg rename to vite/src/pipedal/svg/snapshot_3.svg diff --git a/react/src/svg/snapshot_4.svg b/vite/src/pipedal/svg/snapshot_4.svg similarity index 100% rename from react/src/svg/snapshot_4.svg rename to vite/src/pipedal/svg/snapshot_4.svg diff --git a/react/src/svg/snapshot_5.svg b/vite/src/pipedal/svg/snapshot_5.svg similarity index 100% rename from react/src/svg/snapshot_5.svg rename to vite/src/pipedal/svg/snapshot_5.svg diff --git a/react/src/svg/snapshot_6.svg b/vite/src/pipedal/svg/snapshot_6.svg similarity index 100% rename from react/src/svg/snapshot_6.svg rename to vite/src/pipedal/svg/snapshot_6.svg diff --git a/vite/src/vite-env.d.ts b/vite/src/vite-env.d.ts new file mode 100644 index 0000000..ee9857a --- /dev/null +++ b/vite/src/vite-env.d.ts @@ -0,0 +1,2 @@ +/// +/// diff --git a/vite/tsconfig.app.json b/vite/tsconfig.app.json new file mode 100644 index 0000000..6440f1e --- /dev/null +++ b/vite/tsconfig.app.json @@ -0,0 +1,26 @@ +{ + "compilerOptions": { + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo", + "target": "ES2020", + "useDefineForClassFields": true, + "lib": ["ES2020", "DOM", "DOM.Iterable"], + "module": "ESNext", + "skipLibCheck": true, + + /* Bundler mode */ + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "isolatedModules": true, + "moduleDetection": "force", + "noEmit": true, + "jsx": "react-jsx", + + /* Linting */ + "strict": true, + "noUnusedLocals": true, + // "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true + }, + "include": ["src"] +} diff --git a/vite/tsconfig.json b/vite/tsconfig.json new file mode 100644 index 0000000..1ffef60 --- /dev/null +++ b/vite/tsconfig.json @@ -0,0 +1,7 @@ +{ + "files": [], + "references": [ + { "path": "./tsconfig.app.json" }, + { "path": "./tsconfig.node.json" } + ] +} diff --git a/vite/tsconfig.node.json b/vite/tsconfig.node.json new file mode 100644 index 0000000..db0becc --- /dev/null +++ b/vite/tsconfig.node.json @@ -0,0 +1,24 @@ +{ + "compilerOptions": { + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", + "target": "ES2022", + "lib": ["ES2023"], + "module": "ESNext", + "skipLibCheck": true, + + /* Bundler mode */ + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "isolatedModules": true, + "moduleDetection": "force", + "noEmit": true, + + /* Linting */ + "strict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true + }, + "include": ["vite.config.ts"] +} diff --git a/vite/vite.config.ts b/vite/vite.config.ts new file mode 100644 index 0000000..8a12749 --- /dev/null +++ b/vite/vite.config.ts @@ -0,0 +1,11 @@ +import { defineConfig } from 'vite' +import react from '@vitejs/plugin-react' +import svgr from "vite-plugin-svgr" + +// https://vite.dev/config/ +export default defineConfig({ + build: { + chunkSizeWarningLimit: 2000 + }, + plugins: [react(),svgr()], +})