mirror of
https://github.com/onyx-and-iris/nvda-voicemeeter.git
synced 2025-04-03 20:23:53 +01:00
Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cc0a1de07b | |||
| 9ee0dac610 | |||
| c7b8622aac | |||
| 2706338fcb | |||
| ff98aa5f89 | |||
| 03252fe30f | |||
| 055e92ab24 | |||
| 32b3ec8a2e | |||
| fbd4962fb2 | |||
| b5ea41c604 | |||
| f48983d08a | |||
| 1c5c8893ad | |||
| e645437d1d | |||
| 9969506698 | |||
| 3a1143199a | |||
| 79f739f250 | |||
| b45b2da4aa | |||
| 0adfec2e63 | |||
| dacc972b17 | |||
| 2ed1cad666 | |||
| 64361b2011 |
12
.gitignore
vendored
12
.gitignore
vendored
@ -85,7 +85,7 @@ ipython_config.py
|
|||||||
# pyenv
|
# pyenv
|
||||||
# For a library or package, you might want to ignore these files since the code is
|
# For a library or package, you might want to ignore these files since the code is
|
||||||
# intended to run in multiple environments; otherwise, check them in:
|
# intended to run in multiple environments; otherwise, check them in:
|
||||||
# .python-version
|
.python-version
|
||||||
|
|
||||||
# pipenv
|
# pipenv
|
||||||
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
||||||
@ -161,14 +161,8 @@ cython_debug/
|
|||||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||||
#.idea/
|
#.idea/
|
||||||
|
|
||||||
# nvda files
|
# spec files
|
||||||
controllerClient/*
|
spec/
|
||||||
!.gitkeep
|
|
||||||
|
|
||||||
# build files
|
|
||||||
basic.py
|
|
||||||
banana.py
|
|
||||||
potato.py
|
|
||||||
|
|
||||||
# persistent storage
|
# persistent storage
|
||||||
settings.json
|
settings.json
|
||||||
|
|||||||
18
README.md
18
README.md
@ -1,6 +1,4 @@
|
|||||||
[](https://pdm.fming.dev)
|
[](https://pdm.fming.dev)
|
||||||
[](https://github.com/psf/black)
|
|
||||||
[](https://pycqa.github.io/isort/)
|
|
||||||
[](https://github.com/astral-sh/ruff)
|
[](https://github.com/astral-sh/ruff)
|
||||||
|
|
||||||
# NVDA Voicemeeter
|
# NVDA Voicemeeter
|
||||||
@ -29,19 +27,17 @@ cd nvda-voicemeeter
|
|||||||
pip install .
|
pip install .
|
||||||
```
|
```
|
||||||
|
|
||||||
Then download the [Controller Client][controller_client] and place the dll files into the directory `controllerClient`.
|
The [Controller Client][controller_client] files are included with the source files. If you decide to download them yourself make sure you keep the directory structure as follows:
|
||||||
|
|
||||||
Your directory structure should look like this:
|
|
||||||
|
|
||||||
├── `controllerClient/`
|
├── `controllerClient/`
|
||||||
|
|
||||||
├── `x64/`
|
├── `x64/`
|
||||||
|
|
||||||
├── nvdaControllerClient64.dll
|
├── nvdaControllerClient.dll
|
||||||
|
|
||||||
├── `x86/`
|
├── `x86/`
|
||||||
|
|
||||||
├── nvdaControllerClient32.dll
|
├── nvdaControllerClient.dll
|
||||||
|
|
||||||
#### `From Releases`
|
#### `From Releases`
|
||||||
|
|
||||||
@ -56,7 +52,7 @@ import voicemeeterlib
|
|||||||
|
|
||||||
import nvda_voicemeeter
|
import nvda_voicemeeter
|
||||||
|
|
||||||
KIND_ID = "potato"
|
KIND_ID = 'potato'
|
||||||
|
|
||||||
with voicemeeterlib.api(KIND_ID) as vm:
|
with voicemeeterlib.api(KIND_ID) as vm:
|
||||||
with nvda_voicemeeter.draw(KIND_ID, vm) as window:
|
with nvda_voicemeeter.draw(KIND_ID, vm) as window:
|
||||||
@ -145,9 +141,9 @@ The `Save Settings` option opens a popup window with two buttons, `Browse` and `
|
|||||||
|
|
||||||
`Load Settings` and `Load on Startup` both open an Open dialog box immediately.
|
`Load Settings` and `Load on Startup` both open an Open dialog box immediately.
|
||||||
|
|
||||||
#### `Themes`
|
#### `Theme`
|
||||||
|
|
||||||
The `Themes` menu can be opened using `Alt` and then `t`. Use this menu to select from a list of coloured themes. Some themes offer higher contrast colours. An application restart is required to load a new theme. Once a theme is selected it will become the default for future startups.
|
The `Theme` menu can be opened using `Alt` and then `t`. Use this menu to select from a list of coloured themes. Some themes offer higher contrast colours. An application restart is required to load a new theme. Once a theme is selected it will become the default for future startups.
|
||||||
|
|
||||||
### Quick access binds
|
### Quick access binds
|
||||||
|
|
||||||
@ -188,7 +184,7 @@ If you have any questions/suggestions feel free to raise an issue or open a new
|
|||||||
|
|
||||||
[Vincent Burel](https://github.com/vburel2018) for creating Voicemeeter and its SDK.
|
[Vincent Burel](https://github.com/vburel2018) for creating Voicemeeter and its SDK.
|
||||||
|
|
||||||
[PySimpleGUI](https://github.com/PySimpleGUI) team for creating an awesome GUI framework.
|
[FreeSimpleGUI](https://github.com/spyoungtech/FreeSimpleGUI) a fork of the now closed source PySimpleGUI project.
|
||||||
|
|
||||||
[spec]: ./SPECIFICATION.md
|
[spec]: ./SPECIFICATION.md
|
||||||
[voicemeeter]: https://voicemeeter.com/
|
[voicemeeter]: https://voicemeeter.com/
|
||||||
|
|||||||
40
Taskfile.yml
Normal file
40
Taskfile.yml
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
|
vars:
|
||||||
|
SHELL: pwsh
|
||||||
|
|
||||||
|
tasks:
|
||||||
|
default:
|
||||||
|
desc: Prepare artifacts for release
|
||||||
|
cmds:
|
||||||
|
- task: release
|
||||||
|
|
||||||
|
release:
|
||||||
|
desc: Build and compress all artifacts
|
||||||
|
cmds:
|
||||||
|
- task: build
|
||||||
|
- task: compress
|
||||||
|
|
||||||
|
build:
|
||||||
|
desc: Build the project
|
||||||
|
cmds:
|
||||||
|
- for:
|
||||||
|
matrix:
|
||||||
|
KIND: [basic, banana, potato]
|
||||||
|
cmd: pdm run pyinstaller --noconfirm --distpath dist/{{.ITEM.KIND}} spec/{{.ITEM.KIND}}.spec
|
||||||
|
|
||||||
|
compress:
|
||||||
|
desc: Compress the build artifacts
|
||||||
|
cmds:
|
||||||
|
- for:
|
||||||
|
matrix:
|
||||||
|
KIND: [basic, banana, potato]
|
||||||
|
cmd: '{{.SHELL}} -Command "Compress-Archive -Path dist/{{.ITEM.KIND}} -DestinationPath dist/{{.ITEM.KIND}}.zip -Force"'
|
||||||
|
|
||||||
|
clean:
|
||||||
|
desc: Clean the project
|
||||||
|
cmds:
|
||||||
|
- |
|
||||||
|
{{.SHELL}} -Command "
|
||||||
|
Remove-Item -Recurse -Force build/basic,build/banana,build/potato
|
||||||
|
Remove-Item -Recurse -Force dist/*"
|
||||||
@ -2,7 +2,7 @@ import voicemeeterlib
|
|||||||
|
|
||||||
import nvda_voicemeeter
|
import nvda_voicemeeter
|
||||||
|
|
||||||
KIND_ID = "potato"
|
KIND_ID = 'potato'
|
||||||
|
|
||||||
with voicemeeterlib.api(KIND_ID) as vm:
|
with voicemeeterlib.api(KIND_ID) as vm:
|
||||||
with nvda_voicemeeter.draw(KIND_ID, vm) as window:
|
with nvda_voicemeeter.draw(KIND_ID, vm) as window:
|
||||||
|
|||||||
20
build.ps1
20
build.ps1
@ -1,20 +0,0 @@
|
|||||||
function Compress-Builds {
|
|
||||||
$target = Join-Path -Path $PSScriptRoot -ChildPath "dist"
|
|
||||||
@("basic", "banana", "potato") | ForEach-Object {
|
|
||||||
Compress-Archive -Path $(Join-Path -Path $target -ChildPath $_) -DestinationPath $(Join-Path -Path $target -ChildPath "${_}.zip") -Force
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function Get-Builds {
|
|
||||||
@("basic", "banana", "potato") | ForEach-Object {
|
|
||||||
pdm run pyinstaller "${_}.spec" --noconfirm
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function main {
|
|
||||||
Get-Builds
|
|
||||||
|
|
||||||
Compress-Builds
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($MyInvocation.InvocationName -ne '.') { main }
|
|
||||||
BIN
controllerClient/x64/nvdaControllerClient.dll
Normal file
BIN
controllerClient/x64/nvdaControllerClient.dll
Normal file
Binary file not shown.
BIN
controllerClient/x86/nvdaControllerClient.dll
Normal file
BIN
controllerClient/x86/nvdaControllerClient.dll
Normal file
Binary file not shown.
302
pdm.lock
generated
302
pdm.lock
generated
@ -2,106 +2,57 @@
|
|||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
|
|
||||||
[metadata]
|
[metadata]
|
||||||
groups = ["default", "build", "lint", "test"]
|
groups = ["default", "build", "format"]
|
||||||
strategy = ["cross_platform"]
|
strategy = ["inherit_metadata"]
|
||||||
lock_version = "4.4"
|
lock_version = "4.5.0"
|
||||||
content_hash = "sha256:ca47eaae0de5aa6bcc3fde33b6c1fa7dc2476aeb680f00bb1c550fe06ad67c55"
|
content_hash = "sha256:177dea67a7eadb6b161d3ac62fb09415d2d4f295c59914a9c5d0cbef7f0a5b65"
|
||||||
|
|
||||||
|
[[metadata.targets]]
|
||||||
|
requires_python = ">=3.10,<3.13"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "altgraph"
|
name = "altgraph"
|
||||||
version = "0.17.3"
|
version = "0.17.4"
|
||||||
summary = "Python graph (network) package"
|
summary = "Python graph (network) package"
|
||||||
|
groups = ["build"]
|
||||||
files = [
|
files = [
|
||||||
{file = "altgraph-0.17.3-py2.py3-none-any.whl", hash = "sha256:c8ac1ca6772207179ed8003ce7687757c04b0b71536f81e2ac5755c6226458fe"},
|
{file = "altgraph-0.17.4-py2.py3-none-any.whl", hash = "sha256:642743b4750de17e655e6711601b077bc6598dbfa3ba5fa2b2a35ce12b508dff"},
|
||||||
{file = "altgraph-0.17.3.tar.gz", hash = "sha256:ad33358114df7c9416cdb8fa1eaa5852166c505118717021c6a8c7c7abbd03dd"},
|
{file = "altgraph-0.17.4.tar.gz", hash = "sha256:1b5afbb98f6c4dcadb2e2ae6ab9fa994bbb8c1d75f4fa96d340f9437ae454406"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "black"
|
name = "freesimplegui"
|
||||||
version = "23.7.0"
|
version = "5.1.1"
|
||||||
requires_python = ">=3.8"
|
summary = "The free-forever Python GUI framework."
|
||||||
summary = "The uncompromising code formatter."
|
groups = ["default"]
|
||||||
dependencies = [
|
|
||||||
"click>=8.0.0",
|
|
||||||
"mypy-extensions>=0.4.3",
|
|
||||||
"packaging>=22.0",
|
|
||||||
"pathspec>=0.9.0",
|
|
||||||
"platformdirs>=2",
|
|
||||||
"tomli>=1.1.0; python_version < \"3.11\"",
|
|
||||||
]
|
|
||||||
files = [
|
files = [
|
||||||
{file = "black-23.7.0-cp310-cp310-macosx_10_16_arm64.whl", hash = "sha256:5c4bc552ab52f6c1c506ccae05681fab58c3f72d59ae6e6639e8885e94fe2587"},
|
{file = "FreeSimpleGUI-5.1.1-py3-none-any.whl", hash = "sha256:d7629d5c94b55264d119bd2a89f52667d863ea7914d808e619aea29922ff842e"},
|
||||||
{file = "black-23.7.0-cp310-cp310-macosx_10_16_universal2.whl", hash = "sha256:552513d5cd5694590d7ef6f46e1767a4df9af168d449ff767b13b084c020e63f"},
|
{file = "freesimplegui-5.1.1.tar.gz", hash = "sha256:2f0946c7ac221c997929181cbe7526e342fff5fc291a26d1d726287a5dd964fb"},
|
||||||
{file = "black-23.7.0-cp310-cp310-macosx_10_16_x86_64.whl", hash = "sha256:86cee259349b4448adb4ef9b204bb4467aae74a386bce85d56ba4f5dc0da27be"},
|
|
||||||
{file = "black-23.7.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:501387a9edcb75d7ae8a4412bb8749900386eaef258f1aefab18adddea1936bc"},
|
|
||||||
{file = "black-23.7.0-cp310-cp310-win_amd64.whl", hash = "sha256:fb074d8b213749fa1d077d630db0d5f8cc3b2ae63587ad4116e8a436e9bbe995"},
|
|
||||||
{file = "black-23.7.0-py3-none-any.whl", hash = "sha256:9fd59d418c60c0348505f2ddf9609c1e1de8e7493eab96198fc89d9f865e7a96"},
|
|
||||||
{file = "black-23.7.0.tar.gz", hash = "sha256:022a582720b0d9480ed82576c920a8c1dde97cc38ff11d8d8859b3bd6ca9eedb"},
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "click"
|
|
||||||
version = "8.1.7"
|
|
||||||
requires_python = ">=3.7"
|
|
||||||
summary = "Composable command line interface toolkit"
|
|
||||||
dependencies = [
|
|
||||||
"colorama; platform_system == \"Windows\"",
|
|
||||||
]
|
|
||||||
files = [
|
|
||||||
{file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"},
|
|
||||||
{file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"},
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "colorama"
|
|
||||||
version = "0.4.6"
|
|
||||||
requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
|
|
||||||
summary = "Cross-platform colored terminal text."
|
|
||||||
files = [
|
|
||||||
{file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
|
|
||||||
{file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "macholib"
|
name = "macholib"
|
||||||
version = "1.16.2"
|
version = "1.16.3"
|
||||||
summary = "Mach-O header analysis and editing"
|
summary = "Mach-O header analysis and editing"
|
||||||
|
groups = ["build"]
|
||||||
|
marker = "sys_platform == \"darwin\""
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"altgraph>=0.17",
|
"altgraph>=0.17",
|
||||||
]
|
]
|
||||||
files = [
|
files = [
|
||||||
{file = "macholib-1.16.2-py2.py3-none-any.whl", hash = "sha256:44c40f2cd7d6726af8fa6fe22549178d3a4dfecc35a9cd15ea916d9c83a688e0"},
|
{file = "macholib-1.16.3-py2.py3-none-any.whl", hash = "sha256:0e315d7583d38b8c77e815b1ecbdbf504a8258d8b3e17b61165c6feb60d18f2c"},
|
||||||
{file = "macholib-1.16.2.tar.gz", hash = "sha256:557bbfa1bb255c20e9abafe7ed6cd8046b48d9525db2f9b77d3122a63a2a8bf8"},
|
{file = "macholib-1.16.3.tar.gz", hash = "sha256:07ae9e15e8e4cd9a788013d81f5908b3609aa76f9b1421bae9c4d7606ec86a30"},
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "mypy-extensions"
|
|
||||||
version = "1.0.0"
|
|
||||||
requires_python = ">=3.5"
|
|
||||||
summary = "Type system extensions for programs checked with the mypy type checker."
|
|
||||||
files = [
|
|
||||||
{file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"},
|
|
||||||
{file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"},
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "packaging"
|
name = "packaging"
|
||||||
version = "23.1"
|
version = "24.2"
|
||||||
requires_python = ">=3.7"
|
requires_python = ">=3.8"
|
||||||
summary = "Core utilities for Python packages"
|
summary = "Core utilities for Python packages"
|
||||||
|
groups = ["build"]
|
||||||
files = [
|
files = [
|
||||||
{file = "packaging-23.1-py3-none-any.whl", hash = "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61"},
|
{file = "packaging-24.2-py3-none-any.whl", hash = "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759"},
|
||||||
{file = "packaging-23.1.tar.gz", hash = "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"},
|
{file = "packaging-24.2.tar.gz", hash = "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f"},
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pathspec"
|
|
||||||
version = "0.11.2"
|
|
||||||
requires_python = ">=3.7"
|
|
||||||
summary = "Utility library for gitignore style pattern matching of file paths."
|
|
||||||
files = [
|
|
||||||
{file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"},
|
|
||||||
{file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"},
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -109,154 +60,173 @@ name = "pefile"
|
|||||||
version = "2023.2.7"
|
version = "2023.2.7"
|
||||||
requires_python = ">=3.6.0"
|
requires_python = ">=3.6.0"
|
||||||
summary = "Python PE parsing module"
|
summary = "Python PE parsing module"
|
||||||
|
groups = ["build"]
|
||||||
|
marker = "sys_platform == \"win32\""
|
||||||
files = [
|
files = [
|
||||||
{file = "pefile-2023.2.7-py3-none-any.whl", hash = "sha256:da185cd2af68c08a6cd4481f7325ed600a88f6a813bad9dea07ab3ef73d8d8d6"},
|
{file = "pefile-2023.2.7-py3-none-any.whl", hash = "sha256:da185cd2af68c08a6cd4481f7325ed600a88f6a813bad9dea07ab3ef73d8d8d6"},
|
||||||
{file = "pefile-2023.2.7.tar.gz", hash = "sha256:82e6114004b3d6911c77c3953e3838654b04511b8b66e8583db70c65998017dc"},
|
{file = "pefile-2023.2.7.tar.gz", hash = "sha256:82e6114004b3d6911c77c3953e3838654b04511b8b66e8583db70c65998017dc"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "platformdirs"
|
|
||||||
version = "3.10.0"
|
|
||||||
requires_python = ">=3.7"
|
|
||||||
summary = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
|
|
||||||
files = [
|
|
||||||
{file = "platformdirs-3.10.0-py3-none-any.whl", hash = "sha256:d7c24979f292f916dc9cbf8648319032f551ea8c49a4c9bf2fb556a02070ec1d"},
|
|
||||||
{file = "platformdirs-3.10.0.tar.gz", hash = "sha256:b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d"},
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "psgdemos"
|
|
||||||
version = "1.12.1"
|
|
||||||
summary = "Installs the full set of PySimpleGUI Demo Programs and the Demo Browser."
|
|
||||||
dependencies = [
|
|
||||||
"PySimpleGUI",
|
|
||||||
]
|
|
||||||
files = [
|
|
||||||
{file = "psgdemos-1.12.1-py3-none-any.whl", hash = "sha256:a035540dd0ff92f410aed9b7af8d5a641d9d5a9eac3e0072ef115adf06abb447"},
|
|
||||||
{file = "psgdemos-1.12.1.tar.gz", hash = "sha256:4108af795477531a9b1c8675b9aa9b6628c109e660f6954baf8ba2dc3b5806e9"},
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pyinstaller"
|
name = "pyinstaller"
|
||||||
version = "5.13.0"
|
version = "6.11.1"
|
||||||
requires_python = "<3.13,>=3.7"
|
requires_python = "<3.14,>=3.8"
|
||||||
summary = "PyInstaller bundles a Python application and all its dependencies into a single package."
|
summary = "PyInstaller bundles a Python application and all its dependencies into a single package."
|
||||||
|
groups = ["build"]
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"altgraph",
|
"altgraph",
|
||||||
|
"importlib-metadata>=4.6; python_version < \"3.10\"",
|
||||||
"macholib>=1.8; sys_platform == \"darwin\"",
|
"macholib>=1.8; sys_platform == \"darwin\"",
|
||||||
"pefile>=2022.5.30; sys_platform == \"win32\"",
|
"packaging>=22.0",
|
||||||
"pyinstaller-hooks-contrib>=2021.4",
|
"pefile!=2024.8.26,>=2022.5.30; sys_platform == \"win32\"",
|
||||||
|
"pyinstaller-hooks-contrib>=2024.9",
|
||||||
"pywin32-ctypes>=0.2.1; sys_platform == \"win32\"",
|
"pywin32-ctypes>=0.2.1; sys_platform == \"win32\"",
|
||||||
"setuptools>=42.0.0",
|
"setuptools>=42.0.0",
|
||||||
]
|
]
|
||||||
files = [
|
files = [
|
||||||
{file = "pyinstaller-5.13.0-py3-none-macosx_10_13_universal2.whl", hash = "sha256:7fdd319828de679f9c5e381eff998ee9b4164bf4457e7fca56946701cf002c3f"},
|
{file = "pyinstaller-6.11.1-py3-none-macosx_10_13_universal2.whl", hash = "sha256:44e36172de326af6d4e7663b12f71dbd34e2e3e02233e181e457394423daaf03"},
|
||||||
{file = "pyinstaller-5.13.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:0df43697c4914285ecd333be968d2cd042ab9b2670124879ee87931d2344eaf5"},
|
{file = "pyinstaller-6.11.1-py3-none-manylinux2014_aarch64.whl", hash = "sha256:6d12c45a29add78039066a53fb05967afaa09a672426072b13816fe7676abfc4"},
|
||||||
{file = "pyinstaller-5.13.0-py3-none-manylinux2014_i686.whl", hash = "sha256:28d9742c37e9fb518444b12f8c8ab3cb4ba212d752693c34475c08009aa21ccf"},
|
{file = "pyinstaller-6.11.1-py3-none-manylinux2014_i686.whl", hash = "sha256:ddc0fddd75f07f7e423da1f0822e389a42af011f9589e0269b87e0d89aa48c1f"},
|
||||||
{file = "pyinstaller-5.13.0-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:e5fb17de6c325d3b2b4ceaeb55130ad7100a79096490e4c5b890224406fa42f4"},
|
{file = "pyinstaller-6.11.1-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:0d6475559c4939f0735122989611d7f739ed3bf02f666ce31022928f7a7e4fda"},
|
||||||
{file = "pyinstaller-5.13.0-py3-none-manylinux2014_s390x.whl", hash = "sha256:78975043edeb628e23a73fb3ef0a273cda50e765f1716f75212ea3e91b09dede"},
|
{file = "pyinstaller-6.11.1-py3-none-manylinux2014_s390x.whl", hash = "sha256:e21c7806e34f40181e7606926a14579f848bfb1dc52cbca7eea66eccccbfe977"},
|
||||||
{file = "pyinstaller-5.13.0-py3-none-manylinux2014_x86_64.whl", hash = "sha256:cd7d5c06f2847195a23d72ede17c60857d6f495d6f0727dc6c9bc1235f2eb79c"},
|
{file = "pyinstaller-6.11.1-py3-none-manylinux2014_x86_64.whl", hash = "sha256:32c742a24fe65d0702958fadf4040f76de85859c26bec0008766e5dbabc5b68f"},
|
||||||
{file = "pyinstaller-5.13.0-py3-none-musllinux_1_1_aarch64.whl", hash = "sha256:24009eba63cfdbcde6d2634e9c87f545eb67249ddf3b514e0cd3b2cdaa595828"},
|
{file = "pyinstaller-6.11.1-py3-none-musllinux_1_1_aarch64.whl", hash = "sha256:208c0ef6dab0837a0a273ea32d1a3619a208e3d1fe3fec3785eea71a77fd00ce"},
|
||||||
{file = "pyinstaller-5.13.0-py3-none-musllinux_1_1_x86_64.whl", hash = "sha256:1fde4381155f21d6354dc450dcaa338cd8a40aaacf6bd22b987b0f3e1f96f3ee"},
|
{file = "pyinstaller-6.11.1-py3-none-musllinux_1_1_x86_64.whl", hash = "sha256:ad84abf465bcda363c1d54eafa76745d77b6a8a713778348377dc98d12a452f7"},
|
||||||
{file = "pyinstaller-5.13.0-py3-none-win32.whl", hash = "sha256:2d03419904d1c25c8968b0ad21da0e0f33d8d65716e29481b5bd83f7f342b0c5"},
|
{file = "pyinstaller-6.11.1-py3-none-win32.whl", hash = "sha256:2e8365276c5131c9bef98e358fbc305e4022db8bedc9df479629d6414021956a"},
|
||||||
{file = "pyinstaller-5.13.0-py3-none-win_amd64.whl", hash = "sha256:9fc27c5a853b14a90d39c252707673c7a0efec921cd817169aff3af0fca8c127"},
|
{file = "pyinstaller-6.11.1-py3-none-win_amd64.whl", hash = "sha256:7ac83c0dc0e04357dab98c487e74ad2adb30e7eb186b58157a8faf46f1fa796f"},
|
||||||
{file = "pyinstaller-5.13.0-py3-none-win_arm64.whl", hash = "sha256:3a331951f9744bc2379ea5d65d36f3c828eaefe2785f15039592cdc08560b262"},
|
{file = "pyinstaller-6.11.1-py3-none-win_arm64.whl", hash = "sha256:35e6b8077d240600bb309ed68bb0b1453fd2b7ab740b66d000db7abae6244423"},
|
||||||
{file = "pyinstaller-5.13.0.tar.gz", hash = "sha256:5e446df41255e815017d96318e39f65a3eb807e74a796c7e7ff7f13b6366a2e9"},
|
{file = "pyinstaller-6.11.1.tar.gz", hash = "sha256:491dfb4d9d5d1d9650d9507daec1ff6829527a254d8e396badd60a0affcb72ef"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pyinstaller-hooks-contrib"
|
name = "pyinstaller-hooks-contrib"
|
||||||
version = "2023.7"
|
version = "2025.0"
|
||||||
requires_python = ">=3.7"
|
requires_python = ">=3.8"
|
||||||
summary = "Community maintained hooks for PyInstaller"
|
summary = "Community maintained hooks for PyInstaller"
|
||||||
|
groups = ["build"]
|
||||||
|
dependencies = [
|
||||||
|
"importlib-metadata>=4.6; python_version < \"3.10\"",
|
||||||
|
"packaging>=22.0",
|
||||||
|
"setuptools>=42.0.0",
|
||||||
|
]
|
||||||
files = [
|
files = [
|
||||||
{file = "pyinstaller-hooks-contrib-2023.7.tar.gz", hash = "sha256:0c436a4c3506020e34116a8a7ddfd854c1ad6ddca9a8cd84500bd6e69c9e68f9"},
|
{file = "pyinstaller_hooks_contrib-2025.0-py3-none-any.whl", hash = "sha256:3c0623799c3f81a37293127f485d65894c20fd718f722cb588785a3e52581ad1"},
|
||||||
{file = "pyinstaller_hooks_contrib-2023.7-py2.py3-none-any.whl", hash = "sha256:3c10df14c0f71ab388dfbf1625375b087e7330d9444cbfd2b310ba027fa0cff0"},
|
{file = "pyinstaller_hooks_contrib-2025.0.tar.gz", hash = "sha256:6dc0b55a1acaab2ffee36ed4a05b073aa0a22e46f25fb5c66a31e217454135ed"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pyparsing"
|
name = "pyparsing"
|
||||||
version = "3.1.1"
|
version = "3.2.1"
|
||||||
requires_python = ">=3.6.8"
|
requires_python = ">=3.9"
|
||||||
summary = "pyparsing module - Classes and methods to define and execute parsing grammars"
|
summary = "pyparsing module - Classes and methods to define and execute parsing grammars"
|
||||||
|
groups = ["default"]
|
||||||
files = [
|
files = [
|
||||||
{file = "pyparsing-3.1.1-py3-none-any.whl", hash = "sha256:32c7c0b711493c72ff18a981d24f28aaf9c1fb7ed5e9667c9e84e3db623bdbfb"},
|
{file = "pyparsing-3.2.1-py3-none-any.whl", hash = "sha256:506ff4f4386c4cec0590ec19e6302d3aedb992fdc02c761e90416f158dacf8e1"},
|
||||||
{file = "pyparsing-3.1.1.tar.gz", hash = "sha256:ede28a1a32462f5a9705e07aea48001a08f7cf81a021585011deba701581a0db"},
|
{file = "pyparsing-3.2.1.tar.gz", hash = "sha256:61980854fd66de3a90028d679a954d5f2623e83144b5afe5ee86f43d762e5f0a"},
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pysimplegui"
|
|
||||||
version = "4.60.5"
|
|
||||||
summary = "Python GUIs for Humans. Launched in 2018. It's 2022 & PySimpleGUI is an ACTIVE & supported project. Super-simple to create custom GUI's. 325+ Demo programs & Cookbook for rapid start. Extensive documentation. Main docs at www.PySimpleGUI.org. Fun & your success are the focus. Examples using Machine Learning (GUI, OpenCV Integration), Rainmeter Style Desktop Widgets, Matplotlib + Pyplot, PIL support, add GUI to command line scripts, PDF & Image Viewers. Great for beginners & advanced GUI programmers."
|
|
||||||
files = [
|
|
||||||
{file = "PySimpleGUI-4.60.5-py3-none-any.whl", hash = "sha256:004f33311ee685a5287fad54f500f7290b40d7c806044e478b1384f85dedce64"},
|
|
||||||
{file = "PySimpleGUI-4.60.5.tar.gz", hash = "sha256:31014d1cc5eef1373d7e93564ff2604662645cc774a939b1f01aa253e7f9d78b"},
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pywin32-ctypes"
|
name = "pywin32-ctypes"
|
||||||
version = "0.2.2"
|
version = "0.2.3"
|
||||||
requires_python = ">=3.6"
|
requires_python = ">=3.6"
|
||||||
summary = "A (partial) reimplementation of pywin32 using ctypes/cffi"
|
summary = "A (partial) reimplementation of pywin32 using ctypes/cffi"
|
||||||
|
groups = ["build"]
|
||||||
|
marker = "sys_platform == \"win32\""
|
||||||
files = [
|
files = [
|
||||||
{file = "pywin32-ctypes-0.2.2.tar.gz", hash = "sha256:3426e063bdd5fd4df74a14fa3cf80a0b42845a87e1d1e81f6549f9daec593a60"},
|
{file = "pywin32-ctypes-0.2.3.tar.gz", hash = "sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755"},
|
||||||
{file = "pywin32_ctypes-0.2.2-py3-none-any.whl", hash = "sha256:bf490a1a709baf35d688fe0ecf980ed4de11d2b3e37b51e5442587a75d9957e7"},
|
{file = "pywin32_ctypes-0.2.3-py3-none-any.whl", hash = "sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruff"
|
name = "ruff"
|
||||||
version = "0.0.291"
|
version = "0.9.2"
|
||||||
requires_python = ">=3.7"
|
requires_python = ">=3.7"
|
||||||
summary = "An extremely fast Python linter, written in Rust."
|
summary = "An extremely fast Python linter and code formatter, written in Rust."
|
||||||
|
groups = ["format"]
|
||||||
files = [
|
files = [
|
||||||
{file = "ruff-0.0.291-py3-none-macosx_10_7_x86_64.whl", hash = "sha256:b97d0d7c136a85badbc7fd8397fdbb336e9409b01c07027622f28dcd7db366f2"},
|
{file = "ruff-0.9.2-py3-none-linux_armv6l.whl", hash = "sha256:80605a039ba1454d002b32139e4970becf84b5fee3a3c3bf1c2af6f61a784347"},
|
||||||
{file = "ruff-0.0.291-py3-none-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:6ab44ea607967171e18aa5c80335237be12f3a1523375fa0cede83c5cf77feb4"},
|
{file = "ruff-0.9.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b9aab82bb20afd5f596527045c01e6ae25a718ff1784cb92947bff1f83068b00"},
|
||||||
{file = "ruff-0.0.291-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a04b384f2d36f00d5fb55313d52a7d66236531195ef08157a09c4728090f2ef0"},
|
{file = "ruff-0.9.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:fbd337bac1cfa96be615f6efcd4bc4d077edbc127ef30e2b8ba2a27e18c054d4"},
|
||||||
{file = "ruff-0.0.291-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:b727c219b43f903875b7503a76c86237a00d1a39579bb3e21ce027eec9534051"},
|
{file = "ruff-0.9.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:82b35259b0cbf8daa22a498018e300b9bb0174c2bbb7bcba593935158a78054d"},
|
||||||
{file = "ruff-0.0.291-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:87671e33175ae949702774071b35ed4937da06f11851af75cd087e1b5a488ac4"},
|
{file = "ruff-0.9.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8b6a9701d1e371bf41dca22015c3f89769da7576884d2add7317ec1ec8cb9c3c"},
|
||||||
{file = "ruff-0.0.291-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:b75f5801547f79b7541d72a211949754c21dc0705c70eddf7f21c88a64de8b97"},
|
{file = "ruff-0.9.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9cc53e68b3c5ae41e8faf83a3b89f4a5d7b2cb666dff4b366bb86ed2a85b481f"},
|
||||||
{file = "ruff-0.0.291-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b09b94efdcd162fe32b472b2dd5bf1c969fcc15b8ff52f478b048f41d4590e09"},
|
{file = "ruff-0.9.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:8efd9da7a1ee314b910da155ca7e8953094a7c10d0c0a39bfde3fcfd2a015684"},
|
||||||
{file = "ruff-0.0.291-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d5b56bc3a2f83a7a1d7f4447c54d8d3db52021f726fdd55d549ca87bca5d747"},
|
{file = "ruff-0.9.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3292c5a22ea9a5f9a185e2d131dc7f98f8534a32fb6d2ee7b9944569239c648d"},
|
||||||
{file = "ruff-0.0.291-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:13f0d88e5f367b2dc8c7d90a8afdcfff9dd7d174e324fd3ed8e0b5cb5dc9b7f6"},
|
{file = "ruff-0.9.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1a605fdcf6e8b2d39f9436d343d1f0ff70c365a1e681546de0104bef81ce88df"},
|
||||||
{file = "ruff-0.0.291-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:b3eeee1b1a45a247758ecdc3ab26c307336d157aafc61edb98b825cadb153df3"},
|
{file = "ruff-0.9.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c547f7f256aa366834829a08375c297fa63386cbe5f1459efaf174086b564247"},
|
||||||
{file = "ruff-0.0.291-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:6c06006350c3bb689765d71f810128c9cdf4a1121fd01afc655c87bab4fb4f83"},
|
{file = "ruff-0.9.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:d18bba3d3353ed916e882521bc3e0af403949dbada344c20c16ea78f47af965e"},
|
||||||
{file = "ruff-0.0.291-py3-none-musllinux_1_2_i686.whl", hash = "sha256:fd17220611047de247b635596e3174f3d7f2becf63bd56301fc758778df9b629"},
|
{file = "ruff-0.9.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b338edc4610142355ccf6b87bd356729b62bf1bc152a2fad5b0c7dc04af77bfe"},
|
||||||
{file = "ruff-0.0.291-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:5383ba67ad360caf6060d09012f1fb2ab8bd605ab766d10ca4427a28ab106e0b"},
|
{file = "ruff-0.9.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:492a5e44ad9b22a0ea98cf72e40305cbdaf27fac0d927f8bc9e1df316dcc96eb"},
|
||||||
{file = "ruff-0.0.291-py3-none-win32.whl", hash = "sha256:1d5f0616ae4cdc7a938b493b6a1a71c8a47d0300c0d65f6e41c281c2f7490ad3"},
|
{file = "ruff-0.9.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:af1e9e9fe7b1f767264d26b1075ac4ad831c7db976911fa362d09b2d0356426a"},
|
||||||
{file = "ruff-0.0.291-py3-none-win_amd64.whl", hash = "sha256:8a69bfbde72db8ca1c43ee3570f59daad155196c3fbe357047cd9b77de65f15b"},
|
{file = "ruff-0.9.2-py3-none-win32.whl", hash = "sha256:71cbe22e178c5da20e1514e1e01029c73dc09288a8028a5d3446e6bba87a5145"},
|
||||||
{file = "ruff-0.0.291-py3-none-win_arm64.whl", hash = "sha256:d867384a4615b7f30b223a849b52104214442b5ba79b473d7edd18da3cde22d6"},
|
{file = "ruff-0.9.2-py3-none-win_amd64.whl", hash = "sha256:c5e1d6abc798419cf46eed03f54f2e0c3adb1ad4b801119dedf23fcaf69b55b5"},
|
||||||
{file = "ruff-0.0.291.tar.gz", hash = "sha256:c61109661dde9db73469d14a82b42a88c7164f731e6a3b0042e71394c1c7ceed"},
|
{file = "ruff-0.9.2-py3-none-win_arm64.whl", hash = "sha256:a1b63fa24149918f8b37cef2ee6fff81f24f0d74b6f0bdc37bc3e1f2143e41c6"},
|
||||||
|
{file = "ruff-0.9.2.tar.gz", hash = "sha256:b5eceb334d55fae5f316f783437392642ae18e16dcf4f1858d55d3c2a0f8f5d0"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "setuptools"
|
name = "setuptools"
|
||||||
version = "68.1.2"
|
version = "75.8.0"
|
||||||
requires_python = ">=3.8"
|
requires_python = ">=3.9"
|
||||||
summary = "Easily download, build, install, upgrade, and uninstall Python packages"
|
summary = "Easily download, build, install, upgrade, and uninstall Python packages"
|
||||||
|
groups = ["build"]
|
||||||
files = [
|
files = [
|
||||||
{file = "setuptools-68.1.2-py3-none-any.whl", hash = "sha256:3d8083eed2d13afc9426f227b24fd1659489ec107c0e86cec2ffdde5c92e790b"},
|
{file = "setuptools-75.8.0-py3-none-any.whl", hash = "sha256:e3982f444617239225d675215d51f6ba05f845d4eec313da4418fdbb56fb27e3"},
|
||||||
{file = "setuptools-68.1.2.tar.gz", hash = "sha256:3d4dfa6d95f1b101d695a6160a7626e15583af71a5f52176efa5d39a054d475d"},
|
{file = "setuptools-75.8.0.tar.gz", hash = "sha256:c5afc8f407c626b8313a86e10311dd3f661c6cd9c09d4bf8c15c0e11f9f2b0e6"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tomli"
|
name = "tomli"
|
||||||
version = "2.0.1"
|
version = "2.2.1"
|
||||||
requires_python = ">=3.7"
|
requires_python = ">=3.8"
|
||||||
summary = "A lil' TOML parser"
|
summary = "A lil' TOML parser"
|
||||||
|
groups = ["default"]
|
||||||
|
marker = "python_version < \"3.11\""
|
||||||
files = [
|
files = [
|
||||||
{file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
|
{file = "tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249"},
|
||||||
{file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
|
{file = "tomli-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6"},
|
||||||
|
{file = "tomli-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a"},
|
||||||
|
{file = "tomli-2.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee"},
|
||||||
|
{file = "tomli-2.2.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e"},
|
||||||
|
{file = "tomli-2.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4"},
|
||||||
|
{file = "tomli-2.2.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106"},
|
||||||
|
{file = "tomli-2.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8"},
|
||||||
|
{file = "tomli-2.2.1-cp311-cp311-win32.whl", hash = "sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff"},
|
||||||
|
{file = "tomli-2.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b"},
|
||||||
|
{file = "tomli-2.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea"},
|
||||||
|
{file = "tomli-2.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8"},
|
||||||
|
{file = "tomli-2.2.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192"},
|
||||||
|
{file = "tomli-2.2.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222"},
|
||||||
|
{file = "tomli-2.2.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77"},
|
||||||
|
{file = "tomli-2.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6"},
|
||||||
|
{file = "tomli-2.2.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd"},
|
||||||
|
{file = "tomli-2.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e"},
|
||||||
|
{file = "tomli-2.2.1-cp312-cp312-win32.whl", hash = "sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98"},
|
||||||
|
{file = "tomli-2.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4"},
|
||||||
|
{file = "tomli-2.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7"},
|
||||||
|
{file = "tomli-2.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c"},
|
||||||
|
{file = "tomli-2.2.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13"},
|
||||||
|
{file = "tomli-2.2.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281"},
|
||||||
|
{file = "tomli-2.2.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272"},
|
||||||
|
{file = "tomli-2.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140"},
|
||||||
|
{file = "tomli-2.2.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2"},
|
||||||
|
{file = "tomli-2.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744"},
|
||||||
|
{file = "tomli-2.2.1-cp313-cp313-win32.whl", hash = "sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec"},
|
||||||
|
{file = "tomli-2.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69"},
|
||||||
|
{file = "tomli-2.2.1-py3-none-any.whl", hash = "sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc"},
|
||||||
|
{file = "tomli-2.2.1.tar.gz", hash = "sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff"},
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "voicemeeter-api"
|
name = "voicemeeter-api"
|
||||||
version = "2.5.2"
|
version = "2.6.1"
|
||||||
requires_python = ">=3.10,<4.0"
|
requires_python = "<4.0,>=3.10"
|
||||||
summary = "A Python wrapper for the Voiceemeter API"
|
summary = "A Python wrapper for the Voiceemeter API"
|
||||||
|
groups = ["default"]
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"tomli<3.0.0,>=2.0.1; python_version < \"3.11\"",
|
"tomli<3.0,>=2.0.1; python_version < \"3.11\"",
|
||||||
]
|
]
|
||||||
files = [
|
files = [
|
||||||
{file = "voicemeeter_api-2.5.2-py3-none-any.whl", hash = "sha256:304c14a6eef5f95d8b883e8e1752d23f17c3d662d25a28d114d33134f62e93ec"},
|
{file = "voicemeeter_api-2.6.1-py3-none-any.whl", hash = "sha256:8ae3bce0f9ad6bbad78f2f69f522b6fb2e229d314918a075ad83d4009aff7020"},
|
||||||
{file = "voicemeeter_api-2.5.2.tar.gz", hash = "sha256:e2b9558a38ed290b184a3e46b598c0a716cef2e64521431f84a46e1180d539ca"},
|
{file = "voicemeeter_api-2.6.1.tar.gz", hash = "sha256:34d8672603ec66197f2d61fd8f038f46d8451759c81fbe222b00e7d3ccccd1f5"},
|
||||||
]
|
]
|
||||||
|
|||||||
156
pyproject.toml
156
pyproject.toml
@ -1,94 +1,41 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "nvda_voicemeeter"
|
name = "nvda-voicemeeter"
|
||||||
version = "0.5.7b1"
|
version = "1.0.0"
|
||||||
description = "A Voicemeeter app compatible with NVDA"
|
description = "A Voicemeeter app compatible with NVDA"
|
||||||
authors = [
|
authors = [
|
||||||
{ name = "onyx-and-iris", email = "code@onyxandiris.online" },
|
{name = "Onyx and Iris", email = "code@onyxandiris.online"},
|
||||||
]
|
]
|
||||||
dependencies = [
|
dependencies = ["pyparsing>=3.2.1", "voicemeeter-api>=2.6.1", "freesimplegui>=5.1.1"]
|
||||||
"pysimplegui>=4.60.5",
|
requires-python = ">=3.10,<3.13"
|
||||||
"pyparsing>=3.1.1",
|
|
||||||
"voicemeeter-api>=2.5.2",
|
|
||||||
]
|
|
||||||
requires-python = ">=3.10,<3.12"
|
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
|
license = {text = "MIT"}
|
||||||
|
|
||||||
[project.license]
|
[dependency-groups]
|
||||||
text = "MIT"
|
format = [
|
||||||
|
"ruff>=0.9.2",
|
||||||
[tool.pdm.dev-dependencies]
|
]
|
||||||
build = [
|
build = [
|
||||||
"pyinstaller>=5.1",
|
"pyinstaller>=6.3.0",
|
||||||
]
|
|
||||||
lint = [
|
|
||||||
"black>=23.7.0",
|
|
||||||
"ruff>=0.0.291",
|
|
||||||
]
|
|
||||||
test = [
|
|
||||||
"psgdemos>=1.12.1",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.pdm.scripts.build]
|
[project.scripts]
|
||||||
shell = "build.ps1"
|
gui-basic-nvda = "nvda_voicemeeter.gui.basic:run"
|
||||||
|
gui-banana-nvda = "nvda_voicemeeter.gui.banana:run"
|
||||||
|
gui-potato-nvda = "nvda_voicemeeter.gui.potato:run"
|
||||||
|
|
||||||
[tool.black]
|
[build-system]
|
||||||
line-length = 119
|
requires = ["pdm-backend"]
|
||||||
|
build-backend = "pdm.backend"
|
||||||
|
|
||||||
|
[tool.pdm]
|
||||||
|
distribution = true
|
||||||
|
|
||||||
|
[tool.pdm.scripts]
|
||||||
|
build = {shell = "task build"}
|
||||||
|
compress = {shell = "task compress"}
|
||||||
|
release = {composite = ["build", "compress"]}
|
||||||
|
|
||||||
[tool.ruff]
|
[tool.ruff]
|
||||||
select = [
|
|
||||||
"E",
|
|
||||||
"F",
|
|
||||||
]
|
|
||||||
ignore = [
|
|
||||||
"E501",
|
|
||||||
]
|
|
||||||
fixable = [
|
|
||||||
"A",
|
|
||||||
"B",
|
|
||||||
"C",
|
|
||||||
"D",
|
|
||||||
"E",
|
|
||||||
"F",
|
|
||||||
"G",
|
|
||||||
"I",
|
|
||||||
"N",
|
|
||||||
"Q",
|
|
||||||
"S",
|
|
||||||
"T",
|
|
||||||
"W",
|
|
||||||
"ANN",
|
|
||||||
"ARG",
|
|
||||||
"BLE",
|
|
||||||
"COM",
|
|
||||||
"DJ",
|
|
||||||
"DTZ",
|
|
||||||
"EM",
|
|
||||||
"ERA",
|
|
||||||
"EXE",
|
|
||||||
"FBT",
|
|
||||||
"ICN",
|
|
||||||
"INP",
|
|
||||||
"ISC",
|
|
||||||
"NPY",
|
|
||||||
"PD",
|
|
||||||
"PGH",
|
|
||||||
"PIE",
|
|
||||||
"PL",
|
|
||||||
"PT",
|
|
||||||
"PTH",
|
|
||||||
"PYI",
|
|
||||||
"RET",
|
|
||||||
"RSE",
|
|
||||||
"RUF",
|
|
||||||
"SIM",
|
|
||||||
"SLF",
|
|
||||||
"TCH",
|
|
||||||
"TID",
|
|
||||||
"TRY",
|
|
||||||
"UP",
|
|
||||||
"YTT",
|
|
||||||
]
|
|
||||||
unfixable = []
|
|
||||||
exclude = [
|
exclude = [
|
||||||
".bzr",
|
".bzr",
|
||||||
".direnv",
|
".direnv",
|
||||||
@ -112,14 +59,59 @@ exclude = [
|
|||||||
"node_modules",
|
"node_modules",
|
||||||
"venv",
|
"venv",
|
||||||
]
|
]
|
||||||
|
|
||||||
line-length = 119
|
line-length = 119
|
||||||
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
|
indent-width = 4
|
||||||
|
|
||||||
|
# Assume Python 3.10
|
||||||
target-version = "py310"
|
target-version = "py310"
|
||||||
|
|
||||||
[tool.ruff.mccabe]
|
[tool.ruff.lint]
|
||||||
|
# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`) codes by default.
|
||||||
|
# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
|
||||||
|
# McCabe complexity (`C901`) by default.
|
||||||
|
select = ["E4", "E7", "E9", "F"]
|
||||||
|
ignore = []
|
||||||
|
|
||||||
|
# Allow fix for all enabled rules (when `--fix`) is provided.
|
||||||
|
fixable = ["ALL"]
|
||||||
|
unfixable = []
|
||||||
|
|
||||||
|
# Allow unused variables when underscore-prefixed.
|
||||||
|
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
|
||||||
|
|
||||||
|
|
||||||
|
[tool.ruff.format]
|
||||||
|
# Unlike Black, use single quotes for strings.
|
||||||
|
quote-style = "single"
|
||||||
|
|
||||||
|
# Like Black, indent with spaces, rather than tabs.
|
||||||
|
indent-style = "space"
|
||||||
|
|
||||||
|
# Like Black, respect magic trailing commas.
|
||||||
|
skip-magic-trailing-comma = false
|
||||||
|
|
||||||
|
# Like Black, automatically detect the appropriate line ending.
|
||||||
|
line-ending = "auto"
|
||||||
|
|
||||||
|
# Enable auto-formatting of code examples in docstrings. Markdown,
|
||||||
|
# reStructuredText code/literal blocks and doctests are all supported.
|
||||||
|
#
|
||||||
|
# This is currently disabled by default, but it is planned for this
|
||||||
|
# to be opt-out in the future.
|
||||||
|
docstring-code-format = false
|
||||||
|
|
||||||
|
# Set the line length limit used when formatting code snippets in
|
||||||
|
# docstrings.
|
||||||
|
#
|
||||||
|
# This only has an effect when the `docstring-code-format` setting is
|
||||||
|
# enabled.
|
||||||
|
docstring-code-line-length = "dynamic"
|
||||||
|
|
||||||
|
[tool.ruff.lint.mccabe]
|
||||||
max-complexity = 10
|
max-complexity = 10
|
||||||
|
|
||||||
[tool.ruff.per-file-ignores]
|
[tool.ruff.lint.per-file-ignores]
|
||||||
"__init__.py" = [
|
"__init__.py" = [
|
||||||
"E402",
|
"E402",
|
||||||
"F401",
|
"F401",
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import PySimpleGUI as psg
|
import FreeSimpleGUI as psg
|
||||||
|
|
||||||
from . import util
|
from . import util
|
||||||
from .compound import LabelSlider
|
from .compound import LabelSlider
|
||||||
@ -16,7 +16,7 @@ class Builder:
|
|||||||
menu = [[self.make_menu()]]
|
menu = [[self.make_menu()]]
|
||||||
|
|
||||||
layout0 = []
|
layout0 = []
|
||||||
if self.kind.name == "basic":
|
if self.kind.name == 'basic':
|
||||||
steps = (
|
steps = (
|
||||||
self.make_tab0_row0,
|
self.make_tab0_row0,
|
||||||
self.make_tab0_row1,
|
self.make_tab0_row1,
|
||||||
@ -62,65 +62,65 @@ class Builder:
|
|||||||
|
|
||||||
def _make_inner_tabgroup(layouts, identifier) -> psg.TabGroup:
|
def _make_inner_tabgroup(layouts, identifier) -> psg.TabGroup:
|
||||||
inner_layout = []
|
inner_layout = []
|
||||||
for i, tabname in enumerate(("buttons", "sliders")):
|
for i, tabname in enumerate(('buttons', 'sliders')):
|
||||||
inner_layout.append([psg.Tab(tabname.capitalize(), layouts[i], key=f"tab||{identifier}||{tabname}")])
|
inner_layout.append([psg.Tab(tabname.capitalize(), layouts[i], key=f'tab||{identifier}||{tabname}')])
|
||||||
return psg.TabGroup(
|
return psg.TabGroup(
|
||||||
inner_layout,
|
inner_layout,
|
||||||
change_submits=True,
|
change_submits=True,
|
||||||
enable_events=True,
|
enable_events=True,
|
||||||
key=f"tabgroup||{identifier}",
|
key=f'tabgroup||{identifier}',
|
||||||
)
|
)
|
||||||
|
|
||||||
def _make_tabs(identifier) -> psg.Tab:
|
def _make_tabs(identifier) -> psg.Tab:
|
||||||
match identifier:
|
match identifier:
|
||||||
case "Settings":
|
case 'Settings':
|
||||||
return psg.Tab("Settings", layout0, key="tab||Settings")
|
return psg.Tab('Settings', layout0, key='tab||Settings')
|
||||||
case "Physical Strip":
|
case 'Physical Strip':
|
||||||
tabgroup = _make_inner_tabgroup((layout1_1, layout1_2), identifier)
|
tabgroup = _make_inner_tabgroup((layout1_1, layout1_2), identifier)
|
||||||
case "Virtual Strip":
|
case 'Virtual Strip':
|
||||||
tabgroup = _make_inner_tabgroup((layout2_1, layout2_2), identifier)
|
tabgroup = _make_inner_tabgroup((layout2_1, layout2_2), identifier)
|
||||||
case "Buses":
|
case 'Buses':
|
||||||
tabgroup = _make_inner_tabgroup((layout3_1, layout3_2), identifier)
|
tabgroup = _make_inner_tabgroup((layout3_1, layout3_2), identifier)
|
||||||
return psg.Tab(identifier, [[tabgroup]], key=f"tab||{identifier}")
|
return psg.Tab(identifier, [[tabgroup]], key=f'tab||{identifier}')
|
||||||
|
|
||||||
tabs = []
|
tabs = []
|
||||||
for tab in util.get_tabs_labels():
|
for tab in util.get_tabs_labels():
|
||||||
tabs.append(_make_tabs(tab))
|
tabs.append(_make_tabs(tab))
|
||||||
|
|
||||||
tab_group = psg.TabGroup([tabs], change_submits=True, enable_events=True, key="tabgroup")
|
tab_group = psg.TabGroup([tabs], change_submits=True, enable_events=True, key='tabgroup')
|
||||||
|
|
||||||
return [[menu], [tab_group]]
|
return [[menu], [tab_group]]
|
||||||
|
|
||||||
def make_menu(self) -> psg.Menu:
|
def make_menu(self) -> psg.Menu:
|
||||||
themes = [f"{theme}::MENU THEME" for theme in util.get_themes_list()]
|
themes = [f'{theme}::MENU THEME' for theme in util.get_themes_list()]
|
||||||
themes.append("Default::MENU THEME")
|
themes.append('Default::MENU THEME')
|
||||||
menu_def = [
|
menu_def = [
|
||||||
[
|
[
|
||||||
"&Voicemeeter",
|
'&Voicemeeter',
|
||||||
[
|
[
|
||||||
"Restart Audio Engine::MENU",
|
'Restart Audio Engine::MENU',
|
||||||
"Save Settings::MENU",
|
'Save Settings::MENU',
|
||||||
"Load Settings::MENU",
|
'Load Settings::MENU',
|
||||||
"Load Settings on Startup ::MENU",
|
'Load Settings on Startup ::MENU',
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
["&Theme", themes],
|
['&Theme', themes],
|
||||||
]
|
]
|
||||||
return psg.Menu(menu_def, key="menus")
|
return psg.Menu(menu_def, key='menus')
|
||||||
|
|
||||||
def make_tab0_row0(self) -> psg.Frame:
|
def make_tab0_row0(self) -> psg.Frame:
|
||||||
"""tab0 row0 represents hardware ins"""
|
"""tab0 row0 represents hardware ins"""
|
||||||
|
|
||||||
def add_physical_device_opts(layout):
|
def add_physical_device_opts(layout):
|
||||||
devices = util.get_input_device_list(self.vm)
|
devices = util.get_input_device_list(self.vm)
|
||||||
devices.append("- remove device selection -")
|
devices.append('- remove device selection -')
|
||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.ButtonMenu(
|
psg.ButtonMenu(
|
||||||
f"IN {i + 1}",
|
f'IN {i + 1}',
|
||||||
size=(6, 3),
|
size=(6, 3),
|
||||||
menu_def=["", devices],
|
menu_def=['', devices],
|
||||||
key=f"HARDWARE IN||{i + 1}",
|
key=f'HARDWARE IN||{i + 1}',
|
||||||
)
|
)
|
||||||
for i in range(self.kind.phys_in)
|
for i in range(self.kind.phys_in)
|
||||||
]
|
]
|
||||||
@ -128,23 +128,23 @@ class Builder:
|
|||||||
|
|
||||||
hardware_in = []
|
hardware_in = []
|
||||||
[step(hardware_in) for step in (add_physical_device_opts,)]
|
[step(hardware_in) for step in (add_physical_device_opts,)]
|
||||||
return psg.Frame("Hardware In", hardware_in)
|
return psg.Frame('Hardware In', hardware_in)
|
||||||
|
|
||||||
def make_tab0_row1(self) -> psg.Frame:
|
def make_tab0_row1(self) -> psg.Frame:
|
||||||
"""tab0 row1 represents hardware outs"""
|
"""tab0 row1 represents hardware outs"""
|
||||||
|
|
||||||
def add_physical_device_opts(layout):
|
def add_physical_device_opts(layout):
|
||||||
if self.kind.name == "basic":
|
if self.kind.name == 'basic':
|
||||||
num_outs = self.kind.phys_out + self.kind.virt_out
|
num_outs = self.kind.phys_out + self.kind.virt_out
|
||||||
else:
|
else:
|
||||||
num_outs = self.kind.phys_out
|
num_outs = self.kind.phys_out
|
||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.ButtonMenu(
|
psg.ButtonMenu(
|
||||||
f"A{i + 1}",
|
f'A{i + 1}',
|
||||||
size=(6, 3),
|
size=(6, 3),
|
||||||
menu_def=["", util.get_output_device_list(i, self.vm)],
|
menu_def=['', util.get_output_device_list(i, self.vm)],
|
||||||
key=f"HARDWARE OUT||A{i + 1}",
|
key=f'HARDWARE OUT||A{i + 1}',
|
||||||
)
|
)
|
||||||
for i in range(num_outs)
|
for i in range(num_outs)
|
||||||
]
|
]
|
||||||
@ -152,7 +152,7 @@ class Builder:
|
|||||||
|
|
||||||
hardware_out = []
|
hardware_out = []
|
||||||
[step(hardware_out) for step in (add_physical_device_opts,)]
|
[step(hardware_out) for step in (add_physical_device_opts,)]
|
||||||
return psg.Frame("Hardware Out", hardware_out)
|
return psg.Frame('Hardware Out', hardware_out)
|
||||||
|
|
||||||
def make_tab0_row3(self) -> psg.Frame:
|
def make_tab0_row3(self) -> psg.Frame:
|
||||||
"""tab0 row3 represents patch composite"""
|
"""tab0 row3 represents patch composite"""
|
||||||
@ -162,10 +162,10 @@ class Builder:
|
|||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.ButtonMenu(
|
psg.ButtonMenu(
|
||||||
f"PC{i + 1}",
|
f'PC{i + 1}',
|
||||||
size=(5, 2),
|
size=(5, 2),
|
||||||
menu_def=["", outputs],
|
menu_def=['', outputs],
|
||||||
key=f"PATCH COMPOSITE||PC{i + 1}",
|
key=f'PATCH COMPOSITE||PC{i + 1}',
|
||||||
)
|
)
|
||||||
for i in range(self.kind.composite)
|
for i in range(self.kind.composite)
|
||||||
]
|
]
|
||||||
@ -173,7 +173,7 @@ class Builder:
|
|||||||
|
|
||||||
hardware_out = []
|
hardware_out = []
|
||||||
[step(hardware_out) for step in (add_physical_device_opts,)]
|
[step(hardware_out) for step in (add_physical_device_opts,)]
|
||||||
return psg.Frame("PATCH COMPOSITE", hardware_out)
|
return psg.Frame('PATCH COMPOSITE', hardware_out)
|
||||||
|
|
||||||
def make_tab0_row4(self) -> psg.Frame:
|
def make_tab0_row4(self) -> psg.Frame:
|
||||||
"""tab0 row4 represents patch insert"""
|
"""tab0 row4 represents patch insert"""
|
||||||
@ -185,28 +185,28 @@ class Builder:
|
|||||||
[
|
[
|
||||||
psg.Checkbox(
|
psg.Checkbox(
|
||||||
text=channel,
|
text=channel,
|
||||||
default=self.window.cache["insert"][
|
default=self.window.cache['insert'][
|
||||||
f"INSERT CHECKBOX||{util.get_insert_checkbox_index(self.kind, j, i)}"
|
f'INSERT CHECKBOX||{util.get_insert_checkbox_index(self.kind, j, i)}'
|
||||||
],
|
],
|
||||||
enable_events=True,
|
enable_events=True,
|
||||||
key=f"INSERT CHECKBOX||IN{i} {j}",
|
key=f'INSERT CHECKBOX||IN{i} {j}',
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
for j, channel in enumerate(("LEFT", "RIGHT"))
|
for j, channel in enumerate(('LEFT', 'RIGHT'))
|
||||||
]
|
]
|
||||||
else:
|
else:
|
||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.Checkbox(
|
psg.Checkbox(
|
||||||
text=channel,
|
text=channel,
|
||||||
default=self.window.cache["insert"][
|
default=self.window.cache['insert'][
|
||||||
f"INSERT CHECKBOX||{util.get_insert_checkbox_index(self.kind, j, i)}"
|
f'INSERT CHECKBOX||{util.get_insert_checkbox_index(self.kind, j, i)}'
|
||||||
],
|
],
|
||||||
enable_events=True,
|
enable_events=True,
|
||||||
key=f"INSERT CHECKBOX||IN{i} {j}",
|
key=f'INSERT CHECKBOX||IN{i} {j}',
|
||||||
)
|
)
|
||||||
for j, channel in enumerate(("LEFT", "RIGHT", "C", "LFE", "SL", "SR", "BL", "BR"))
|
for j, channel in enumerate(('LEFT', 'RIGHT', 'C', 'LFE', 'SL', 'SR', 'BL', 'BR'))
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -216,29 +216,29 @@ class Builder:
|
|||||||
for i, checkbox_list in enumerate(checkbox_lists):
|
for i, checkbox_list in enumerate(checkbox_lists):
|
||||||
if i < self.kind.phys_in:
|
if i < self.kind.phys_in:
|
||||||
[step(checkbox_list, i + 1) for step in (add_insert_checkboxes,)]
|
[step(checkbox_list, i + 1) for step in (add_insert_checkboxes,)]
|
||||||
inner.append(psg.Frame(f"In#{i + 1}", checkbox_list))
|
inner.append(psg.Frame(f'In#{i + 1}', checkbox_list))
|
||||||
else:
|
else:
|
||||||
[step(checkbox_list, i + 1) for step in (add_insert_checkboxes,)]
|
[step(checkbox_list, i + 1) for step in (add_insert_checkboxes,)]
|
||||||
asio_checkboxes.append([psg.Frame(f"In#{i + 1}", checkbox_list)])
|
asio_checkboxes.append([psg.Frame(f'In#{i + 1}', checkbox_list)])
|
||||||
asio_checkboxes.insert(0, inner)
|
asio_checkboxes.insert(0, inner)
|
||||||
|
|
||||||
return psg.Frame("PATCH INSERT", asio_checkboxes)
|
return psg.Frame('PATCH INSERT', asio_checkboxes)
|
||||||
|
|
||||||
def make_tab0_row5(self) -> psg.Frame:
|
def make_tab0_row5(self) -> psg.Frame:
|
||||||
"""tab0 row5 represents advanced settings"""
|
"""tab0 row5 represents advanced settings"""
|
||||||
|
|
||||||
return psg.Frame(
|
return psg.Frame(
|
||||||
"ADVANCED SETTINGS",
|
'ADVANCED SETTINGS',
|
||||||
[
|
[
|
||||||
[
|
[
|
||||||
psg.Button(
|
psg.Button(
|
||||||
"ADVANCED SETTINGS",
|
'ADVANCED SETTINGS',
|
||||||
size=(20, 2),
|
size=(20, 2),
|
||||||
key="ADVANCED SETTINGS",
|
key='ADVANCED SETTINGS',
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
key="ADVANCED SETTINGS FRAME",
|
key='ADVANCED SETTINGS FRAME',
|
||||||
)
|
)
|
||||||
|
|
||||||
def make_tab1_button_row(self, i) -> psg.Frame:
|
def make_tab1_button_row(self, i) -> psg.Frame:
|
||||||
@ -248,26 +248,26 @@ class Builder:
|
|||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.Button(
|
psg.Button(
|
||||||
f"A{j + 1}" if j < self.kind.phys_out else f"B{j - self.kind.phys_out + 1}",
|
f'A{j + 1}' if j < self.kind.phys_out else f'B{j - self.kind.phys_out + 1}',
|
||||||
size=(4, 2),
|
size=(4, 2),
|
||||||
key=f"STRIP {i}||A{j + 1}"
|
key=f'STRIP {i}||A{j + 1}'
|
||||||
if j < self.kind.phys_out
|
if j < self.kind.phys_out
|
||||||
else f"STRIP {i}||B{j - self.kind.phys_out + 1}",
|
else f'STRIP {i}||B{j - self.kind.phys_out + 1}',
|
||||||
)
|
)
|
||||||
for j in range(self.kind.phys_out + self.kind.virt_out)
|
for j in range(self.kind.phys_out + self.kind.virt_out)
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.Button("Mono", size=(6, 2), key=f"STRIP {i}||MONO"),
|
psg.Button('Mono', size=(6, 2), key=f'STRIP {i}||MONO'),
|
||||||
psg.Button("Solo", size=(6, 2), key=f"STRIP {i}||SOLO"),
|
psg.Button('Solo', size=(6, 2), key=f'STRIP {i}||SOLO'),
|
||||||
psg.Button("Mute", size=(6, 2), key=f"STRIP {i}||MUTE"),
|
psg.Button('Mute', size=(6, 2), key=f'STRIP {i}||MUTE'),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
outputs = []
|
outputs = []
|
||||||
[step(outputs) for step in (add_strip_outputs,)]
|
[step(outputs) for step in (add_strip_outputs,)]
|
||||||
return psg.Frame(self.window.cache["labels"][f"STRIP {i}||LABEL"], outputs, key=f"STRIP {i}||LABEL")
|
return psg.Frame(self.window.cache['labels'][f'STRIP {i}||LABEL'], outputs, key=f'STRIP {i}||LABEL')
|
||||||
|
|
||||||
def make_tab1_button_rows(self) -> psg.Frame:
|
def make_tab1_button_rows(self) -> psg.Frame:
|
||||||
layout = [[self.make_tab1_button_row(i)] for i in range(self.kind.phys_in)]
|
layout = [[self.make_tab1_button_row(i)] for i in range(self.kind.phys_in)]
|
||||||
@ -277,7 +277,7 @@ class Builder:
|
|||||||
def add_gain_slider(layout):
|
def add_gain_slider(layout):
|
||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.Text("Gain"),
|
psg.Text('Gain'),
|
||||||
psg.Slider(
|
psg.Slider(
|
||||||
range=(-60, 12),
|
range=(-60, 12),
|
||||||
default_value=self.vm.strip[i].gain,
|
default_value=self.vm.strip[i].gain,
|
||||||
@ -286,8 +286,8 @@ class Builder:
|
|||||||
expand_x=True,
|
expand_x=True,
|
||||||
enable_events=True,
|
enable_events=True,
|
||||||
disabled=True,
|
disabled=True,
|
||||||
orientation="horizontal",
|
orientation='horizontal',
|
||||||
key=f"STRIP {i}||SLIDER GAIN",
|
key=f'STRIP {i}||SLIDER GAIN',
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
@ -298,7 +298,7 @@ class Builder:
|
|||||||
def add_limit_slider(layout):
|
def add_limit_slider(layout):
|
||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.Text("Limit"),
|
psg.Text('Limit'),
|
||||||
psg.Slider(
|
psg.Slider(
|
||||||
range=(-40, 12),
|
range=(-40, 12),
|
||||||
default_value=self.vm.strip[i].limit,
|
default_value=self.vm.strip[i].limit,
|
||||||
@ -306,18 +306,18 @@ class Builder:
|
|||||||
disable_number_display=True,
|
disable_number_display=True,
|
||||||
expand_x=True,
|
expand_x=True,
|
||||||
enable_events=True,
|
enable_events=True,
|
||||||
orientation="horizontal",
|
orientation='horizontal',
|
||||||
key=f"STRIP {i}||SLIDER LIMIT",
|
key=f'STRIP {i}||SLIDER LIMIT',
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
layout = []
|
layout = []
|
||||||
steps = (add_gain_slider, add_param_sliders)
|
steps = (add_gain_slider, add_param_sliders)
|
||||||
if self.kind.name in ("banana", "potato"):
|
if self.kind.name in ('banana', 'potato'):
|
||||||
steps += (add_limit_slider,)
|
steps += (add_limit_slider,)
|
||||||
[step(layout) for step in steps]
|
[step(layout) for step in steps]
|
||||||
return psg.Frame(self.window.cache["labels"][f"STRIP {i}||LABEL"], layout, key=f"STRIP {i}||LABEL||SLIDER")
|
return psg.Frame(self.window.cache['labels'][f'STRIP {i}||LABEL'], layout, key=f'STRIP {i}||LABEL||SLIDER')
|
||||||
|
|
||||||
def make_tab1_slider_rows(self) -> psg.Frame:
|
def make_tab1_slider_rows(self) -> psg.Frame:
|
||||||
layout = [[self.make_tab1_slider_row(i)] for i in range(self.kind.phys_in)]
|
layout = [[self.make_tab1_slider_row(i)] for i in range(self.kind.phys_in)]
|
||||||
@ -330,11 +330,11 @@ class Builder:
|
|||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.Button(
|
psg.Button(
|
||||||
f"A{j + 1}" if j < self.kind.phys_out else f"B{j - self.kind.phys_out + 1}",
|
f'A{j + 1}' if j < self.kind.phys_out else f'B{j - self.kind.phys_out + 1}',
|
||||||
size=(4, 2),
|
size=(4, 2),
|
||||||
key=f"STRIP {i}||A{j + 1}"
|
key=f'STRIP {i}||A{j + 1}'
|
||||||
if j < self.kind.phys_out
|
if j < self.kind.phys_out
|
||||||
else f"STRIP {i}||B{j - self.kind.phys_out + 1}",
|
else f'STRIP {i}||B{j - self.kind.phys_out + 1}',
|
||||||
)
|
)
|
||||||
for j in range(self.kind.phys_out + self.kind.virt_out)
|
for j in range(self.kind.phys_out + self.kind.virt_out)
|
||||||
]
|
]
|
||||||
@ -342,26 +342,26 @@ class Builder:
|
|||||||
if i == self.kind.phys_in + 1:
|
if i == self.kind.phys_in + 1:
|
||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.Button("K", size=(6, 2), key=f"STRIP {i}||KARAOKE"),
|
psg.Button('K', size=(6, 2), key=f'STRIP {i}||KARAOKE'),
|
||||||
psg.Button("Solo", size=(6, 2), key=f"STRIP {i}||SOLO"),
|
psg.Button('Solo', size=(6, 2), key=f'STRIP {i}||SOLO'),
|
||||||
psg.Button("Mute", size=(6, 2), key=f"STRIP {i}||MUTE"),
|
psg.Button('Mute', size=(6, 2), key=f'STRIP {i}||MUTE'),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.Button("MC", size=(6, 2), key=f"STRIP {i}||MC"),
|
psg.Button('MC', size=(6, 2), key=f'STRIP {i}||MC'),
|
||||||
psg.Button("Solo", size=(6, 2), key=f"STRIP {i}||SOLO"),
|
psg.Button('Solo', size=(6, 2), key=f'STRIP {i}||SOLO'),
|
||||||
psg.Button("Mute", size=(6, 2), key=f"STRIP {i}||MUTE"),
|
psg.Button('Mute', size=(6, 2), key=f'STRIP {i}||MUTE'),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
outputs = []
|
outputs = []
|
||||||
[step(outputs) for step in (add_strip_outputs,)]
|
[step(outputs) for step in (add_strip_outputs,)]
|
||||||
return psg.Frame(
|
return psg.Frame(
|
||||||
self.window.cache["labels"][f"STRIP {i}||LABEL"],
|
self.window.cache['labels'][f'STRIP {i}||LABEL'],
|
||||||
outputs,
|
outputs,
|
||||||
key=f"STRIP {i}||LABEL",
|
key=f'STRIP {i}||LABEL',
|
||||||
)
|
)
|
||||||
|
|
||||||
def make_tab2_button_rows(self) -> psg.Frame:
|
def make_tab2_button_rows(self) -> psg.Frame:
|
||||||
@ -374,7 +374,7 @@ class Builder:
|
|||||||
def add_gain_slider(layout):
|
def add_gain_slider(layout):
|
||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.Text("Gain"),
|
psg.Text('Gain'),
|
||||||
psg.Slider(
|
psg.Slider(
|
||||||
range=(-60, 12),
|
range=(-60, 12),
|
||||||
default_value=self.vm.strip[i].gain,
|
default_value=self.vm.strip[i].gain,
|
||||||
@ -383,14 +383,14 @@ class Builder:
|
|||||||
expand_x=True,
|
expand_x=True,
|
||||||
enable_events=True,
|
enable_events=True,
|
||||||
disabled=True,
|
disabled=True,
|
||||||
orientation="horizontal",
|
orientation='horizontal',
|
||||||
key=f"STRIP {i}||SLIDER GAIN",
|
key=f'STRIP {i}||SLIDER GAIN',
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
def add_param_sliders(layout):
|
def add_param_sliders(layout):
|
||||||
if self.kind.name in ("basic", "banana"):
|
if self.kind.name in ('basic', 'banana'):
|
||||||
for param in util.get_slider_params(i, self.kind):
|
for param in util.get_slider_params(i, self.kind):
|
||||||
layout.append([LabelSlider(self.window, i, param, range_=(-12, 12))])
|
layout.append([LabelSlider(self.window, i, param, range_=(-12, 12))])
|
||||||
else:
|
else:
|
||||||
@ -404,7 +404,7 @@ class Builder:
|
|||||||
def add_limit_slider(layout):
|
def add_limit_slider(layout):
|
||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.Text("Limit"),
|
psg.Text('Limit'),
|
||||||
psg.Slider(
|
psg.Slider(
|
||||||
range=(-40, 12),
|
range=(-40, 12),
|
||||||
default_value=self.vm.strip[i].limit,
|
default_value=self.vm.strip[i].limit,
|
||||||
@ -412,21 +412,21 @@ class Builder:
|
|||||||
disable_number_display=True,
|
disable_number_display=True,
|
||||||
expand_x=True,
|
expand_x=True,
|
||||||
enable_events=True,
|
enable_events=True,
|
||||||
orientation="horizontal",
|
orientation='horizontal',
|
||||||
key=f"STRIP {i}||SLIDER LIMIT",
|
key=f'STRIP {i}||SLIDER LIMIT',
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
layout = []
|
layout = []
|
||||||
steps = (add_gain_slider, add_param_sliders)
|
steps = (add_gain_slider, add_param_sliders)
|
||||||
if self.kind.name in ("banana", "potato"):
|
if self.kind.name in ('banana', 'potato'):
|
||||||
steps += (add_limit_slider,)
|
steps += (add_limit_slider,)
|
||||||
[step(layout) for step in steps]
|
[step(layout) for step in steps]
|
||||||
return psg.Frame(
|
return psg.Frame(
|
||||||
self.window.cache["labels"][f"STRIP {i}||LABEL"],
|
self.window.cache['labels'][f'STRIP {i}||LABEL'],
|
||||||
layout,
|
layout,
|
||||||
key=f"STRIP {i}||LABEL||SLIDER",
|
key=f'STRIP {i}||LABEL||SLIDER',
|
||||||
)
|
)
|
||||||
|
|
||||||
def make_tab2_slider_rows(self) -> psg.Frame:
|
def make_tab2_slider_rows(self) -> psg.Frame:
|
||||||
@ -439,9 +439,9 @@ class Builder:
|
|||||||
"""tab3 row represents bus composite toggle"""
|
"""tab3 row represents bus composite toggle"""
|
||||||
|
|
||||||
def add_strip_outputs(layout):
|
def add_strip_outputs(layout):
|
||||||
params = ["MONO", "EQ", "MUTE"]
|
params = ['MONO', 'EQ', 'MUTE']
|
||||||
if self.kind.name == "basic":
|
if self.kind.name == 'basic':
|
||||||
params.remove("EQ")
|
params.remove('EQ')
|
||||||
busmodes = [util._bus_mode_map[mode] for mode in util.get_bus_modes(self.vm)]
|
busmodes = [util._bus_mode_map[mode] for mode in util.get_bus_modes(self.vm)]
|
||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
@ -449,15 +449,15 @@ class Builder:
|
|||||||
psg.Button(
|
psg.Button(
|
||||||
param.capitalize(),
|
param.capitalize(),
|
||||||
size=(6, 2),
|
size=(6, 2),
|
||||||
key=f"BUS {i}||{param}",
|
key=f'BUS {i}||{param}',
|
||||||
)
|
)
|
||||||
for param in params
|
for param in params
|
||||||
],
|
],
|
||||||
psg.ButtonMenu(
|
psg.ButtonMenu(
|
||||||
"BUSMODE",
|
'BUSMODE',
|
||||||
size=(12, 2),
|
size=(12, 2),
|
||||||
menu_def=["", busmodes],
|
menu_def=['', busmodes],
|
||||||
key=f"BUS {i}||MODE",
|
key=f'BUS {i}||MODE',
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
@ -465,9 +465,9 @@ class Builder:
|
|||||||
outputs = []
|
outputs = []
|
||||||
[step(outputs) for step in (add_strip_outputs,)]
|
[step(outputs) for step in (add_strip_outputs,)]
|
||||||
return psg.Frame(
|
return psg.Frame(
|
||||||
self.window.cache["labels"][f"BUS {i}||LABEL"],
|
self.window.cache['labels'][f'BUS {i}||LABEL'],
|
||||||
outputs,
|
outputs,
|
||||||
key=f"BUS {i}||LABEL",
|
key=f'BUS {i}||LABEL',
|
||||||
)
|
)
|
||||||
|
|
||||||
def make_tab3_button_rows(self) -> psg.Frame:
|
def make_tab3_button_rows(self) -> psg.Frame:
|
||||||
@ -478,7 +478,7 @@ class Builder:
|
|||||||
def add_gain_slider(layout):
|
def add_gain_slider(layout):
|
||||||
layout.append(
|
layout.append(
|
||||||
[
|
[
|
||||||
psg.Text("Gain"),
|
psg.Text('Gain'),
|
||||||
psg.Slider(
|
psg.Slider(
|
||||||
range=(-60, 12),
|
range=(-60, 12),
|
||||||
default_value=self.vm.bus[i].gain,
|
default_value=self.vm.bus[i].gain,
|
||||||
@ -487,15 +487,15 @@ class Builder:
|
|||||||
expand_x=True,
|
expand_x=True,
|
||||||
enable_events=True,
|
enable_events=True,
|
||||||
disabled=True,
|
disabled=True,
|
||||||
orientation="horizontal",
|
orientation='horizontal',
|
||||||
key=f"BUS {i}||SLIDER GAIN",
|
key=f'BUS {i}||SLIDER GAIN',
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
outputs = []
|
outputs = []
|
||||||
[step(outputs) for step in (add_gain_slider,)]
|
[step(outputs) for step in (add_gain_slider,)]
|
||||||
return psg.Frame(self.window.cache["labels"][f"BUS {i}||LABEL"], outputs, key=f"BUS {i}||LABEL||SLIDER")
|
return psg.Frame(self.window.cache['labels'][f'BUS {i}||LABEL'], outputs, key=f'BUS {i}||LABEL||SLIDER')
|
||||||
|
|
||||||
def make_tab3_slider_rows(self) -> psg.Frame:
|
def make_tab3_slider_rows(self) -> psg.Frame:
|
||||||
layout = [[self.make_tab3_slider_row(i)] for i in range(self.kind.num_bus)]
|
layout = [[self.make_tab3_slider_row(i)] for i in range(self.kind.num_bus)]
|
||||||
|
|||||||
@ -5,42 +5,42 @@ from pathlib import Path
|
|||||||
|
|
||||||
from .errors import NVDAVMError
|
from .errors import NVDAVMError
|
||||||
|
|
||||||
bits = 64 if ct.sizeof(ct.c_voidp) == 8 else 32
|
BITS = 64 if ct.sizeof(ct.c_void_p) == 8 else 32
|
||||||
|
|
||||||
if platform.system() != "Windows":
|
if platform.system() != 'Windows':
|
||||||
raise NVDAVMError("Only Windows OS supported")
|
raise NVDAVMError('Only Windows OS supported')
|
||||||
|
|
||||||
REG_KEY = "\\".join(
|
REG_KEY = '\\'.join(
|
||||||
filter(
|
filter(
|
||||||
None,
|
None,
|
||||||
(
|
(
|
||||||
"SOFTWARE",
|
'SOFTWARE',
|
||||||
"WOW6432Node" if bits == 64 else "",
|
'WOW6432Node' if BITS == 64 else '',
|
||||||
"Microsoft",
|
'Microsoft',
|
||||||
"Windows",
|
'Windows',
|
||||||
"CurrentVersion",
|
'CurrentVersion',
|
||||||
"Uninstall",
|
'Uninstall',
|
||||||
"NVDA",
|
'NVDA',
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def get_nvdapath():
|
def get_nvdapath():
|
||||||
with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"{}".format(REG_KEY)) as nvda_key:
|
with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r'{}'.format(REG_KEY)) as nvda_key:
|
||||||
return winreg.QueryValueEx(nvda_key, r"UninstallDirectory")[0]
|
return winreg.QueryValueEx(nvda_key, r'UninstallDirectory')[0]
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
NVDA_PATH = Path(get_nvdapath()) / "nvda.exe"
|
NVDA_PATH = Path(get_nvdapath()) / 'nvda.exe'
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
NVDA_PATH = ""
|
NVDA_PATH = ''
|
||||||
|
|
||||||
|
|
||||||
controller_path = Path(__file__).parents[2].resolve() / "controllerClient"
|
controller_path = Path(__file__).parents[2].resolve() / 'controllerClient'
|
||||||
if not controller_path.exists():
|
if not controller_path.exists():
|
||||||
controller_path = Path("controllerClient")
|
controller_path = Path('_internal') / 'controllerClient'
|
||||||
|
|
||||||
DLL_PATH = controller_path / f"x{64 if bits == 64 else 86}" / f"nvdaControllerClient{bits}.dll"
|
DLL_PATH = controller_path / f'x{64 if BITS == 64 else 86}' / 'nvdaControllerClient.dll'
|
||||||
|
|
||||||
libc = ct.CDLL(str(DLL_PATH))
|
libc = ct.CDLL(str(DLL_PATH))
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
from typing import Union
|
from typing import Union
|
||||||
|
|
||||||
import PySimpleGUI as psg
|
import FreeSimpleGUI as psg
|
||||||
|
|
||||||
from . import util
|
from . import util
|
||||||
|
|
||||||
@ -10,10 +10,13 @@ class LabelSlider(psg.Frame):
|
|||||||
|
|
||||||
def __init__(self, parent, i, param, range_=(0, 10), *args, **kwargs):
|
def __init__(self, parent, i, param, range_=(0, 10), *args, **kwargs):
|
||||||
self.parent = parent
|
self.parent = parent
|
||||||
if param in ("AUDIBILITY", "DENOISER"):
|
if param in ('AUDIBILITY', 'DENOISER'):
|
||||||
size = 7
|
size = 7
|
||||||
else:
|
else:
|
||||||
size = 4
|
if psg.theme() == 'HighContrast':
|
||||||
|
size = 5
|
||||||
|
else:
|
||||||
|
size = 4
|
||||||
layout = [
|
layout = [
|
||||||
[
|
[
|
||||||
psg.Text(param.capitalize(), size=size),
|
psg.Text(param.capitalize(), size=size),
|
||||||
@ -25,8 +28,8 @@ class LabelSlider(psg.Frame):
|
|||||||
size=(12, 16),
|
size=(12, 16),
|
||||||
expand_x=True,
|
expand_x=True,
|
||||||
enable_events=True,
|
enable_events=True,
|
||||||
orientation="horizontal",
|
orientation='horizontal',
|
||||||
key=f"STRIP {i}||SLIDER {param}",
|
key=f'STRIP {i}||SLIDER {param}',
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
@ -34,7 +37,7 @@ class LabelSlider(psg.Frame):
|
|||||||
|
|
||||||
def default_value(self, i, param):
|
def default_value(self, i, param):
|
||||||
target = getattr(self.parent.vm.strip[i], param.lower())
|
target = getattr(self.parent.vm.strip[i], param.lower())
|
||||||
if param in ("COMP", "GATE", "DENOISER"):
|
if param in ('COMP', 'GATE', 'DENOISER'):
|
||||||
return target.knob
|
return target.knob
|
||||||
return target
|
return target
|
||||||
|
|
||||||
@ -49,70 +52,70 @@ class CompSlider(psg.Slider):
|
|||||||
disable_number_display=True,
|
disable_number_display=True,
|
||||||
expand_x=True,
|
expand_x=True,
|
||||||
enable_events=True,
|
enable_events=True,
|
||||||
orientation="horizontal",
|
orientation='horizontal',
|
||||||
key=f"COMPRESSOR||SLIDER {param}",
|
key=f'COMPRESSOR||SLIDER {param}',
|
||||||
**self.default_params(param),
|
**self.default_params(param),
|
||||||
)
|
)
|
||||||
|
|
||||||
def default_params(self, param):
|
def default_params(self, param):
|
||||||
match param:
|
match param:
|
||||||
case "INPUT GAIN":
|
case 'INPUT GAIN':
|
||||||
return {
|
return {
|
||||||
"range": (-24, 24),
|
'range': (-24, 24),
|
||||||
"default_value": self.vm.strip[self.index].comp.gainin,
|
'default_value': self.vm.strip[self.index].comp.gainin,
|
||||||
"resolution": 0.1,
|
'resolution': 0.1,
|
||||||
"disabled": True,
|
'disabled': True,
|
||||||
}
|
}
|
||||||
case "RATIO":
|
case 'RATIO':
|
||||||
return {
|
return {
|
||||||
"range": (1, 8),
|
'range': (1, 8),
|
||||||
"default_value": self.vm.strip[self.index].comp.ratio,
|
'default_value': self.vm.strip[self.index].comp.ratio,
|
||||||
"resolution": 0.1,
|
'resolution': 0.1,
|
||||||
}
|
}
|
||||||
case "THRESHOLD":
|
case 'THRESHOLD':
|
||||||
return {
|
return {
|
||||||
"range": (-40, -3),
|
'range': (-40, -3),
|
||||||
"default_value": self.vm.strip[self.index].comp.threshold,
|
'default_value': self.vm.strip[self.index].comp.threshold,
|
||||||
"resolution": 0.1,
|
'resolution': 0.1,
|
||||||
}
|
}
|
||||||
case "ATTACK":
|
case 'ATTACK':
|
||||||
return {
|
return {
|
||||||
"range": (0, 200),
|
'range': (0, 200),
|
||||||
"default_value": self.vm.strip[self.index].comp.attack,
|
'default_value': self.vm.strip[self.index].comp.attack,
|
||||||
"resolution": 0.1,
|
'resolution': 0.1,
|
||||||
}
|
}
|
||||||
case "RELEASE":
|
case 'RELEASE':
|
||||||
return {
|
return {
|
||||||
"range": (0, 5000),
|
'range': (0, 5000),
|
||||||
"default_value": self.vm.strip[self.index].comp.release,
|
'default_value': self.vm.strip[self.index].comp.release,
|
||||||
"resolution": 0.1,
|
'resolution': 0.1,
|
||||||
}
|
}
|
||||||
case "KNEE":
|
case 'KNEE':
|
||||||
return {
|
return {
|
||||||
"range": (0, 1),
|
'range': (0, 1),
|
||||||
"default_value": self.vm.strip[self.index].comp.knee,
|
'default_value': self.vm.strip[self.index].comp.knee,
|
||||||
"resolution": 0.01,
|
'resolution': 0.01,
|
||||||
}
|
}
|
||||||
case "OUTPUT GAIN":
|
case 'OUTPUT GAIN':
|
||||||
return {
|
return {
|
||||||
"range": (-24, 24),
|
'range': (-24, 24),
|
||||||
"default_value": self.vm.strip[self.index].comp.gainout,
|
'default_value': self.vm.strip[self.index].comp.gainout,
|
||||||
"resolution": 0.1,
|
'resolution': 0.1,
|
||||||
"disabled": True,
|
'disabled': True,
|
||||||
}
|
}
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def check_bounds(param, val):
|
def check_bounds(param, val):
|
||||||
match param:
|
match param:
|
||||||
case "RATIO":
|
case 'RATIO':
|
||||||
val = util.check_bounds(val, (1, 8))
|
val = util.check_bounds(val, (1, 8))
|
||||||
case "THRESHOLD":
|
case 'THRESHOLD':
|
||||||
val = util.check_bounds(val, (-40, -3))
|
val = util.check_bounds(val, (-40, -3))
|
||||||
case "ATTACK":
|
case 'ATTACK':
|
||||||
val = util.check_bounds(val, (0, 200))
|
val = util.check_bounds(val, (0, 200))
|
||||||
case "RELEASE":
|
case 'RELEASE':
|
||||||
val = util.check_bounds(val, (0, 5000))
|
val = util.check_bounds(val, (0, 5000))
|
||||||
case "KNEE":
|
case 'KNEE':
|
||||||
val = util.check_bounds(val, (0, 1))
|
val = util.check_bounds(val, (0, 1))
|
||||||
return val
|
return val
|
||||||
|
|
||||||
@ -125,64 +128,64 @@ class GateSlider(psg.Slider):
|
|||||||
disable_number_display=True,
|
disable_number_display=True,
|
||||||
expand_x=True,
|
expand_x=True,
|
||||||
enable_events=True,
|
enable_events=True,
|
||||||
orientation="horizontal",
|
orientation='horizontal',
|
||||||
key=f"GATE||SLIDER {param}",
|
key=f'GATE||SLIDER {param}',
|
||||||
**self.default_params(param),
|
**self.default_params(param),
|
||||||
)
|
)
|
||||||
|
|
||||||
def default_params(self, param):
|
def default_params(self, param):
|
||||||
match param:
|
match param:
|
||||||
case "THRESHOLD":
|
case 'THRESHOLD':
|
||||||
return {
|
return {
|
||||||
"range": (-60, -10),
|
'range': (-60, -10),
|
||||||
"default_value": self.vm.strip[self.index].gate.threshold,
|
'default_value': self.vm.strip[self.index].gate.threshold,
|
||||||
"resolution": 0.1,
|
'resolution': 0.1,
|
||||||
}
|
}
|
||||||
case "DAMPING":
|
case 'DAMPING':
|
||||||
return {
|
return {
|
||||||
"range": (-60, -10),
|
'range': (-60, -10),
|
||||||
"default_value": self.vm.strip[self.index].gate.damping,
|
'default_value': self.vm.strip[self.index].gate.damping,
|
||||||
"resolution": 0.1,
|
'resolution': 0.1,
|
||||||
}
|
}
|
||||||
case "BPSIDECHAIN":
|
case 'BPSIDECHAIN':
|
||||||
return {
|
return {
|
||||||
"range": (100, 4000),
|
'range': (100, 4000),
|
||||||
"default_value": self.vm.strip[self.index].gate.bpsidechain,
|
'default_value': self.vm.strip[self.index].gate.bpsidechain,
|
||||||
"resolution": 1,
|
'resolution': 1,
|
||||||
}
|
}
|
||||||
case "ATTACK":
|
case 'ATTACK':
|
||||||
return {
|
return {
|
||||||
"range": (0, 1000),
|
'range': (0, 1000),
|
||||||
"default_value": self.vm.strip[self.index].gate.attack,
|
'default_value': self.vm.strip[self.index].gate.attack,
|
||||||
"resolution": 0.1,
|
'resolution': 0.1,
|
||||||
}
|
}
|
||||||
case "HOLD":
|
case 'HOLD':
|
||||||
return {
|
return {
|
||||||
"range": (0, 5000),
|
'range': (0, 5000),
|
||||||
"default_value": self.vm.strip[self.index].gate.hold,
|
'default_value': self.vm.strip[self.index].gate.hold,
|
||||||
"resolution": 0.1,
|
'resolution': 0.1,
|
||||||
}
|
}
|
||||||
case "RELEASE":
|
case 'RELEASE':
|
||||||
return {
|
return {
|
||||||
"range": (0, 5000),
|
'range': (0, 5000),
|
||||||
"default_value": self.vm.strip[self.index].gate.release,
|
'default_value': self.vm.strip[self.index].gate.release,
|
||||||
"resolution": 0.1,
|
'resolution': 0.1,
|
||||||
}
|
}
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def check_bounds(param, val):
|
def check_bounds(param, val):
|
||||||
match param:
|
match param:
|
||||||
case "THRESHOLD":
|
case 'THRESHOLD':
|
||||||
val = util.check_bounds(val, (-60, -10))
|
val = util.check_bounds(val, (-60, -10))
|
||||||
case "DAMPING MAX":
|
case 'DAMPING MAX':
|
||||||
val = util.check_bounds(val, (-60, -10))
|
val = util.check_bounds(val, (-60, -10))
|
||||||
case "BPSIDECHAIN":
|
case 'BPSIDECHAIN':
|
||||||
val = util.check_bounds(val, (100, 4000))
|
val = util.check_bounds(val, (100, 4000))
|
||||||
case "ATTACK":
|
case 'ATTACK':
|
||||||
val = util.check_bounds(val, (0, 1000))
|
val = util.check_bounds(val, (0, 1000))
|
||||||
case "HOLD":
|
case 'HOLD':
|
||||||
val = util.check_bounds(val, (0, 5000))
|
val = util.check_bounds(val, (0, 5000))
|
||||||
case "RELEASE":
|
case 'RELEASE':
|
||||||
val = util.check_bounds(val, (0, 5000))
|
val = util.check_bounds(val, (0, 5000))
|
||||||
return val
|
return val
|
||||||
|
|
||||||
@ -192,8 +195,8 @@ class LabelSliderAdvanced(psg.Frame):
|
|||||||
|
|
||||||
def __init__(self, parent, index, param, slider_cls: Union[CompSlider, GateSlider], *args, **kwargs):
|
def __init__(self, parent, index, param, slider_cls: Union[CompSlider, GateSlider], *args, **kwargs):
|
||||||
label_map = {
|
label_map = {
|
||||||
"DAMPING": "Damping Max",
|
'DAMPING': 'Damping Max',
|
||||||
"BPSIDECHAIN": "BP Sidechain",
|
'BPSIDECHAIN': 'BP Sidechain',
|
||||||
}
|
}
|
||||||
|
|
||||||
layout = [
|
layout = [
|
||||||
|
|||||||
@ -1,14 +1,14 @@
|
|||||||
import json
|
import json
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
SETTINGS = Path.cwd() / "settings.json"
|
SETTINGS = Path.cwd() / 'settings.json'
|
||||||
|
|
||||||
|
|
||||||
def config_from_json():
|
def config_from_json():
|
||||||
data = {}
|
data = {}
|
||||||
if not SETTINGS.exists():
|
if not SETTINGS.exists():
|
||||||
return data
|
return data
|
||||||
with open(SETTINGS, "r") as f:
|
with open(SETTINGS, 'r') as f:
|
||||||
data = json.load(f)
|
data = json.load(f)
|
||||||
return data
|
return data
|
||||||
|
|
||||||
@ -24,11 +24,11 @@ def get(key, default=None):
|
|||||||
|
|
||||||
def set(key, value):
|
def set(key, value):
|
||||||
config[key] = value
|
config[key] = value
|
||||||
with open(SETTINGS, "w") as f:
|
with open(SETTINGS, 'w') as f:
|
||||||
json.dump(config, f)
|
json.dump(config, f)
|
||||||
|
|
||||||
|
|
||||||
def delete(key):
|
def delete(key):
|
||||||
del config[key]
|
del config[key]
|
||||||
with open(SETTINGS, "w") as f:
|
with open(SETTINGS, 'w') as f:
|
||||||
json.dump(config, f)
|
json.dump(config, f)
|
||||||
|
|||||||
@ -8,4 +8,4 @@ class NVDAVMCAPIError(NVDAVMError):
|
|||||||
def __init__(self, fn_name, code):
|
def __init__(self, fn_name, code):
|
||||||
self.fn_name = fn_name
|
self.fn_name = fn_name
|
||||||
self.code = code
|
self.code = code
|
||||||
super().__init__(f"{self.fn_name} returned {self.code}")
|
super().__init__(f'{self.fn_name} returned {self.code}')
|
||||||
|
|||||||
1
src/nvda_voicemeeter/gui/banana/__init__.py
Normal file
1
src/nvda_voicemeeter/gui/banana/__init__.py
Normal file
@ -0,0 +1 @@
|
|||||||
|
from .main import run
|
||||||
11
src/nvda_voicemeeter/gui/banana/main.py
Normal file
11
src/nvda_voicemeeter/gui/banana/main.py
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import voicemeeterlib
|
||||||
|
|
||||||
|
import nvda_voicemeeter
|
||||||
|
|
||||||
|
|
||||||
|
def run():
|
||||||
|
KIND_ID = 'banana'
|
||||||
|
|
||||||
|
with voicemeeterlib.api(KIND_ID) as vm:
|
||||||
|
with nvda_voicemeeter.draw(KIND_ID, vm) as window:
|
||||||
|
window.run()
|
||||||
1
src/nvda_voicemeeter/gui/basic/__init__.py
Normal file
1
src/nvda_voicemeeter/gui/basic/__init__.py
Normal file
@ -0,0 +1 @@
|
|||||||
|
from .main import run
|
||||||
11
src/nvda_voicemeeter/gui/basic/main.py
Normal file
11
src/nvda_voicemeeter/gui/basic/main.py
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import voicemeeterlib
|
||||||
|
|
||||||
|
import nvda_voicemeeter
|
||||||
|
|
||||||
|
|
||||||
|
def run():
|
||||||
|
KIND_ID = 'basic'
|
||||||
|
|
||||||
|
with voicemeeterlib.api(KIND_ID) as vm:
|
||||||
|
with nvda_voicemeeter.draw(KIND_ID, vm) as window:
|
||||||
|
window.run()
|
||||||
1
src/nvda_voicemeeter/gui/potato/__init__.py
Normal file
1
src/nvda_voicemeeter/gui/potato/__init__.py
Normal file
@ -0,0 +1 @@
|
|||||||
|
from .main import run
|
||||||
11
src/nvda_voicemeeter/gui/potato/main.py
Normal file
11
src/nvda_voicemeeter/gui/potato/main.py
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import voicemeeterlib
|
||||||
|
|
||||||
|
import nvda_voicemeeter
|
||||||
|
|
||||||
|
|
||||||
|
def run():
|
||||||
|
KIND_ID = 'potato'
|
||||||
|
|
||||||
|
with voicemeeterlib.api(KIND_ID) as vm:
|
||||||
|
with nvda_voicemeeter.draw(KIND_ID, vm) as window:
|
||||||
|
window.run()
|
||||||
@ -1,58 +1,58 @@
|
|||||||
def _make_hardware_ins_cache(vm) -> dict:
|
def _make_hardware_ins_cache(vm) -> dict:
|
||||||
return {**{f"HARDWARE IN||{i + 1}": vm.strip[i].device.name for i in range(vm.kind.phys_in)}}
|
return {**{f'HARDWARE IN||{i + 1}': vm.strip[i].device.name for i in range(vm.kind.phys_in)}}
|
||||||
|
|
||||||
|
|
||||||
def _make_hardware_outs_cache(vm) -> dict:
|
def _make_hardware_outs_cache(vm) -> dict:
|
||||||
hw_outs = {**{f"HARDWARE OUT||A{i + 1}": vm.bus[i].device.name for i in range(vm.kind.phys_out)}}
|
hw_outs = {**{f'HARDWARE OUT||A{i + 1}': vm.bus[i].device.name for i in range(vm.kind.phys_out)}}
|
||||||
if vm.kind.name == "basic":
|
if vm.kind.name == 'basic':
|
||||||
hw_outs |= {"HARDWARE OUT||A2": vm.bus[1].device.name}
|
hw_outs |= {'HARDWARE OUT||A2': vm.bus[1].device.name}
|
||||||
return hw_outs
|
return hw_outs
|
||||||
|
|
||||||
|
|
||||||
def _make_param_cache(vm, channel_type) -> dict:
|
def _make_param_cache(vm, channel_type) -> dict:
|
||||||
params = {}
|
params = {}
|
||||||
if channel_type == "strip":
|
if channel_type == 'strip':
|
||||||
match vm.kind.name:
|
match vm.kind.name:
|
||||||
case "basic":
|
case 'basic':
|
||||||
params |= {
|
params |= {
|
||||||
**{f"STRIP {i}||A1": vm.strip[i].A1 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||A1': vm.strip[i].A1 for i in range(vm.kind.num_strip)},
|
||||||
**{f"STRIP {i}||B1": vm.strip[i].B1 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||B1': vm.strip[i].B1 for i in range(vm.kind.num_strip)},
|
||||||
}
|
}
|
||||||
case "banana":
|
case 'banana':
|
||||||
params |= {
|
params |= {
|
||||||
**{f"STRIP {i}||A1": vm.strip[i].A1 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||A1': vm.strip[i].A1 for i in range(vm.kind.num_strip)},
|
||||||
**{f"STRIP {i}||A2": vm.strip[i].A2 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||A2': vm.strip[i].A2 for i in range(vm.kind.num_strip)},
|
||||||
**{f"STRIP {i}||A3": vm.strip[i].A3 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||A3': vm.strip[i].A3 for i in range(vm.kind.num_strip)},
|
||||||
**{f"STRIP {i}||B1": vm.strip[i].B1 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||B1': vm.strip[i].B1 for i in range(vm.kind.num_strip)},
|
||||||
**{f"STRIP {i}||B2": vm.strip[i].B2 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||B2': vm.strip[i].B2 for i in range(vm.kind.num_strip)},
|
||||||
}
|
}
|
||||||
case "potato":
|
case 'potato':
|
||||||
params |= {
|
params |= {
|
||||||
**{f"STRIP {i}||A1": vm.strip[i].A1 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||A1': vm.strip[i].A1 for i in range(vm.kind.num_strip)},
|
||||||
**{f"STRIP {i}||A2": vm.strip[i].A2 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||A2': vm.strip[i].A2 for i in range(vm.kind.num_strip)},
|
||||||
**{f"STRIP {i}||A3": vm.strip[i].A3 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||A3': vm.strip[i].A3 for i in range(vm.kind.num_strip)},
|
||||||
**{f"STRIP {i}||A4": vm.strip[i].A4 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||A4': vm.strip[i].A4 for i in range(vm.kind.num_strip)},
|
||||||
**{f"STRIP {i}||A5": vm.strip[i].A5 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||A5': vm.strip[i].A5 for i in range(vm.kind.num_strip)},
|
||||||
**{f"STRIP {i}||B1": vm.strip[i].B1 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||B1': vm.strip[i].B1 for i in range(vm.kind.num_strip)},
|
||||||
**{f"STRIP {i}||B2": vm.strip[i].B2 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||B2': vm.strip[i].B2 for i in range(vm.kind.num_strip)},
|
||||||
**{f"STRIP {i}||B3": vm.strip[i].B3 for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||B3': vm.strip[i].B3 for i in range(vm.kind.num_strip)},
|
||||||
}
|
}
|
||||||
params |= {
|
params |= {
|
||||||
**{f"STRIP {i}||MONO": vm.strip[i].mono for i in range(vm.kind.phys_in)},
|
**{f'STRIP {i}||MONO': vm.strip[i].mono for i in range(vm.kind.phys_in)},
|
||||||
**{f"STRIP {i}||SOLO": vm.strip[i].solo for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||SOLO': vm.strip[i].solo for i in range(vm.kind.num_strip)},
|
||||||
**{f"STRIP {i}||MUTE": vm.strip[i].mute for i in range(vm.kind.num_strip)},
|
**{f'STRIP {i}||MUTE': vm.strip[i].mute for i in range(vm.kind.num_strip)},
|
||||||
}
|
}
|
||||||
for i in range(vm.kind.phys_in, vm.kind.phys_in + vm.kind.virt_in):
|
for i in range(vm.kind.phys_in, vm.kind.phys_in + vm.kind.virt_in):
|
||||||
if i == vm.kind.phys_in + 1:
|
if i == vm.kind.phys_in + 1:
|
||||||
params[f"STRIP {i}||KARAOKE"] = vm.strip[i].k
|
params[f'STRIP {i}||KARAOKE'] = vm.strip[i].k
|
||||||
else:
|
else:
|
||||||
params[f"STRIP {i}||MC"] = vm.strip[i].mc
|
params[f'STRIP {i}||MC'] = vm.strip[i].mc
|
||||||
else:
|
else:
|
||||||
params |= {
|
params |= {
|
||||||
**{f"BUS {i}||MONO": vm.bus[i].mono for i in range(vm.kind.num_bus)},
|
**{f'BUS {i}||MONO': vm.bus[i].mono for i in range(vm.kind.num_bus)},
|
||||||
**{f"BUS {i}||EQ": vm.bus[i].eq.on for i in range(vm.kind.num_bus)},
|
**{f'BUS {i}||EQ': vm.bus[i].eq.on for i in range(vm.kind.num_bus)},
|
||||||
**{f"BUS {i}||MUTE": vm.bus[i].mute for i in range(vm.kind.num_bus)},
|
**{f'BUS {i}||MUTE': vm.bus[i].mute for i in range(vm.kind.num_bus)},
|
||||||
**{f"BUS {i}||MODE": vm.bus[i].mode.get() for i in range(vm.kind.num_bus)},
|
**{f'BUS {i}||MODE': vm.bus[i].mode.get() for i in range(vm.kind.num_bus)},
|
||||||
}
|
}
|
||||||
return params
|
return params
|
||||||
|
|
||||||
@ -60,19 +60,19 @@ def _make_param_cache(vm, channel_type) -> dict:
|
|||||||
def _make_label_cache(vm) -> dict:
|
def _make_label_cache(vm) -> dict:
|
||||||
return {
|
return {
|
||||||
**{
|
**{
|
||||||
f"STRIP {i}||LABEL": vm.strip[i].label if vm.strip[i].label else f"Hardware Input {i + 1}"
|
f'STRIP {i}||LABEL': vm.strip[i].label if vm.strip[i].label else f'Hardware Input {i + 1}'
|
||||||
for i in range(vm.kind.phys_in)
|
for i in range(vm.kind.phys_in)
|
||||||
},
|
},
|
||||||
**{
|
**{
|
||||||
f"STRIP {i}||LABEL": vm.strip[i].label if vm.strip[i].label else f"Virtual Input {i - vm.kind.phys_in + 1}"
|
f'STRIP {i}||LABEL': vm.strip[i].label if vm.strip[i].label else f'Virtual Input {i - vm.kind.phys_in + 1}'
|
||||||
for i in range(vm.kind.phys_in, vm.kind.phys_in + vm.kind.virt_in)
|
for i in range(vm.kind.phys_in, vm.kind.phys_in + vm.kind.virt_in)
|
||||||
},
|
},
|
||||||
**{
|
**{
|
||||||
f"BUS {i}||LABEL": vm.bus[i].label if vm.bus[i].label else f"Physical Bus {i + 1}"
|
f'BUS {i}||LABEL': vm.bus[i].label if vm.bus[i].label else f'Physical Bus {i + 1}'
|
||||||
for i in range(vm.kind.phys_out)
|
for i in range(vm.kind.phys_out)
|
||||||
},
|
},
|
||||||
**{
|
**{
|
||||||
f"BUS {i}||LABEL": vm.bus[i].label if vm.bus[i].label else f"Virtual Bus {i - vm.kind.phys_out + 1}"
|
f'BUS {i}||LABEL': vm.bus[i].label if vm.bus[i].label else f'Virtual Bus {i - vm.kind.phys_out + 1}'
|
||||||
for i in range(vm.kind.phys_out, vm.kind.phys_out + vm.kind.virt_out)
|
for i in range(vm.kind.phys_out, vm.kind.phys_out + vm.kind.virt_out)
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -80,16 +80,16 @@ def _make_label_cache(vm) -> dict:
|
|||||||
|
|
||||||
def _make_patch_asio_cache(vm) -> dict:
|
def _make_patch_asio_cache(vm) -> dict:
|
||||||
params = {}
|
params = {}
|
||||||
if vm.kind.name != "basic":
|
if vm.kind.name != 'basic':
|
||||||
params |= {**{f"ASIO INPUT SPINBOX||{i}": vm.patch.asio[i].get() for i in range(vm.kind.phys_out * 2)}}
|
params |= {**{f'ASIO INPUT SPINBOX||{i}': vm.patch.asio[i].get() for i in range(vm.kind.phys_out * 2)}}
|
||||||
for i in range(vm.kind.phys_out - 1):
|
for i in range(vm.kind.phys_out - 1):
|
||||||
target = getattr(vm.patch, f"A{i + 2}")
|
target = getattr(vm.patch, f'A{i + 2}')
|
||||||
params |= {**{f"ASIO OUTPUT A{i + 2} SPINBOX||{j}": target[j].get() for j in range(vm.kind.num_bus)}}
|
params |= {**{f'ASIO OUTPUT A{i + 2} SPINBOX||{j}': target[j].get() for j in range(vm.kind.num_bus)}}
|
||||||
return params
|
return params
|
||||||
|
|
||||||
|
|
||||||
def _make_patch_insert_cache(vm) -> dict:
|
def _make_patch_insert_cache(vm) -> dict:
|
||||||
params = {}
|
params = {}
|
||||||
if vm.kind.name != "basic":
|
if vm.kind.name != 'basic':
|
||||||
params |= {**{f"INSERT CHECKBOX||{i}": vm.patch.insert[i].on for i in range(vm.kind.num_strip_levels)}}
|
params |= {**{f'INSERT CHECKBOX||{i}': vm.patch.insert[i].on for i in range(vm.kind.num_strip_levels)}}
|
||||||
return params
|
return params
|
||||||
|
|||||||
@ -4,10 +4,10 @@ from pyparsing import Group, OneOrMore, Optional, Suppress, Word, alphanums, res
|
|||||||
class Parser:
|
class Parser:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.widget = Group(OneOrMore(Word(alphanums)))
|
self.widget = Group(OneOrMore(Word(alphanums)))
|
||||||
self.widget_token = Suppress("||")
|
self.widget_token = Suppress('||')
|
||||||
self.identifier = Group(OneOrMore(Word(alphanums)))
|
self.identifier = Group(OneOrMore(Word(alphanums)))
|
||||||
self.event = Group(OneOrMore(Word(alphanums)))
|
self.event = Group(OneOrMore(Word(alphanums)))
|
||||||
self.menu_token = Suppress("::")
|
self.menu_token = Suppress('::')
|
||||||
self.match = (
|
self.match = (
|
||||||
self.widget + self.widget_token + self.identifier + Optional(self.widget_token) + Optional(self.event)
|
self.widget + self.widget_token + self.identifier + Optional(self.widget_token) + Optional(self.event)
|
||||||
| self.identifier + self.menu_token + self.event
|
| self.identifier + self.menu_token + self.event
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
|||||||
from typing import Iterable
|
from typing import Iterable
|
||||||
|
|
||||||
import PySimpleGUI as psg
|
import FreeSimpleGUI as psg
|
||||||
|
|
||||||
|
|
||||||
def get_asio_input_spinbox_index(channel, num) -> int:
|
def get_asio_input_spinbox_index(channel, num) -> int:
|
||||||
@ -18,9 +18,9 @@ def get_insert_checkbox_index(kind, channel, num) -> int:
|
|||||||
|
|
||||||
|
|
||||||
_rejected_ids = (
|
_rejected_ids = (
|
||||||
"VBAudio100VMVAIO3",
|
'VBAudio100VMVAIO3',
|
||||||
"{F5735BD4-6EAF-4758-9710-9886E5AD0FF3}",
|
'{F5735BD4-6EAF-4758-9710-9886E5AD0FF3}',
|
||||||
"{0239BE07-CEEF-4236-A900-AA778D432FD4}",
|
'{0239BE07-CEEF-4236-A900-AA778D432FD4}',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -28,8 +28,8 @@ def get_input_device_list(vm) -> list:
|
|||||||
devices = []
|
devices = []
|
||||||
for j in range(vm.device.ins):
|
for j in range(vm.device.ins):
|
||||||
device = vm.device.input(j)
|
device = vm.device.input(j)
|
||||||
if device["id"] not in _rejected_ids:
|
if device['id'] not in _rejected_ids:
|
||||||
devices.append("{type}: {name}".format(**device))
|
devices.append('{type}: {name}'.format(**device))
|
||||||
return devices
|
return devices
|
||||||
|
|
||||||
|
|
||||||
@ -37,37 +37,37 @@ def get_output_device_list(i, vm) -> list:
|
|||||||
devices = []
|
devices = []
|
||||||
for j in range(vm.device.outs):
|
for j in range(vm.device.outs):
|
||||||
device = vm.device.output(j)
|
device = vm.device.output(j)
|
||||||
if device["id"] not in _rejected_ids:
|
if device['id'] not in _rejected_ids:
|
||||||
devices.append("{type}: {name}".format(**device))
|
devices.append('{type}: {name}'.format(**device))
|
||||||
if i == 0:
|
if i == 0:
|
||||||
return devices
|
return devices
|
||||||
devices.append("- remove device selection -")
|
devices.append('- remove device selection -')
|
||||||
return [device for device in devices if not device.startswith("asio")]
|
return [device for device in devices if not device.startswith('asio')]
|
||||||
|
|
||||||
|
|
||||||
def get_patch_composite_list(kind) -> list:
|
def get_patch_composite_list(kind) -> list:
|
||||||
temp = []
|
temp = []
|
||||||
for i in range(kind.phys_out):
|
for i in range(kind.phys_out):
|
||||||
[temp.append(f"IN#{i + 1} {channel}") for channel in ("Left", "Right")]
|
[temp.append(f'IN#{i + 1} {channel}') for channel in ('Left', 'Right')]
|
||||||
for i in range(kind.phys_out, kind.phys_out + kind.virt_out):
|
for i in range(kind.phys_out, kind.phys_out + kind.virt_out):
|
||||||
[
|
[
|
||||||
temp.append(f"IN#{i + 1} {channel}")
|
temp.append(f'IN#{i + 1} {channel}')
|
||||||
for channel in ("Left", "Right", "Center", "LFE", "SL", "SR", "BL", "BR")
|
for channel in ('Left', 'Right', 'Center', 'LFE', 'SL', 'SR', 'BL', 'BR')
|
||||||
]
|
]
|
||||||
temp.append("BUS Channel")
|
temp.append('BUS Channel')
|
||||||
return temp
|
return temp
|
||||||
|
|
||||||
|
|
||||||
def get_patch_insert_channels() -> list:
|
def get_patch_insert_channels() -> list:
|
||||||
return [
|
return [
|
||||||
"left",
|
'left',
|
||||||
"right",
|
'right',
|
||||||
"center",
|
'center',
|
||||||
"low frequency effect",
|
'low frequency effect',
|
||||||
"surround left",
|
'surround left',
|
||||||
"surround right",
|
'surround right',
|
||||||
"back left",
|
'back left',
|
||||||
"back right",
|
'back right',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
@ -75,8 +75,8 @@ _patch_insert_channels = get_patch_insert_channels()
|
|||||||
|
|
||||||
|
|
||||||
def get_asio_samples_list(driver) -> list:
|
def get_asio_samples_list(driver) -> list:
|
||||||
if driver == "MME":
|
if driver == 'MME':
|
||||||
samples = ["2048", "1536", "1024", "896", "768", "704", "640", "576", "512", "480", "441"]
|
samples = ['2048', '1536', '1024', '896', '768', '704', '640', '576', '512', '480', '441']
|
||||||
else:
|
else:
|
||||||
# fmt: off
|
# fmt: off
|
||||||
samples = [
|
samples = [
|
||||||
@ -84,14 +84,14 @@ def get_asio_samples_list(driver) -> list:
|
|||||||
"352", "320", "288", "256", "224", "192", "160", "128"
|
"352", "320", "288", "256", "224", "192", "160", "128"
|
||||||
]
|
]
|
||||||
# fmt: on
|
# fmt: on
|
||||||
if driver == "ASIO":
|
if driver == 'ASIO':
|
||||||
samples = [x for x in samples if x not in ("2048", "1536")]
|
samples = [x for x in samples if x not in ('2048', '1536')]
|
||||||
samples.append("Default")
|
samples.append('Default')
|
||||||
return samples
|
return samples
|
||||||
|
|
||||||
|
|
||||||
def get_tabs_labels() -> list:
|
def get_tabs_labels() -> list:
|
||||||
return ["Settings", "Physical Strip", "Virtual Strip", "Buses"]
|
return ['Settings', 'Physical Strip', 'Virtual Strip', 'Buses']
|
||||||
|
|
||||||
|
|
||||||
def open_context_menu_for_buttonmenu(window, identifier) -> None:
|
def open_context_menu_for_buttonmenu(window, identifier) -> None:
|
||||||
@ -106,52 +106,52 @@ def get_channel_identifier_list(vm) -> list:
|
|||||||
identifiers = []
|
identifiers = []
|
||||||
for i in range(vm.kind.phys_in):
|
for i in range(vm.kind.phys_in):
|
||||||
for j in range(2):
|
for j in range(2):
|
||||||
identifiers.append(f"IN{i + 1} {j}")
|
identifiers.append(f'IN{i + 1} {j}')
|
||||||
for i in range(vm.kind.phys_in, vm.kind.phys_in + vm.kind.virt_in):
|
for i in range(vm.kind.phys_in, vm.kind.phys_in + vm.kind.virt_in):
|
||||||
for j in range(8):
|
for j in range(8):
|
||||||
identifiers.append(f"IN{i + 1} {j}")
|
identifiers.append(f'IN{i + 1} {j}')
|
||||||
return identifiers
|
return identifiers
|
||||||
|
|
||||||
|
|
||||||
_bus_mode_map = {
|
_bus_mode_map = {
|
||||||
"normal": "Normal",
|
'normal': 'Normal',
|
||||||
"amix": "Mix Down A",
|
'amix': 'Mix Down A',
|
||||||
"bmix": "Mix Down B",
|
'bmix': 'Mix Down B',
|
||||||
"repeat": "Stereo Repeat",
|
'repeat': 'Stereo Repeat',
|
||||||
"composite": "Composite",
|
'composite': 'Composite',
|
||||||
"tvmix": "Up Mix TV",
|
'tvmix': 'Up Mix TV',
|
||||||
"upmix21": "Up Mix 2.1",
|
'upmix21': 'Up Mix 2.1',
|
||||||
"upmix41": "Up Mix 4.1",
|
'upmix41': 'Up Mix 4.1',
|
||||||
"upmix61": "Up Mix 6.1",
|
'upmix61': 'Up Mix 6.1',
|
||||||
"centeronly": "Center Only",
|
'centeronly': 'Center Only',
|
||||||
"lfeonly": "Low Frequency Effect Only",
|
'lfeonly': 'Low Frequency Effect Only',
|
||||||
"rearonly": "Rear Only",
|
'rearonly': 'Rear Only',
|
||||||
}
|
}
|
||||||
|
|
||||||
_bus_mode_map_reversed = dict((reversed(item) for item in _bus_mode_map.items()))
|
_bus_mode_map_reversed = dict((reversed(item) for item in _bus_mode_map.items()))
|
||||||
|
|
||||||
|
|
||||||
def get_bus_modes(vm) -> list:
|
def get_bus_modes(vm) -> list:
|
||||||
if vm.kind.name == "basic":
|
if vm.kind.name == 'basic':
|
||||||
return [
|
return [
|
||||||
"normal",
|
'normal',
|
||||||
"amix",
|
'amix',
|
||||||
"repeat",
|
'repeat',
|
||||||
"composite",
|
'composite',
|
||||||
]
|
]
|
||||||
return [
|
return [
|
||||||
"normal",
|
'normal',
|
||||||
"amix",
|
'amix',
|
||||||
"bmix",
|
'bmix',
|
||||||
"repeat",
|
'repeat',
|
||||||
"composite",
|
'composite',
|
||||||
"tvmix",
|
'tvmix',
|
||||||
"upmix21",
|
'upmix21',
|
||||||
"upmix41",
|
'upmix41',
|
||||||
"upmix61",
|
'upmix61',
|
||||||
"centeronly",
|
'centeronly',
|
||||||
"lfeonly",
|
'lfeonly',
|
||||||
"rearonly",
|
'rearonly',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
@ -166,59 +166,77 @@ def check_bounds(val, bounds: tuple) -> int | float:
|
|||||||
|
|
||||||
def get_slider_params(i, kind) -> Iterable:
|
def get_slider_params(i, kind) -> Iterable:
|
||||||
if i < kind.phys_in:
|
if i < kind.phys_in:
|
||||||
if kind.name == "basic":
|
if kind.name == 'basic':
|
||||||
return ("AUDIBILITY",)
|
return ('AUDIBILITY',)
|
||||||
if kind.name == "banana":
|
if kind.name == 'banana':
|
||||||
return ("COMP", "GATE")
|
return ('COMP', 'GATE')
|
||||||
if kind.name == "potato":
|
if kind.name == 'potato':
|
||||||
return ("COMP", "GATE", "DENOISER")
|
return ('COMP', 'GATE', 'DENOISER')
|
||||||
return ("BASS", "MID", "TREBLE")
|
return ('BASS', 'MID', 'TREBLE')
|
||||||
|
|
||||||
|
|
||||||
def get_full_slider_params(i, kind) -> Iterable:
|
def get_full_slider_params(i, kind) -> Iterable:
|
||||||
params = list(get_slider_params(i, kind) + ("GAIN", "LIMIT"))
|
params = list(get_slider_params(i, kind) + ('GAIN', 'LIMIT'))
|
||||||
if kind.name == "basic":
|
if kind.name == 'basic':
|
||||||
params.remove("LIMIT")
|
params.remove('LIMIT')
|
||||||
return params
|
return params
|
||||||
|
|
||||||
|
|
||||||
def get_slider_modes() -> Iterable:
|
def get_slider_modes() -> Iterable:
|
||||||
return (
|
return (
|
||||||
"GAIN MODE",
|
'GAIN MODE',
|
||||||
"BASS MODE",
|
'BASS MODE',
|
||||||
"MID MODE",
|
'MID MODE',
|
||||||
"TREBLE MODE",
|
'TREBLE MODE',
|
||||||
"AUDIBILITY MODE",
|
'AUDIBILITY MODE',
|
||||||
"COMP MODE",
|
'COMP MODE',
|
||||||
"GATE MODE",
|
'GATE MODE',
|
||||||
"DENOISER MODE",
|
'DENOISER MODE',
|
||||||
"LIMIT MODE",
|
'LIMIT MODE',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def _get_bus_assignments(kind) -> list:
|
def _get_bus_assignments(kind) -> list:
|
||||||
return [f"A{i}" for i in range(1, kind.phys_out + 1)] + [f"B{i}" for i in range(1, kind.virt_out + 1)]
|
return [f'A{i}' for i in range(1, kind.phys_out + 1)] + [f'B{i}' for i in range(1, kind.virt_out + 1)]
|
||||||
|
|
||||||
|
|
||||||
|
psg.theme_add_new(
|
||||||
|
'HighContrast',
|
||||||
|
{
|
||||||
|
'BACKGROUND': '#FFFFFF',
|
||||||
|
'TEXT': '#000000',
|
||||||
|
'INPUT': '#FAF9F6',
|
||||||
|
'TEXT_INPUT': '#000000',
|
||||||
|
'SCROLL': '#FAF9F6',
|
||||||
|
'BUTTON': ('#000000', '#FFFFFF'),
|
||||||
|
'PROGRESS': ('#000000', '#FFFFFF'),
|
||||||
|
'BORDER': 2,
|
||||||
|
'SLIDER_DEPTH': 3,
|
||||||
|
'PROGRESS_DEPTH': 0,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def get_themes_list() -> list:
|
def get_themes_list() -> list:
|
||||||
return [
|
return [
|
||||||
"Bright Colors",
|
'Bright Colors',
|
||||||
"Dark Blue 14",
|
'Dark Blue 14',
|
||||||
"Dark Brown 2",
|
'Dark Brown 2',
|
||||||
"Dark Brown 3",
|
'Dark Brown 3',
|
||||||
"Dark Green 2",
|
'Dark Green 2',
|
||||||
"Dark Grey 2",
|
'Dark Grey 2',
|
||||||
"Dark Teal1",
|
'Dark Teal1',
|
||||||
"Dark Teal6",
|
'Dark Teal6',
|
||||||
"Kayak",
|
'Kayak',
|
||||||
"Light Blue 2",
|
'Light Blue 2',
|
||||||
"Light Brown 2",
|
'Light Brown 2',
|
||||||
"Light Brown 5",
|
'Light Brown 5',
|
||||||
"Light Green",
|
'Light Green',
|
||||||
"Light Green 3",
|
'Light Green 3',
|
||||||
"Light Grey 2",
|
'Light Grey 2',
|
||||||
"Light Purple",
|
'Light Purple',
|
||||||
"Neutral Blue",
|
'Neutral Blue',
|
||||||
"Reds",
|
'Reds',
|
||||||
"Sandy Beach",
|
'Sandy Beach',
|
||||||
|
'High Contrast',
|
||||||
]
|
]
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user