Compare commits

..

No commits in common. "main" and "v1.9.2" have entirely different histories.
main ... v1.9.2

26 changed files with 544 additions and 1143 deletions

4
.gitignore vendored
View File

@ -132,8 +132,4 @@ dmypy.json
# Pyre type checker # Pyre type checker
.pyre/ .pyre/
# build
theme/
spec/
.vscode/ .vscode/

View File

@ -7,20 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
- [ ] - [ ] Add support for forest theme (if rbende adds it to pypi)
## [1.9.8] - 2025-01-22
### Changed
- vm-compact config dirs now override _internal/configs (if using build from releases). See [TOML Files](https://github.com/onyx-and-iris/voicemeeter-compact?tab=readme-ov-file#toml-files) section in README.
- after disconnecting from a vban connection, vban menus are re-enabled after 500ms.
## [1.9.5] - 2024-07-03
### Changed
- Launching the Voicemeeter Compact app will now launch the x64 bit Voicemeeter GUI (on 64 bit systems) for all kinds.
## [1.9.0] - 2023-07-10 ## [1.9.0] - 2023-07-10

View File

@ -1,7 +1,6 @@
[![PyPI version](https://badge.fury.io/py/voicemeeter-compact.svg)](https://badge.fury.io/py/voicemeeter-compact) [![PyPI version](https://badge.fury.io/py/voicemeeter-compact.svg)](https://badge.fury.io/py/voicemeeter-compact)
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/onyx-and-iris/voicemeeter-compact/blob/main/LICENSE) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/onyx-and-iris/voicemeeter-compact/blob/main/LICENSE)
[![Poetry](https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json)](https://python-poetry.org/) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
![OS: Windows](https://img.shields.io/badge/os-windows-red) ![OS: Windows](https://img.shields.io/badge/os-windows-red)
![Image of app/potato size comparison](./doc_imgs/potatocomparisonsmaller.png) ![Image of app/potato size comparison](./doc_imgs/potatocomparisonsmaller.png)
@ -31,13 +30,12 @@ Example `__main__.py` file:
```python ```python
import voicemeeterlib import voicemeeterlib
import vmcompact import vmcompact
def main(): def main():
# choose the kind of Voicemeeter (Local connection) # choose the kind of Voicemeeter (Local connection)
KIND_ID = 'banana' KIND_ID = "banana"
# pass the KIND_ID and the vm object to the app # pass the KIND_ID and the vm object to the app
with voicemeeterlib.api(KIND_ID) as vm: with voicemeeterlib.api(KIND_ID) as vm:
@ -45,7 +43,7 @@ def main():
app.mainloop() app.mainloop()
if __name__ == '__main__': if __name__ == "__main__":
main() main()
``` ```
@ -65,18 +63,15 @@ Set the kind of Voicemeeter, KIND_ID may be:
## TOML Files ## TOML Files
If you've downloaded the binary from [Releases][releases] you can find configs included in the `_internal/configs` directory. This is how your files should be organised. Wherever your `__main__.py` file is located (after install this can be any location), `configs` should be in the same location.
Directly inside of configs directory you may place an app.toml, vban.toml and a directory for each kind.
You may override these configs by placing a directory `vm-compact` in one of the following locations: Inside each kind directory you may place as many custom toml configurations as you wish.
- `user home directory / .config`
- `user home directory / Documents / Voicemeeter`
The contents should match the following directory structure:
. .
├── vm-compact ├── `__main__.py`
├── configs
        ├── app.toml         ├── app.toml
@ -114,7 +109,7 @@ Configure certain startup states for the app.
Configure a user config to load on app startup. Don't include the .toml extension in the config name. Configure a user config to load on app startup. Don't include the .toml extension in the config name.
- `theme` - `theme`
By default the app loads up the [Sun Valley light or dark theme][releases] by @rdbende. You have the option to load up the app without any theme loaded. Simply set `enabled` to false and `mode` will take no effect. By default the app loads up the [Sun Valley light or dark theme](https://github.com/rdbende/Sun-Valley-ttk-theme) by @rdbende. You have the option to load up the app without any theme loaded. Simply set `enabled` to false and `mode` will take no effect.
- `extends` - `extends`
Extending the app will show both strips and buses. In reduced mode only one or the other. This app will extend both horizontally and vertically, simply set `extends_horizontal` true or false accordingly. Extending the app will show both strips and buses. In reduced mode only one or the other. This app will extend both horizontally and vertically, simply set `extends_horizontal` true or false accordingly.
@ -154,7 +149,7 @@ port = 6990
Three example user configs are included with the package, one for each kind of Voicemeeter. Use these to configure parameter startup states. Any parameter supported by the underlying interfaces may be used. Check the 'multiple-parameters' section for more info: Three example user configs are included with the package, one for each kind of Voicemeeter. Use these to configure parameter startup states. Any parameter supported by the underlying interfaces may be used. Check the 'multiple-parameters' section for more info:
[Python Interface for the Voicemeeter API](https://github.com/onyx-and-iris/voicemeeter-api-python#multiple-parameters) [Python Interface for Voicemeeter API](https://github.com/onyx-and-iris/voicemeeter-api-python#multiple-parameters)
[Python Interface for VBAN CMD](https://github.com/onyx-and-iris/vban-cmd-python#multiple-parameters) [Python Interface for VBAN CMD](https://github.com/onyx-and-iris/vban-cmd-python#multiple-parameters)
@ -162,10 +157,6 @@ User configs may be loaded at any time via the menu.
## Special Thanks ## Special Thanks
[Vincent Burel](https://github.com/vburel2018) for creating Voicemeeter and its SDK. [Vincent Burel](https://github.com/vburel2018) for creating Voicemeeter, its SDK, the C Remote API, the RT Packet service and Streamer View app!
[Rdbende](https://github.com/rdbende) for creating the beautiful [Sun Valley theme][sv-theme]. [Rdbende](https://github.com/rdbende) for creating the beautiful Sun Valley Tkinter theme and adding it to Pypi!
[sv-theme]: https://github.com/rdbende/Sun-Valley-ttk-theme
[releases]: https://github.com/onyx-and-iris/voicemeeter-compact/releases

View File

@ -1,81 +0,0 @@
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
- echo "Release complete"
build:
desc: Build all artifacts
cmds:
- task: build-sunvalley
- echo "Sunvalley build complete"
- task: build-forest
- echo "Forest build complete"
build-sunvalley:
desc: Build Sunvalley artifacts
cmds:
- for:
matrix:
KIND: [basic, banana, potato]
cmd: poetry run pyinstaller --noconfirm --distpath dist/sunvalley-{{.ITEM.KIND}} spec/sunvalley-{{.ITEM.KIND}}.spec
build-forest:
desc: Build Forest artifacts
deps: [rewrite]
cmds:
- defer: { task: restore }
- for:
matrix:
KIND: [basic, banana, potato]
THEME: [light, dark]
cmd: poetry run pyinstaller --noconfirm --distpath dist/forest-{{.ITEM.KIND}}-{{.ITEM.THEME}} spec/forest-{{.ITEM.KIND}}-{{.ITEM.THEME}}.spec
rewrite:
internal: true
desc: Run the source code rewriter
cmds:
- poetry run python tools/rewriter.py --rewrite
restore:
internal: true
desc: Restore the backup files
cmds:
- poetry run python tools/rewriter.py --restore
compress:
deps: [compress-sunvalley, compress-forest]
compress-sunvalley:
cmds:
- for:
matrix:
KIND: [basic, banana, potato]
cmd: '{{.SHELL}} -Command "Compress-Archive -Path dist/sunvalley-{{.ITEM.KIND}} -DestinationPath dist/sunvalley-{{.ITEM.KIND}}.zip -Force"'
compress-forest:
cmds:
- for:
matrix:
KIND: [basic, banana, potato]
THEME: [light, dark]
cmd: '{{.SHELL}} -Command "Compress-Archive -Path dist/forest-{{.ITEM.KIND}}-{{.ITEM.THEME}} -DestinationPath dist/forest-{{.ITEM.KIND}}-{{.ITEM.THEME}}.zip -Force"'
clean:
desc: Clean up build and dist directories
cmds:
- |
{{.SHELL}} -Command "
Remove-Item -Path build/forest-*,build/sunvalley-*,dist/forest-*,dist/sunvalley-* -Recurse -Force"

View File

@ -4,12 +4,12 @@ import vmcompact
def main(): def main():
KIND_ID = 'banana' KIND_ID = "banana"
with voicemeeterlib.api(KIND_ID) as vmr: with voicemeeterlib.api(KIND_ID) as vmr:
app = vmcompact.connect(KIND_ID, vmr) app = vmcompact.connect(KIND_ID, vmr)
app.mainloop() app.mainloop()
if __name__ == '__main__': if __name__ == "__main__":
main() main()

332
poetry.lock generated
View File

@ -1,257 +1,169 @@
# This file is automatically @generated by Poetry 2.0.1 and should not be changed by hand. # This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand.
[[package]] [[package]]
name = "altgraph" name = "black"
version = "0.17.4" version = "22.12.0"
description = "Python graph (network) package" description = "The uncompromising code formatter."
optional = false
python-versions = "*"
groups = ["build"]
files = [
{file = "altgraph-0.17.4-py2.py3-none-any.whl", hash = "sha256:642743b4750de17e655e6711601b077bc6598dbfa3ba5fa2b2a35ce12b508dff"},
{file = "altgraph-0.17.4.tar.gz", hash = "sha256:1b5afbb98f6c4dcadb2e2ae6ab9fa994bbb8c1d75f4fa96d340f9437ae454406"},
]
[[package]]
name = "macholib"
version = "1.16.3"
description = "Mach-O header analysis and editing"
optional = false
python-versions = "*"
groups = ["build"]
markers = "sys_platform == \"darwin\""
files = [
{file = "macholib-1.16.3-py2.py3-none-any.whl", hash = "sha256:0e315d7583d38b8c77e815b1ecbdbf504a8258d8b3e17b61165c6feb60d18f2c"},
{file = "macholib-1.16.3.tar.gz", hash = "sha256:07ae9e15e8e4cd9a788013d81f5908b3609aa76f9b1421bae9c4d7606ec86a30"},
]
[package.dependencies]
altgraph = ">=0.17"
[[package]]
name = "packaging"
version = "24.2"
description = "Core utilities for Python packages"
optional = false
python-versions = ">=3.8"
groups = ["build"]
files = [
{file = "packaging-24.2-py3-none-any.whl", hash = "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759"},
{file = "packaging-24.2.tar.gz", hash = "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f"},
]
[[package]]
name = "pefile"
version = "2023.2.7"
description = "Python PE parsing module"
optional = false
python-versions = ">=3.6.0"
groups = ["build"]
markers = "sys_platform == \"win32\""
files = [
{file = "pefile-2023.2.7-py3-none-any.whl", hash = "sha256:da185cd2af68c08a6cd4481f7325ed600a88f6a813bad9dea07ab3ef73d8d8d6"},
{file = "pefile-2023.2.7.tar.gz", hash = "sha256:82e6114004b3d6911c77c3953e3838654b04511b8b66e8583db70c65998017dc"},
]
[[package]]
name = "pyinstaller"
version = "6.11.1"
description = "PyInstaller bundles a Python application and all its dependencies into a single package."
optional = false
python-versions = "<3.14,>=3.8"
groups = ["build"]
files = [
{file = "pyinstaller-6.11.1-py3-none-macosx_10_13_universal2.whl", hash = "sha256:44e36172de326af6d4e7663b12f71dbd34e2e3e02233e181e457394423daaf03"},
{file = "pyinstaller-6.11.1-py3-none-manylinux2014_aarch64.whl", hash = "sha256:6d12c45a29add78039066a53fb05967afaa09a672426072b13816fe7676abfc4"},
{file = "pyinstaller-6.11.1-py3-none-manylinux2014_i686.whl", hash = "sha256:ddc0fddd75f07f7e423da1f0822e389a42af011f9589e0269b87e0d89aa48c1f"},
{file = "pyinstaller-6.11.1-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:0d6475559c4939f0735122989611d7f739ed3bf02f666ce31022928f7a7e4fda"},
{file = "pyinstaller-6.11.1-py3-none-manylinux2014_s390x.whl", hash = "sha256:e21c7806e34f40181e7606926a14579f848bfb1dc52cbca7eea66eccccbfe977"},
{file = "pyinstaller-6.11.1-py3-none-manylinux2014_x86_64.whl", hash = "sha256:32c742a24fe65d0702958fadf4040f76de85859c26bec0008766e5dbabc5b68f"},
{file = "pyinstaller-6.11.1-py3-none-musllinux_1_1_aarch64.whl", hash = "sha256:208c0ef6dab0837a0a273ea32d1a3619a208e3d1fe3fec3785eea71a77fd00ce"},
{file = "pyinstaller-6.11.1-py3-none-musllinux_1_1_x86_64.whl", hash = "sha256:ad84abf465bcda363c1d54eafa76745d77b6a8a713778348377dc98d12a452f7"},
{file = "pyinstaller-6.11.1-py3-none-win32.whl", hash = "sha256:2e8365276c5131c9bef98e358fbc305e4022db8bedc9df479629d6414021956a"},
{file = "pyinstaller-6.11.1-py3-none-win_amd64.whl", hash = "sha256:7ac83c0dc0e04357dab98c487e74ad2adb30e7eb186b58157a8faf46f1fa796f"},
{file = "pyinstaller-6.11.1-py3-none-win_arm64.whl", hash = "sha256:35e6b8077d240600bb309ed68bb0b1453fd2b7ab740b66d000db7abae6244423"},
{file = "pyinstaller-6.11.1.tar.gz", hash = "sha256:491dfb4d9d5d1d9650d9507daec1ff6829527a254d8e396badd60a0affcb72ef"},
]
[package.dependencies]
altgraph = "*"
macholib = {version = ">=1.8", markers = "sys_platform == \"darwin\""}
packaging = ">=22.0"
pefile = {version = ">=2022.5.30,<2024.8.26 || >2024.8.26", markers = "sys_platform == \"win32\""}
pyinstaller-hooks-contrib = ">=2024.9"
pywin32-ctypes = {version = ">=0.2.1", markers = "sys_platform == \"win32\""}
setuptools = ">=42.0.0"
[package.extras]
completion = ["argcomplete"]
hook-testing = ["execnet (>=1.5.0)", "psutil", "pytest (>=2.7.3)"]
[[package]]
name = "pyinstaller-hooks-contrib"
version = "2024.11"
description = "Community maintained hooks for PyInstaller"
optional = false
python-versions = ">=3.8"
groups = ["build"]
files = [
{file = "pyinstaller_hooks_contrib-2024.11-py3-none-any.whl", hash = "sha256:2781d121a1ee961152ba7287a262c65a1078da30c9ef7621cb8c819326884fd5"},
{file = "pyinstaller_hooks_contrib-2024.11.tar.gz", hash = "sha256:84399af6b4b902030958063df25f657abbff249d0f329c5344928355c9833ab4"},
]
[package.dependencies]
packaging = ">=22.0"
setuptools = ">=42.0.0"
[[package]]
name = "pywin32-ctypes"
version = "0.2.3"
description = "A (partial) reimplementation of pywin32 using ctypes/cffi"
optional = false
python-versions = ">=3.6"
groups = ["build"]
markers = "sys_platform == \"win32\""
files = [
{file = "pywin32-ctypes-0.2.3.tar.gz", hash = "sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755"},
{file = "pywin32_ctypes-0.2.3-py3-none-any.whl", hash = "sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8"},
]
[[package]]
name = "ruff"
version = "0.9.1"
description = "An extremely fast Python linter and code formatter, written in Rust."
optional = false optional = false
python-versions = ">=3.7" python-versions = ">=3.7"
groups = ["dev"]
files = [ files = [
{file = "ruff-0.9.1-py3-none-linux_armv6l.whl", hash = "sha256:84330dda7abcc270e6055551aca93fdde1b0685fc4fd358f26410f9349cf1743"}, {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
{file = "ruff-0.9.1-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:3cae39ba5d137054b0e5b472aee3b78a7c884e61591b100aeb544bcd1fc38d4f"}, {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
{file = "ruff-0.9.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:50c647ff96f4ba288db0ad87048257753733763b409b2faf2ea78b45c8bb7fcb"}, {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
{file = "ruff-0.9.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f0c8b149e9c7353cace7d698e1656ffcf1e36e50f8ea3b5d5f7f87ff9986a7ca"}, {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
{file = "ruff-0.9.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:beb3298604540c884d8b282fe7625651378e1986c25df51dec5b2f60cafc31ce"}, {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
{file = "ruff-0.9.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:39d0174ccc45c439093971cc06ed3ac4dc545f5e8bdacf9f067adf879544d969"}, {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
{file = "ruff-0.9.1-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:69572926c0f0c9912288915214ca9b2809525ea263603370b9e00bed2ba56dbd"}, {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
{file = "ruff-0.9.1-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:937267afce0c9170d6d29f01fcd1f4378172dec6760a9f4dface48cdabf9610a"}, {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
{file = "ruff-0.9.1-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:186c2313de946f2c22bdf5954b8dd083e124bcfb685732cfb0beae0c47233d9b"}, {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
{file = "ruff-0.9.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f94942a3bb767675d9a051867c036655fe9f6c8a491539156a6f7e6b5f31831"}, {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"},
{file = "ruff-0.9.1-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:728d791b769cc28c05f12c280f99e8896932e9833fef1dd8756a6af2261fd1ab"}, {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
{file = "ruff-0.9.1-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:2f312c86fb40c5c02b44a29a750ee3b21002bd813b5233facdaf63a51d9a85e1"}, {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
{file = "ruff-0.9.1-py3-none-musllinux_1_2_i686.whl", hash = "sha256:ae017c3a29bee341ba584f3823f805abbe5fe9cd97f87ed07ecbf533c4c88366"}, ]
{file = "ruff-0.9.1-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:5dc40a378a0e21b4cfe2b8a0f1812a6572fc7b230ef12cd9fac9161aa91d807f"},
{file = "ruff-0.9.1-py3-none-win32.whl", hash = "sha256:46ebf5cc106cf7e7378ca3c28ce4293b61b449cd121b98699be727d40b79ba72"}, [package.dependencies]
{file = "ruff-0.9.1-py3-none-win_amd64.whl", hash = "sha256:342a824b46ddbcdddd3abfbb332fa7fcaac5488bf18073e841236aadf4ad5c19"}, click = ">=8.0.0"
{file = "ruff-0.9.1-py3-none-win_arm64.whl", hash = "sha256:1cd76c7f9c679e6e8f2af8f778367dca82b95009bc7b1a85a47f1521ae524fa7"}, mypy-extensions = ">=0.4.3"
{file = "ruff-0.9.1.tar.gz", hash = "sha256:fd2b25ecaf907d6458fa842675382c8597b3c746a2dde6717fe3415425df0c17"}, pathspec = ">=0.9.0"
platformdirs = ">=2"
tomli = {version = ">=1.1.0", markers = "python_full_version < \"3.11.0a7\""}
[package.extras]
colorama = ["colorama (>=0.4.3)"]
d = ["aiohttp (>=3.7.4)"]
jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
uvloop = ["uvloop (>=0.15.2)"]
[[package]]
name = "click"
version = "8.1.4"
description = "Composable command line interface toolkit"
optional = false
python-versions = ">=3.7"
files = [
{file = "click-8.1.4-py3-none-any.whl", hash = "sha256:2739815aaa5d2c986a88f1e9230c55e17f0caad3d958a5e13ad0797c166db9e3"},
{file = "click-8.1.4.tar.gz", hash = "sha256:b97d0c74955da062a7d4ef92fadb583806a585b2ea81958a81bd72726cbb8e37"},
]
[package.dependencies]
colorama = {version = "*", markers = "platform_system == \"Windows\""}
[[package]]
name = "colorama"
version = "0.4.6"
description = "Cross-platform colored terminal text."
optional = false
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
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 = "setuptools" name = "isort"
version = "75.8.0" version = "5.12.0"
description = "Easily download, build, install, upgrade, and uninstall Python packages" description = "A Python utility / library to sort Python imports."
optional = false optional = false
python-versions = ">=3.9" python-versions = ">=3.8.0"
groups = ["build"]
files = [ files = [
{file = "setuptools-75.8.0-py3-none-any.whl", hash = "sha256:e3982f444617239225d675215d51f6ba05f845d4eec313da4418fdbb56fb27e3"}, {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"},
{file = "setuptools-75.8.0.tar.gz", hash = "sha256:c5afc8f407c626b8313a86e10311dd3f661c6cd9c09d4bf8c15c0e11f9f2b0e6"}, {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"},
] ]
[package.extras] [package.extras]
check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)", "ruff (>=0.8.0)"] colors = ["colorama (>=0.4.3)"]
core = ["importlib_metadata (>=6)", "jaraco.collections", "jaraco.functools (>=4)", "jaraco.text (>=3.7)", "more_itertools", "more_itertools (>=8.8)", "packaging", "packaging (>=24.2)", "platformdirs (>=4.2.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"] pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"]
cover = ["pytest-cov"] plugins = ["setuptools"]
doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"] requirements-deprecated-finder = ["pip-api", "pipreqs"]
enabler = ["pytest-enabler (>=2.2)"]
test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.7.2)", "jaraco.test (>=5.5)", "packaging (>=24.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"] [[package]]
type = ["importlib_metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.14.*)", "pytest-mypy"] name = "mypy-extensions"
version = "1.0.0"
description = "Type system extensions for programs checked with the mypy type checker."
optional = false
python-versions = ">=3.5"
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]]
name = "pathspec"
version = "0.11.1"
description = "Utility library for gitignore style pattern matching of file paths."
optional = false
python-versions = ">=3.7"
files = [
{file = "pathspec-0.11.1-py3-none-any.whl", hash = "sha256:d8af70af76652554bd134c22b3e8a1cc46ed7d91edcdd721ef1a0c51a84a5293"},
{file = "pathspec-0.11.1.tar.gz", hash = "sha256:2798de800fa92780e33acca925945e9a19a133b715067cf165b8866c15a31687"},
]
[[package]]
name = "platformdirs"
version = "3.8.1"
description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
optional = false
python-versions = ">=3.7"
files = [
{file = "platformdirs-3.8.1-py3-none-any.whl", hash = "sha256:cec7b889196b9144d088e4c57d9ceef7374f6c39694ad1577a0aab50d27ea28c"},
{file = "platformdirs-3.8.1.tar.gz", hash = "sha256:f87ca4fcff7d2b0f81c6a748a77973d7af0f4d526f98f308477c3c436c74d528"},
]
[package.extras]
docs = ["furo (>=2023.5.20)", "proselint (>=0.13)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"]
test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)"]
[[package]] [[package]]
name = "sv-ttk" name = "sv-ttk"
version = "2.6.0" version = "2.5.5"
description = "A gorgeous theme for Tkinter, based on Windows 11's UI" description = "A gorgeous theme for Tkinter, based on Windows 11's UI"
optional = false optional = false
python-versions = ">=3.8" python-versions = ">=3.7"
groups = ["main"]
files = [ files = [
{file = "sv_ttk-2.6.0-py3-none-any.whl", hash = "sha256:4319c52edf2e14732fe84bdc9788e26f9e9a1ad79451ec0f89f0120ffc8105d9"}, {file = "sv_ttk-2.5.5-py3-none-any.whl", hash = "sha256:49d1cd03c032728c183d1fe2318f88cdb658ef3e87157e1ca3fcf6661054965b"},
{file = "sv_ttk-2.6.0.tar.gz", hash = "sha256:3fd440396c95e30e88f686fcf28be425480f7320d6bf346f9cea5d6f56702cc2"}, {file = "sv_ttk-2.5.5.tar.gz", hash = "sha256:9bbfe2aba6cc6f9fdf70d79331046543c9666fcccc78bad5ff648a9987e3cedb"},
] ]
[[package]] [[package]]
name = "tomli" name = "tomli"
version = "2.2.1" version = "2.0.1"
description = "A lil' TOML parser" description = "A lil' TOML parser"
optional = false optional = false
python-versions = ">=3.8" python-versions = ">=3.7"
groups = ["main"]
markers = "python_version < \"3.11\""
files = [ files = [
{file = "tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249"}, {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
{file = "tomli-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6"}, {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
{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 = "vban-cmd" name = "vban-cmd"
version = "2.5.0" version = "2.4.4"
description = "Python interface for the VBAN RT Packet Service (Sendtext)" description = "Python interface for the VBAN RT Packet Service (Sendtext)"
optional = false optional = false
python-versions = ">=3.10" python-versions = ">=3.10,<4.0"
groups = ["main"]
files = [ files = [
{file = "vban_cmd-2.5.0-py3-none-any.whl", hash = "sha256:22a19037066487d464a61941a3b85a0331b498a9efb1bcacdc932e9d06c5bf87"}, {file = "vban_cmd-2.4.4-py3-none-any.whl", hash = "sha256:f439219a2dc6a45123bb70fc94d2aabfc643f26dffc9206da2228e2520f83e01"},
{file = "vban_cmd-2.5.0.tar.gz", hash = "sha256:691a852e5052e50103839b06a0a9d0746b90df3346545c2cf4f10b099d9666e4"}, {file = "vban_cmd-2.4.4.tar.gz", hash = "sha256:31dbf6abb681d57772c9082722b024d0798eff99b4c622bfbb539179852a935d"},
] ]
[package.dependencies] [package.dependencies]
tomli = {version = ">=2.0.1,<3.0", markers = "python_version < \"3.11\""} tomli = {version = ">=2.0.1,<3.0.0", markers = "python_version < \"3.11\""}
[[package]] [[package]]
name = "voicemeeter-api" name = "voicemeeter-api"
version = "2.6.1" version = "2.4.4"
description = "A Python wrapper for the Voiceemeter API" description = "A Python wrapper for the Voiceemeter API"
optional = false optional = false
python-versions = "<4.0,>=3.10" python-versions = ">=3.10,<4.0"
groups = ["main"]
files = [ files = [
{file = "voicemeeter_api-2.6.1-py3-none-any.whl", hash = "sha256:8ae3bce0f9ad6bbad78f2f69f522b6fb2e229d314918a075ad83d4009aff7020"}, {file = "voicemeeter_api-2.4.4-py3-none-any.whl", hash = "sha256:2e2f0b475de7cfc0d1c397838498162f0b405ab82a6f6ca0095434b43385b43e"},
{file = "voicemeeter_api-2.6.1.tar.gz", hash = "sha256:34d8672603ec66197f2d61fd8f038f46d8451759c81fbe222b00e7d3ccccd1f5"}, {file = "voicemeeter_api-2.4.4.tar.gz", hash = "sha256:a4f8ecaa7f5d6b9e9a8545dcf047754711af9a120628b3a98821466c7d65c1e7"},
] ]
[package.dependencies] [package.dependencies]
tomli = {version = ">=2.0.1,<3.0", markers = "python_version < \"3.11\""} tomli = {version = ">=2.0.1,<3.0.0", markers = "python_version < \"3.11\""}
[metadata] [metadata]
lock-version = "2.1" lock-version = "2.0"
python-versions = ">=3.10,<3.14" python-versions = "^3.10"
content-hash = "19c384acd36868a5bfdc3f3173f444858136603694c3f1134c0d30cd17157651" content-hash = "cde74de8c9de0895555068efea354edf6b51f2332c253f02f6c8f26fe6b4e795"

View File

@ -1,131 +1,26 @@
[project]
name = "voicemeeter-compact"
version = "1.9.8"
description = "A Compact Voicemeeter Remote App"
authors = [
{name = "Onyx and Iris",email = "code@onyxandiris.online"}
]
license = {text = "MIT"}
readme = "README.md"
requires-python = ">=3.10,<3.14"
dependencies = [
"voicemeeter-api (>=2.6.1,<3.0.0)",
"vban-cmd (>=2.5.0,<3.0.0)",
"sv-ttk (>=2.6.0,<3.0.0)",
"tomli (>=2.0.1,<3.0) ; python_version < '3.11'",
]
[project.scripts]
gui-basic-compact = "vmcompact.gui.basic:run"
gui-banana-compact = "vmcompact.gui.banana:run"
gui-potato-compact = "vmcompact.gui.potato:run"
[tool.poetry] [tool.poetry]
name = "voicemeeter-compact"
version = "1.9.2"
description = "A Compact Voicemeeter Remote App"
authors = ["onyx-and-iris <code@onyxandiris.online>"]
license = "MIT"
readme = "README.md"
repository = "https://github.com/onyx-and-iris/voicemeeter-compact"
packages = [{ include = "vmcompact" }] packages = [{ include = "vmcompact" }]
include = ["vmcompact/img/cat.ico"] include = ["vmcompact/img/cat.ico"]
[tool.poetry.requires-plugins] [tool.poetry.dependencies]
poethepoet = "^0.32.1" python = "^3.10"
sv-ttk = "^2.5.5"
tomli = { version = "^2.0.1", python = "<3.11" }
voicemeeter-api = "^2.4.4"
vban-cmd = "^2.4.4"
[tool.poetry.group.dev.dependencies] [tool.poetry.dev-dependencies]
ruff = "^0.9.1" black = { version = "^22.6.0", allow-prereleases = true }
isort = "^5.12.0"
[tool.poetry.group.build.dependencies]
pyinstaller = "^6.11.1"
[build-system] [build-system]
requires = ["poetry-core>=2.0.0,<3.0.0"] requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api" build-backend = "poetry.core.masonry.api"
[tool.poe.tasks]
build-sunvalley = "task build-sunvalley"
build-forest = "task build-forest"
release = [
{ ref = "build-sunvalley" },
{ ref = "build-forest" },
{ cmd = "task compress-sunvalley" },
{ cmd = "task compress-forest" },
]
[tool.ruff]
exclude = [
".bzr",
".direnv",
".eggs",
".git",
".git-rewrite",
".hg",
".mypy_cache",
".nox",
".pants.d",
".pytype",
".ruff_cache",
".svn",
".tox",
".venv",
"__pypackages__",
"_build",
"buck-out",
"build",
"dist",
"node_modules",
"venv",
]
# Same as Black.
line-length = 88
indent-width = 4
# Assume Python 3.10
target-version = "py310"
[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
[tool.ruff.lint.per-file-ignores]
"__init__.py" = [
"E402",
"F401",
]

View File

@ -1,250 +0,0 @@
import argparse
import logging
from pathlib import Path
logging.basicConfig(level=logging.DEBUG)
logger = logging.getLogger('vm-compact-rewriter')
PACKAGE_DIR = Path(__file__).parent.parent / 'vmcompact'
SRC_DIR = Path(__file__).parent / 'src'
def write_outs(output, outs: tuple):
for out in outs:
output.write(out)
def rewrite_app():
app_logger = logger.getChild('app')
app_logger.info('rewriting app.py')
infile = Path(SRC_DIR) / 'app.bk'
outfile = Path(PACKAGE_DIR) / 'app.py'
with open(infile, 'r') as input:
with open(outfile, 'w') as output:
for line in input:
match line:
# App init()
case ' def __init__(self, vmr):\n':
output.write(' def __init__(self, vmr, theme):\n')
case ' self._vmr = vmr\n':
write_outs(
output,
(
' self._vmr = vmr\n',
' self._theme = theme\n',
' tcldir = Path.cwd() / "theme"\n',
' if not tcldir.is_dir():\n',
' tcldir = Path.cwd() / "_internal" / "theme"\n',
' self.tk.call("source", tcldir.resolve() / f"forest-{self._theme}.tcl")\n',
),
)
# def connect()
case 'def connect(kind_id: str, vmr) -> App:\n':
output.write(
'def connect(kind_id: str, vmr, theme="light") -> App:\n'
)
case ' return VMMIN_cls(vmr)\n':
output.write(' return VMMIN_cls(vmr, theme)\n')
case _:
output.write(line)
def rewrite_builders():
builders_logger = logger.getChild('builders')
builders_logger.info('rewriting builders.py')
infile = Path(SRC_DIR) / 'builders.bk'
outfile = Path(PACKAGE_DIR) / 'builders.py'
with open(infile, 'r') as input:
with open(outfile, 'w') as output:
ignore_next_lines = 0
for line in input:
if ignore_next_lines > 0:
builders_logger.info(f'ignoring: {line}')
ignore_next_lines -= 1
continue
match line:
# loading themes
case 'import sv_ttk\n':
output.write('#import sv_ttk\n')
case ' self.app.resizable(False, False)\n':
write_outs(
output,
(
' self.app.resizable(False, False)\n'
' if _configuration.themes_enabled:\n',
' ttk.Style().theme_use(f"forest-{self.app._theme}")\n',
' self.logger.info(f"Forest Theme applied")\n',
),
)
ignore_next_lines = 6
# setting navframe button widths
case ' variable=self.navframe.submix,\n':
write_outs(
output,
(
' variable=self.navframe.submix,\n'
' width=8,\n',
),
)
case ' variable=self.navframe.channel,\n':
write_outs(
output,
(
' variable=self.navframe.channel,\n'
' width=8,\n',
),
)
case ' variable=self.navframe.extend,\n':
write_outs(
output,
(
' variable=self.navframe.extend,\n'
' width=8,\n',
),
)
case ' variable=self.navframe.info,\n':
write_outs(
output,
(
' variable=self.navframe.info,\n'
' width=8,\n',
),
)
# set channelframe button widths
case ' variable=self.labelframe.mute,\n':
write_outs(
output,
(
' variable=self.labelframe.mute,\n'
' width=7,\n',
),
)
case ' variable=self.labelframe.conf,\n':
write_outs(
output,
(
' variable=self.labelframe.conf,\n'
' width=7,\n',
),
)
case ' variable=self.labelframe.on,\n':
write_outs(
output,
(
' variable=self.labelframe.on,\n'
' width=7,\n',
),
)
# set stripconfigframe button widths
case ' self.configframe.phys_out_params.index(param)\n':
write_outs(
output,
(
' self.configframe.phys_out_params.index(param)\n',
' ],\n',
' width=6,\n',
),
)
ignore_next_lines = 1
case ' self.configframe.virt_out_params.index(param)\n':
write_outs(
output,
(
' self.configframe.virt_out_params.index(param)\n',
' ],\n',
' width=6,\n',
),
)
ignore_next_lines = 1
# This does both strip and bus param vars buttons
case ' variable=self.configframe.param_vars[i],\n':
write_outs(
output,
(
' variable=self.configframe.param_vars[i],\n',
' width=6,\n',
),
)
case _:
if 'Toggle.TButton' in line:
output.write(line.replace('Toggle.TButton', 'ToggleButton'))
else:
output.write(line)
def rewrite_menu():
menu_logger = logger.getChild('menu')
menu_logger.info('rewriting menu.py')
infile = Path(SRC_DIR) / 'menu.bk'
outfile = Path(PACKAGE_DIR) / 'menu.py'
with open(infile, 'r') as input:
with open(outfile, 'w') as output:
ignore_next_lines = 0
for line in input:
if ignore_next_lines > 0:
menu_logger.info(f'ignoring: {line}')
ignore_next_lines -= 1
continue
match line:
case 'import sv_ttk\n':
output.write('#import sv_ttk\n')
case ' # layout/themes\n':
ignore_next_lines = 14
case _:
output.write(line)
def prepare_for_build():
################# MOVE FILES FROM PACKAGE DIR INTO SRC DIR #########################
for file in (
PACKAGE_DIR / 'app.py',
PACKAGE_DIR / 'builders.py',
PACKAGE_DIR / 'menu.py',
):
if file.exists():
logger.debug(f'moving {str(file)}')
file.rename(SRC_DIR / f'{file.stem}.bk')
###################### RUN THE FILE REWRITER FOR EACH *.BK #########################
steps = (
rewrite_app,
rewrite_builders,
rewrite_menu,
)
[step() for step in steps]
def cleanup():
########################## RESTORE *.BK FILES #####################################
for file in (
PACKAGE_DIR / 'app.py',
PACKAGE_DIR / 'builders.py',
PACKAGE_DIR / 'menu.py',
):
file.unlink()
for file in (
SRC_DIR / 'app.bk',
SRC_DIR / 'builders.bk',
SRC_DIR / 'menu.bk',
):
file.rename(PACKAGE_DIR / f'{file.stem}.py')
if __name__ == '__main__':
parser = argparse.ArgumentParser()
parser.add_argument('--rewrite', action='store_true')
parser.add_argument('--restore', action='store_true')
args = parser.parse_args()
if args.rewrite:
logger.info('preparing files for build')
prepare_for_build()
elif args.restore:
logger.info('cleaning up files')
cleanup()

View File

View File

@ -1,3 +1,3 @@
from .app import connect from .app import connect
__ALL__ = ['connect'] __ALL__ = ["connect"]

View File

@ -29,10 +29,10 @@ class App(tk.Tk):
""" """
APP_cls = type( APP_cls = type(
f'Voicemeeter{kind}.Compact', f"Voicemeeter{kind}.Compact",
(cls,), (cls,),
{ {
'kind': kind, "kind": kind,
}, },
) )
return APP_cls return APP_cls
@ -41,34 +41,30 @@ class App(tk.Tk):
super().__init__() super().__init__()
self.logger = logger.getChild(self.__class__.__name__) self.logger = logger.getChild(self.__class__.__name__)
self._vmr = vmr self._vmr = vmr
self._vmr.event.add(['pdirty', 'ldirty']) self._vmr.event.add(["pdirty", "ldirty"])
self.subject = Subject() self.after(12000 if self._vmr.gui.launched_by_api else 1, self.start_updates)
self.start_updates()
self._vmr.init_thread() self._vmr.init_thread()
for pn in ( icon_path = Path(__file__).parent.resolve() / "img" / "cat.ico"
Path(__file__).parent.resolve() / 'img' / 'cat.ico', if icon_path.is_file():
Path.cwd() / '_internal' / 'img' / 'cat.ico', self.iconbitmap(str(icon_path))
):
if pn.is_file():
self.iconbitmap(str(pn))
break
self.minsize(275, False) self.minsize(275, False)
self.subject = Subject()
self._configs = None self._configs = None
self.protocol('WM_DELETE_WINDOW', self.on_close_window) self.protocol("WM_DELETE_WINDOW", self.on_close_window)
self.menu = self['menu'] = Menus(self, vmr) self.menu = self["menu"] = Menus(self, vmr)
self.styletable = ttk.Style() self.styletable = ttk.Style()
if _configuration.config: if _configuration.config:
vmr.apply_config(_configuration.config) vmr.apply_config(_configuration.config)
self.build_app() self.build_app()
self.drag_id = '' self.drag_id = ""
self.bind('<Configure>', self.dragging) self.bind("<Configure>", self.dragging)
self.after(1, self.healthcheck_step) self.after(1, self.healthcheck_step)
def __str__(self): def __str__(self):
return f'{type(self).__name__}App' return f"{type(self).__name__}App"
@property @property
def target(self): def target(self):
@ -84,8 +80,8 @@ class App(tk.Tk):
frame frame
for frame in self.winfo_children() for frame in self.winfo_children()
if isinstance(frame, ttk.Frame) if isinstance(frame, ttk.Frame)
and '!stripconfig' in str(frame) and "!stripconfig" in str(frame)
or '!busconfig' in str(frame) or "!busconfig" in str(frame)
) )
def build_app(self, kind=None, vban=None): def build_app(self, kind=None, vban=None):
@ -101,22 +97,22 @@ class App(tk.Tk):
self.submix_frame = None self.submix_frame = None
self.builder = MainFrameBuilder(self) self.builder = MainFrameBuilder(self)
self.builder.setup() self.builder.setup()
self.builder.create_channelframe('strip') self.builder.create_channelframe("strip")
self.builder.create_separator() self.builder.create_separator()
self.builder.create_navframe() self.builder.create_navframe()
if _configuration.extended: if _configuration.extended:
self.nav_frame.extend.set(True) self.nav_frame.extend.set(True)
self.nav_frame.extend_frame() self.nav_frame.extend_frame()
if self.kind.name == 'potato': if self.kind.name == "potato":
self.builder.create_banner() self.builder.create_banner()
def on_pdirty(self): def on_pdirty(self):
if _base_values.run_update: if _base_values.run_update:
self.after(1, self.subject.notify, 'pdirty') self.after(1, self.subject.notify, "pdirty")
def on_ldirty(self): def on_ldirty(self):
if not _base_values.dragging: if not _base_values.dragging:
self.after(1, self.subject.notify, 'ldirty') self.after(1, self.subject.notify, "ldirty")
def _destroy_top_level_frames(self): def _destroy_top_level_frames(self):
""" """
@ -136,14 +132,14 @@ class App(tk.Tk):
def dragging(self, event, *args): def dragging(self, event, *args):
if event.widget is self: if event.widget is self:
if self.drag_id == '': if self.drag_id == "":
_base_values.dragging = True _base_values.dragging = True
else: else:
self.after_cancel(self.drag_id) self.after_cancel(self.drag_id)
self.drag_id = self.after(100, self.stop_drag) self.drag_id = self.after(100, self.stop_drag)
def stop_drag(self): def stop_drag(self):
self.drag_id = '' self.drag_id = ""
_base_values.dragging = False _base_values.dragging = False
@cached_property @cached_property
@ -152,25 +148,20 @@ class App(tk.Tk):
return self._configs return self._configs
def start_updates(self): def start_updates(self):
def init(): self.logger.debug("updates started")
self.logger.debug('updates started') _base_values.run_update = True
_base_values.run_update = True
if self._vmr.gui.launched_by_api: if self._vmr.gui.launched_by_api:
self.subject.notify('pdirty') self.on_pdirty()
self.after(12000, init)
else:
init()
def healthcheck_step(self): def healthcheck_step(self):
if not _base_values.vban_connected: if not _base_values.vban_connected:
try: try:
self._vmr.version self._vmr.version
except voicemeeterlib.error.CAPIError: except voicemeeterlib.error.CAPIError:
resp = messagebox.askyesno(message='Restart Voicemeeter GUI?') resp = messagebox.askyesno(message="Restart Voicemeeter GUI?")
if resp: if resp:
self.logger.debug( self.logger.debug(
'healthcheck failed, rebuilding the app after GUI restart.' "healthcheck failed, rebuilding the app after GUI restart."
) )
self._vmr.end_thread() self._vmr.end_thread()
self._vmr.run_voicemeeter(self._vmr.kind.name) self._vmr.run_voicemeeter(self._vmr.kind.name)
@ -179,13 +170,13 @@ class App(tk.Tk):
self.after(8000, self.start_updates) self.after(8000, self.start_updates)
self._destroy_top_level_frames() self._destroy_top_level_frames()
self.build_app(self._vmr.kind) self.build_app(self._vmr.kind)
vban_config = get_configuration('vban') vban_config = get_configuration("vban")
for i, _ in enumerate(vban_config): for i, _ in enumerate(vban_config):
target = getattr(self.menu, f'menu_vban_{i + 1}') target = getattr(self.menu, f"menu_vban_{i+1}")
target.entryconfig(0, state='normal') target.entryconfig(0, state="normal")
target.entryconfig(1, state='disabled') target.entryconfig(1, state="disabled")
[ [
self.menu.menu_vban.entryconfig(j, state='normal') self.menu.menu_vban.entryconfig(j, state="normal")
for j, _ in enumerate(self.menu.menu_vban.winfo_children()) for j, _ in enumerate(self.menu.menu_vban.winfo_children())
] ]
else: else:
@ -207,5 +198,5 @@ def connect(kind_id: str, vmr) -> App:
try: try:
VMMIN_cls = _apps[kind_id] VMMIN_cls = _apps[kind_id]
except KeyError: except KeyError:
raise VMCompactError(f'Invalid kind: {kind_id}') raise VMCompactError(f"Invalid kind: {kind_id}")
return VMMIN_cls(vmr) return VMMIN_cls(vmr)

View File

@ -17,7 +17,7 @@ class Banner(ttk.Frame):
self.label = ttk.Label( self.label = ttk.Label(
self, self,
text=f'SUBMIX: {self.submix.get().upper()}', text=f"SUBMIX: {self.submix.get().upper()}",
) )
self.label.grid(column=0, row=0, sticky=(tk.N, tk.S, tk.W, tk.E)) self.label.grid(column=0, row=0, sticky=(tk.N, tk.S, tk.W, tk.E))
@ -28,8 +28,8 @@ class Banner(ttk.Frame):
return self.parent.target return self.parent.target
def on_update(self, subject): def on_update(self, subject):
if subject == 'submix': if subject == "submix":
if not _base_values.dragging: if not _base_values.dragging:
self.logger.debug('checking submix for banner') self.logger.debug("checking submix for banner")
self.submix.set(self.target.bus[_configuration.submixes].label) self.submix.set(self.target.bus[_configuration.submixes].label)
self.label['text'] = f'SUBMIX: {self.submix.get().upper()}' self.label["text"] = f"SUBMIX: {self.submix.get().upper()}"

View File

@ -41,31 +41,31 @@ class MainFrameBuilder(AbstractBuilder):
) )
self.app.resizable(False, False) self.app.resizable(False, False)
if _configuration.themes_enabled: if _configuration.themes_enabled:
if sv_ttk.get_theme() not in ('light', 'dark'): if sv_ttk.get_theme() not in ("light", "dark"):
sv_ttk.set_theme(_configuration.theme_mode) sv_ttk.set_theme(_configuration.theme_mode)
self.logger.info( self.logger.info(
f'Sunvalley {sv_ttk.get_theme().capitalize()} Theme applied' f"Sunvalley {sv_ttk.get_theme().capitalize()} Theme applied"
) )
def create_channelframe(self, type_): def create_channelframe(self, type_):
if type_ == 'strip': if type_ == "strip":
self.app.strip_frame = _make_channelframe(self.app, type_) self.app.strip_frame = _make_channelframe(self.app, type_)
else: else:
self.app.bus_frame = _make_channelframe(self.app, type_) self.app.bus_frame = _make_channelframe(self.app, type_)
self.logger.info(f'Finished building channelframe type {type_}') self.logger.info(f"Finished building channelframe type {type_}")
def create_separator(self): def create_separator(self):
self.app.sep = ttk.Separator(self.app, orient='vertical') self.app.sep = ttk.Separator(self.app, orient="vertical")
self.app.sep.grid(row=0, column=1, sticky=(tk.N, tk.S)) self.app.sep.grid(row=0, column=1, sticky=(tk.N, tk.S))
self.app.columnconfigure(1, minsize=15) self.app.columnconfigure(1, minsize=15)
self.logger.info('Finished building separator') self.logger.info(f"Finished building separator")
def create_navframe(self): def create_navframe(self):
self.app.nav_frame = Navigation(self.app) self.app.nav_frame = Navigation(self.app)
self.logger.info('Finished building navframe') self.logger.info(f"Finished building navframe")
def create_configframe(self, type_, index, id): def create_configframe(self, type_, index, id):
if type_ == 'strip': if type_ == "strip":
self.app.config_frame = StripConfig(self.app, index, id) self.app.config_frame = StripConfig(self.app, index, id)
if self.app.strip_frame: if self.app.strip_frame:
[ [
@ -95,20 +95,20 @@ class MainFrameBuilder(AbstractBuilder):
if self.app.strip_frame: if self.app.strip_frame:
[ [
frame.styletable.configure( frame.styletable.configure(
f'{frame.identifier}Conf{frame.index}.TButton', f"{frame.identifier}Conf{frame.index}.TButton",
background=f'{"white" if not frame.conf.get() else "yellow"}', background=f"{'white' if not frame.conf.get() else 'yellow'}",
) )
for _, frame in enumerate(self.app.strip_frame.labelframes) for _, frame in enumerate(self.app.strip_frame.labelframes)
] ]
if self.app.bus_frame: if self.app.bus_frame:
[ [
frame.styletable.configure( frame.styletable.configure(
f'{frame.identifier}Conf{frame.index}.TButton', f"{frame.identifier}Conf{frame.index}.TButton",
background=f'{"white" if not frame.conf.get() else "yellow"}', background=f"{'white' if not frame.conf.get() else 'yellow'}",
) )
for _, frame in enumerate(self.app.bus_frame.labelframes) for _, frame in enumerate(self.app.bus_frame.labelframes)
] ]
self.logger.info(f'Finished building configframe for {type_}[{index}]') self.logger.info(f"Finished building configframe for {type_}[{index}]")
self.app.after(5, self.reset_config_frames) self.app.after(5, self.reset_config_frames)
def reset_config_frames(self): def reset_config_frames(self):
@ -121,7 +121,7 @@ class MainFrameBuilder(AbstractBuilder):
def create_banner(self): def create_banner(self):
self.app.banner = Banner(self.app) self.app.banner = Banner(self.app)
self.app.banner.grid(row=4, column=0, columnspan=3) self.app.banner.grid(row=4, column=0, columnspan=3)
self.logger.info('Finished building banner') self.logger.info(f"Finished building banner")
def teardown(self): def teardown(self):
pass pass
@ -140,31 +140,31 @@ class NavigationFrameBuilder(AbstractBuilder):
self.navframe.info = tk.BooleanVar() self.navframe.info = tk.BooleanVar()
self.navframe.channel_text = tk.StringVar( self.navframe.channel_text = tk.StringVar(
value=f'{self.navframe.parent.strip_frame.identifier.upper()}' value=f"{self.navframe.parent.strip_frame.identifier.upper()}"
) )
self.navframe.extend_text = tk.StringVar( self.navframe.extend_text = tk.StringVar(
value=f'{"REDUCE" if self.navframe.extend.get() else "EXTEND"}' value=f"{'REDUCE' if self.navframe.extend.get() else 'EXTEND'}"
) )
self.navframe.info_text = tk.StringVar() self.navframe.info_text = tk.StringVar()
def create_submix_button(self): def create_submix_button(self):
self.navframe.submix_button = ttk.Checkbutton( self.navframe.submix_button = ttk.Checkbutton(
self.navframe, self.navframe,
text='SUBMIX', text="SUBMIX",
command=self.navframe.show_submix, command=self.navframe.show_submix,
style=f'{"Toggle.TButton" if _configuration.themes_enabled else "Submix.TButton"}', style=f"{'Toggle.TButton' if _configuration.themes_enabled else f'Submix.TButton'}",
variable=self.navframe.submix, variable=self.navframe.submix,
) )
self.navframe.submix_button.grid(column=0, row=0) self.navframe.submix_button.grid(column=0, row=0)
if self.navframe.parent.kind.name != 'potato': if self.navframe.parent.kind.name != "potato":
self.navframe.submix_button['state'] = 'disabled' self.navframe.submix_button["state"] = "disabled"
def create_channel_button(self): def create_channel_button(self):
self.navframe.channel_button = ttk.Checkbutton( self.navframe.channel_button = ttk.Checkbutton(
self.navframe, self.navframe,
textvariable=self.navframe.channel_text, textvariable=self.navframe.channel_text,
command=self.navframe.switch_channel, command=self.navframe.switch_channel,
style=f'{"Toggle.TButton" if _configuration.themes_enabled else "Channel.TButton"}', style=f"{'Toggle.TButton' if _configuration.themes_enabled else f'Channel.TButton'}",
variable=self.navframe.channel, variable=self.navframe.channel,
) )
self.navframe.channel_button.grid(column=0, row=1, rowspan=1) self.navframe.channel_button.grid(column=0, row=1, rowspan=1)
@ -174,7 +174,7 @@ class NavigationFrameBuilder(AbstractBuilder):
self.navframe, self.navframe,
textvariable=self.navframe.extend_text, textvariable=self.navframe.extend_text,
command=self.navframe.extend_frame, command=self.navframe.extend_frame,
style=f'{"Toggle.TButton" if _configuration.themes_enabled else "Extend.TButton"}', style=f"{'Toggle.TButton' if _configuration.themes_enabled else f'Extend.TButton'}",
variable=self.navframe.extend, variable=self.navframe.extend,
) )
self.navframe.extend_button.grid(column=0, row=2) self.navframe.extend_button.grid(column=0, row=2)
@ -183,7 +183,7 @@ class NavigationFrameBuilder(AbstractBuilder):
self.navframe.info_button = ttk.Checkbutton( self.navframe.info_button = ttk.Checkbutton(
self.navframe, self.navframe,
textvariable=self.navframe.info_text, textvariable=self.navframe.info_text,
style=f'{"Toggle.TButton" if _configuration.themes_enabled else "Rec.TButton"}', style=f"{'Toggle.TButton' if _configuration.themes_enabled else f'Rec.TButton'}",
variable=self.navframe.info, variable=self.navframe.info,
) )
self.navframe.info_button.grid(column=0, row=3) self.navframe.info_button.grid(column=0, row=3)
@ -228,8 +228,8 @@ class ChannelLabelFrameBuilder(AbstractBuilder):
self.labelframe.pb = ttk.Progressbar( self.labelframe.pb = ttk.Progressbar(
self.labelframe, self.labelframe,
maximum=72, maximum=72,
orient='vertical', orient="vertical",
mode='determinate', mode="determinate",
variable=self.labelframe.level, variable=self.labelframe.level,
) )
self.labelframe.pb.grid(column=0, row=0) self.labelframe.pb.grid(column=0, row=0)
@ -240,17 +240,17 @@ class ChannelLabelFrameBuilder(AbstractBuilder):
self.labelframe, self.labelframe,
from_=12.0, from_=12.0,
to=-60.0, to=-60.0,
orient='vertical', orient="vertical",
variable=self.labelframe.gain, variable=self.labelframe.gain,
command=self.labelframe.scale_callback, command=self.labelframe.scale_callback,
length=_configuration.channel_height, length=_configuration.channel_height,
) )
self.scale.grid(column=1, row=0) self.scale.grid(column=1, row=0)
self.scale.bind('<Double-Button-1>', self.labelframe.reset_gain) self.scale.bind("<Double-Button-1>", self.labelframe.reset_gain)
self.scale.bind('<Button-1>', self.labelframe.scale_press) self.scale.bind("<Button-1>", self.labelframe.scale_press)
self.scale.bind('<ButtonRelease-1>', self.labelframe.scale_release) self.scale.bind("<ButtonRelease-1>", self.labelframe.scale_release)
self.scale.bind( self.scale.bind(
'<MouseWheel>', "<MouseWheel>",
partial( partial(
self.labelframe.pause_updates, self.labelframe.pause_updates,
self.labelframe._on_mousewheel, self.labelframe._on_mousewheel,
@ -268,9 +268,9 @@ class ChannelLabelFrameBuilder(AbstractBuilder):
"""Adds a mute button widget to a single label frame""" """Adds a mute button widget to a single label frame"""
self.button_mute = ttk.Checkbutton( self.button_mute = ttk.Checkbutton(
self.labelframe, self.labelframe,
text='MUTE', text="MUTE",
command=partial(self.labelframe.pause_updates, self.labelframe.toggle_mute), command=partial(self.labelframe.pause_updates, self.labelframe.toggle_mute),
style=f'{"Toggle.TButton" if _configuration.themes_enabled else f"{self.identifier}Mute{self.index}.TButton"}', style=f"{'Toggle.TButton' if _configuration.themes_enabled else f'{self.identifier}Mute{self.index}.TButton'}",
variable=self.labelframe.mute, variable=self.labelframe.mute,
) )
self.button_mute.grid(column=0, row=2, columnspan=2) self.button_mute.grid(column=0, row=2, columnspan=2)
@ -278,9 +278,9 @@ class ChannelLabelFrameBuilder(AbstractBuilder):
def add_conf_button(self): def add_conf_button(self):
self.button_conf = ttk.Checkbutton( self.button_conf = ttk.Checkbutton(
self.labelframe, self.labelframe,
text='CONFIG', text="CONFIG",
command=self.labelframe.open_config, command=self.labelframe.open_config,
style=f'{"Toggle.TButton" if _configuration.themes_enabled else f"{self.identifier}Conf{self.index}.TButton"}', style=f"{'Toggle.TButton' if _configuration.themes_enabled else f'{self.identifier}Conf{self.index}.TButton'}",
variable=self.labelframe.conf, variable=self.labelframe.conf,
) )
self.button_conf.grid(column=0, row=3, columnspan=2) self.button_conf.grid(column=0, row=3, columnspan=2)
@ -288,9 +288,9 @@ class ChannelLabelFrameBuilder(AbstractBuilder):
def add_on_button(self): def add_on_button(self):
self.button_on = ttk.Checkbutton( self.button_on = ttk.Checkbutton(
self.labelframe, self.labelframe,
text='ON', text="ON",
command=partial(self.labelframe.pause_updates, self.labelframe.set_on), command=partial(self.labelframe.pause_updates, self.labelframe.set_on),
style=f'{"Toggle.TButton" if _configuration.themes_enabled else f"{self.identifier}On{self.index}.TButton"}', style=f"{'Toggle.TButton' if _configuration.themes_enabled else f'{self.identifier}On{self.index}.TButton'}",
variable=self.labelframe.on, variable=self.labelframe.on,
) )
self.button_on.grid(column=0, row=2, columnspan=2) self.button_on.grid(column=0, row=2, columnspan=2)
@ -339,40 +339,40 @@ class StripConfigFrameBuilder(ChannelConfigFrameBuilder):
"""Responsible for building channel configframe widgets""" """Responsible for building channel configframe widgets"""
def setup(self): def setup(self):
if self.configframe.parent.kind.name == 'basic': if self.configframe.parent.kind.name == "basic":
self.configframe.slider_params = ('audibility',) self.configframe.slider_params = ("audibility",)
self.configframe.slider_vars = (tk.DoubleVar(),) self.configframe.slider_vars = (tk.DoubleVar(),)
else: else:
self.configframe.slider_params = ('comp.knob', 'gate.knob', 'limit') self.configframe.slider_params = ("comp.knob", "gate.knob", "limit")
self.configframe.slider_vars = [ self.configframe.slider_vars = [
tk.DoubleVar() for _ in self.configframe.slider_params tk.DoubleVar() for _ in self.configframe.slider_params
] ]
self.configframe.phys_out_params = [ self.configframe.phys_out_params = [
f'A{i + 1}' for i in range(self.configframe.phys_out) f"A{i+1}" for i in range(self.configframe.phys_out)
] ]
self.configframe.phys_out_params_vars = [ self.configframe.phys_out_params_vars = [
tk.BooleanVar() for _ in self.configframe.phys_out_params tk.BooleanVar() for _ in self.configframe.phys_out_params
] ]
self.configframe.virt_out_params = [ self.configframe.virt_out_params = [
f'B{i + 1}' for i in range(self.configframe.virt_out) f"B{i+1}" for i in range(self.configframe.virt_out)
] ]
self.configframe.virt_out_params_vars = [ self.configframe.virt_out_params_vars = [
tk.BooleanVar() for _ in self.configframe.virt_out_params tk.BooleanVar() for _ in self.configframe.virt_out_params
] ]
self.configframe.params = ('mono', 'solo') self.configframe.params = ("mono", "solo")
self.configframe.param_vars = list( self.configframe.param_vars = list(
tk.BooleanVar() for _ in self.configframe.params tk.BooleanVar() for _ in self.configframe.params
) )
if self.configframe.parent.kind.name in ('banana', 'potato'): if self.configframe.parent.kind.name in ("banana", "potato"):
if self.configframe.index == self.configframe.phys_in: if self.configframe.index == self.configframe.phys_in:
self.configframe.params = list( self.configframe.params = list(
map(lambda x: x.replace('mono', 'mc'), self.configframe.params) map(lambda x: x.replace("mono", "mc"), self.configframe.params)
) )
if self.configframe.parent.kind.name == 'banana': if self.configframe.parent.kind.name == "banana":
pass pass
# karaoke modes not in RT Packet yet. May implement in future # karaoke modes not in RT Packet yet. May implement in future
""" """
@ -388,101 +388,101 @@ class StripConfigFrameBuilder(ChannelConfigFrameBuilder):
== self.configframe.phys_in + self.configframe.virt_in - 1 == self.configframe.phys_in + self.configframe.virt_in - 1
): ):
self.configframe.params = list( self.configframe.params = list(
map(lambda x: x.replace('mono', 'mc'), self.configframe.params) map(lambda x: x.replace("mono", "mc"), self.configframe.params)
) )
def create_comp_slider(self): def create_comp_slider(self):
comp_label = ttk.Label(self.configframe, text='Comp') comp_label = ttk.Label(self.configframe, text="Comp")
comp_scale = ttk.Scale( comp_scale = ttk.Scale(
self.configframe, self.configframe,
from_=0.0, from_=0.0,
to=10.0, to=10.0,
orient='horizontal', orient="horizontal",
length=_configuration.channel_width, length=_configuration.channel_width,
variable=self.configframe.slider_vars[ variable=self.configframe.slider_vars[
self.configframe.slider_params.index('comp.knob') self.configframe.slider_params.index("comp.knob")
], ],
command=partial(self.configframe.scale_callback, 'comp.knob'), command=partial(self.configframe.scale_callback, "comp.knob"),
) )
comp_scale.bind( comp_scale.bind(
'<Double-Button-1>', partial(self.configframe.reset_scale, 'comp.knob', 0) "<Double-Button-1>", partial(self.configframe.reset_scale, "comp.knob", 0)
) )
comp_scale.bind('<Button-1>', self.configframe.scale_press) comp_scale.bind("<Button-1>", self.configframe.scale_press)
comp_scale.bind('<ButtonRelease-1>', self.configframe.scale_release) comp_scale.bind("<ButtonRelease-1>", self.configframe.scale_release)
comp_scale.bind('<Enter>', partial(self.configframe.scale_enter, 'comp.knob')) comp_scale.bind("<Enter>", partial(self.configframe.scale_enter, "comp.knob"))
comp_scale.bind('<Leave>', self.configframe.scale_leave) comp_scale.bind("<Leave>", self.configframe.scale_leave)
comp_label.grid(column=0, row=0) comp_label.grid(column=0, row=0)
comp_scale.grid(column=1, row=0) comp_scale.grid(column=1, row=0)
def create_gate_slider(self): def create_gate_slider(self):
gate_label = ttk.Label(self.configframe, text='Gate') gate_label = ttk.Label(self.configframe, text="Gate")
gate_scale = ttk.Scale( gate_scale = ttk.Scale(
self.configframe, self.configframe,
from_=0.0, from_=0.0,
to=10.0, to=10.0,
orient='horizontal', orient="horizontal",
length=_configuration.channel_width, length=_configuration.channel_width,
variable=self.configframe.slider_vars[ variable=self.configframe.slider_vars[
self.configframe.slider_params.index('gate.knob') self.configframe.slider_params.index("gate.knob")
], ],
command=partial(self.configframe.scale_callback, 'gate.knob'), command=partial(self.configframe.scale_callback, "gate.knob"),
) )
gate_scale.bind( gate_scale.bind(
'<Double-Button-1>', partial(self.configframe.reset_scale, 'gate.knob', 0) "<Double-Button-1>", partial(self.configframe.reset_scale, "gate.knob", 0)
) )
gate_scale.bind('<Button-1>', self.configframe.scale_press) gate_scale.bind("<Button-1>", self.configframe.scale_press)
gate_scale.bind('<ButtonRelease-1>', self.configframe.scale_release) gate_scale.bind("<ButtonRelease-1>", self.configframe.scale_release)
gate_scale.bind('<Enter>', partial(self.configframe.scale_enter, 'gate.knob')) gate_scale.bind("<Enter>", partial(self.configframe.scale_enter, "gate.knob"))
gate_scale.bind('<Leave>', self.configframe.scale_leave) gate_scale.bind("<Leave>", self.configframe.scale_leave)
gate_label.grid(column=2, row=0) gate_label.grid(column=2, row=0)
gate_scale.grid(column=3, row=0) gate_scale.grid(column=3, row=0)
def create_limit_slider(self): def create_limit_slider(self):
limit_label = ttk.Label(self.configframe, text='Limit') limit_label = ttk.Label(self.configframe, text="Limit")
limit_scale = ttk.Scale( limit_scale = ttk.Scale(
self.configframe, self.configframe,
from_=-40, from_=-40,
to=12, to=12,
orient='horizontal', orient="horizontal",
length=_configuration.channel_width, length=_configuration.channel_width,
variable=self.configframe.slider_vars[ variable=self.configframe.slider_vars[
self.configframe.slider_params.index('limit') self.configframe.slider_params.index("limit")
], ],
command=partial(self.configframe.scale_callback, 'limit'), command=partial(self.configframe.scale_callback, "limit"),
) )
limit_scale.bind( limit_scale.bind(
'<Double-Button-1>', partial(self.configframe.reset_scale, 'limit', 12) "<Double-Button-1>", partial(self.configframe.reset_scale, "limit", 12)
) )
limit_scale.bind('<Button-1>', self.configframe.scale_press) limit_scale.bind("<Button-1>", self.configframe.scale_press)
limit_scale.bind('<ButtonRelease-1>', self.configframe.scale_release) limit_scale.bind("<ButtonRelease-1>", self.configframe.scale_release)
limit_scale.bind('<Enter>', partial(self.configframe.scale_enter, 'limit')) limit_scale.bind("<Enter>", partial(self.configframe.scale_enter, "limit"))
limit_scale.bind('<Leave>', self.configframe.scale_leave) limit_scale.bind("<Leave>", self.configframe.scale_leave)
limit_label.grid(column=4, row=0) limit_label.grid(column=4, row=0)
limit_scale.grid(column=5, row=0) limit_scale.grid(column=5, row=0)
def create_audibility_slider(self): def create_audibility_slider(self):
aud_label = ttk.Label(self.configframe, text='Audibility') aud_label = ttk.Label(self.configframe, text="Audibility")
aud_scale = ttk.Scale( aud_scale = ttk.Scale(
self.configframe, self.configframe,
from_=0.0, from_=0.0,
to=10.0, to=10.0,
orient='horizontal', orient="horizontal",
length=_configuration.channel_width, length=_configuration.channel_width,
variable=self.configframe.slider_vars[ variable=self.configframe.slider_vars[
self.configframe.slider_params.index('audibility') self.configframe.slider_params.index("audibility")
], ],
command=partial(self.configframe.scale_callback, 'audibility'), command=partial(self.configframe.scale_callback, "audibility"),
) )
aud_scale.bind( aud_scale.bind(
'<Double-Button-1>', partial(self.configframe.reset_scale, 'audibility', 0) "<Double-Button-1>", partial(self.configframe.reset_scale, "audibility", 0)
) )
aud_scale.bind('<Button-1>', self.configframe.scale_press) aud_scale.bind("<Button-1>", self.configframe.scale_press)
aud_scale.bind('<ButtonRelease-1>', self.configframe.scale_release) aud_scale.bind("<ButtonRelease-1>", self.configframe.scale_release)
aud_scale.bind('<Enter>', partial(self.configframe.scale_enter, 'audibility')) aud_scale.bind("<Enter>", partial(self.configframe.scale_enter, "audibility"))
aud_scale.bind('<Leave>', self.configframe.scale_leave) aud_scale.bind("<Leave>", self.configframe.scale_leave)
aud_label.grid(column=0, row=0) aud_label.grid(column=0, row=0)
aud_scale.grid(column=1, row=0) aud_scale.grid(column=1, row=0)
@ -495,7 +495,7 @@ class StripConfigFrameBuilder(ChannelConfigFrameBuilder):
command=partial( command=partial(
self.configframe.pause_updates, self.configframe.toggle_a, param self.configframe.pause_updates, self.configframe.toggle_a, param
), ),
style=f'{"Toggle.TButton" if _configuration.themes_enabled else f"{param}.TButton"}', style=f"{'Toggle.TButton' if _configuration.themes_enabled else f'{param}.TButton'}",
variable=self.configframe.phys_out_params_vars[ variable=self.configframe.phys_out_params_vars[
self.configframe.phys_out_params.index(param) self.configframe.phys_out_params.index(param)
], ],
@ -518,7 +518,7 @@ class StripConfigFrameBuilder(ChannelConfigFrameBuilder):
command=partial( command=partial(
self.configframe.pause_updates, self.configframe.toggle_b, param self.configframe.pause_updates, self.configframe.toggle_b, param
), ),
style=f'{"Toggle.TButton" if _configuration.themes_enabled else f"{param}.TButton"}', style=f"{'Toggle.TButton' if _configuration.themes_enabled else f'{param}.TButton'}",
variable=self.configframe.virt_out_params_vars[ variable=self.configframe.virt_out_params_vars[
self.configframe.virt_out_params.index(param) self.configframe.virt_out_params.index(param)
], ],
@ -541,7 +541,7 @@ class StripConfigFrameBuilder(ChannelConfigFrameBuilder):
command=partial( command=partial(
self.configframe.pause_updates, self.configframe.toggle_p, param self.configframe.pause_updates, self.configframe.toggle_p, param
), ),
style=f'{"Toggle.TButton" if _configuration.themes_enabled else f"{param}.TButton"}', style=f"{'Toggle.TButton' if _configuration.themes_enabled else f'{param}.TButton'}",
variable=self.configframe.param_vars[i], variable=self.configframe.param_vars[i],
) )
for i, param in enumerate(self.configframe.params) for i, param in enumerate(self.configframe.params)
@ -576,7 +576,7 @@ class BusConfigFrameBuilder(ChannelConfigFrameBuilder):
} }
self.configframe.bus_modes = list(self.configframe.bus_mode_map.keys()) self.configframe.bus_modes = list(self.configframe.bus_mode_map.keys())
# fmt: on # fmt: on
self.configframe.params = ('mono', 'eq.on', 'eq.ab') self.configframe.params = ("mono", "eq.on", "eq.ab")
self.configframe.param_vars = [tk.BooleanVar() for _ in self.configframe.params] self.configframe.param_vars = [tk.BooleanVar() for _ in self.configframe.params]
self.configframe.bus_mode_label_text = tk.StringVar( self.configframe.bus_mode_label_text = tk.StringVar(
value=self.configframe.bus_mode_map[self.configframe.current_bus_mode()] value=self.configframe.bus_mode_map[self.configframe.current_bus_mode()]
@ -590,13 +590,13 @@ class BusConfigFrameBuilder(ChannelConfigFrameBuilder):
column=0, row=0, columnspan=2, sticky=(tk.W) column=0, row=0, columnspan=2, sticky=(tk.W)
) )
self.configframe.busmode_button.bind( self.configframe.busmode_button.bind(
'<Button-1>', "<Button-1>",
partial( partial(
self.configframe.pause_updates, self.configframe.rotate_bus_modes_right self.configframe.pause_updates, self.configframe.rotate_bus_modes_right
), ),
) )
self.configframe.busmode_button.bind( self.configframe.busmode_button.bind(
'<Button-3>', "<Button-3>",
partial( partial(
self.configframe.pause_updates, self.configframe.rotate_bus_modes_left self.configframe.pause_updates, self.configframe.rotate_bus_modes_left
), ),
@ -610,7 +610,7 @@ class BusConfigFrameBuilder(ChannelConfigFrameBuilder):
command=partial( command=partial(
self.configframe.pause_updates, self.configframe.toggle_p, param self.configframe.pause_updates, self.configframe.toggle_p, param
), ),
style=f'{"Toggle.TButton" if _configuration.themes_enabled else f"{param}.TButton"}', style=f"{'Toggle.TButton' if _configuration.themes_enabled else f'{param}.TButton'}",
variable=self.configframe.param_vars[i], variable=self.configframe.param_vars[i],
) )
for i, param in enumerate(self.configframe.params) for i, param in enumerate(self.configframe.params)

View File

@ -46,7 +46,7 @@ class ChannelLabelFrame(ttk.LabelFrame):
try: try:
return getattr(self.target, param) return getattr(self.target, param)
except AttributeError as e: except AttributeError as e:
self.logger(f'{type(e).__name__}: {e}') self.logger(f"{type(e).__name__}: {e}")
def setter(self, param, value): def setter(self, param, value):
if param in dir(self.target): # avoid calling getattr (with hasattr) if param in dir(self.target): # avoid calling getattr (with hasattr)
@ -56,19 +56,19 @@ class ChannelLabelFrame(ttk.LabelFrame):
"""callback function for scale widget""" """callback function for scale widget"""
val = round(self.gain.get(), 1) val = round(self.gain.get(), 1)
self.setter('gain', val) self.setter("gain", val)
self.gainlabel.set(val) self.gainlabel.set(val)
def toggle_mute(self, *args): def toggle_mute(self, *args):
self.target.mute = self.mute.get() self.target.mute = self.mute.get()
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
self.styletable.configure( self.styletable.configure(
f'{self.identifier}Mute{self.index}.TButton', f"{self.identifier}Mute{self.index}.TButton",
background=f'{"red" if self.mute.get() else "white"}', background=f'{"red" if self.mute.get() else "white"}',
) )
def reset_gain(self, *args): def reset_gain(self, *args):
self.setter('gain', 0) self.setter("gain", 0)
self.gain.set(0) self.gain.set(0)
self.gainlabel.set(self.gain.get()) self.gainlabel.set(self.gain.get())
@ -76,16 +76,16 @@ class ChannelLabelFrame(ttk.LabelFrame):
self.after(1, self.remove_events) self.after(1, self.remove_events)
def remove_events(self): def remove_events(self):
self.parent.target.event.remove('pdirty') self.parent.target.event.remove("pdirty")
self.parent.target.event.remove('ldirty') self.parent.target.event.remove("ldirty")
def scale_release(self, *args): def scale_release(self, *args):
_base_values.run_update = False _base_values.run_update = False
self.after(1, self.add_events) self.after(1, self.add_events)
def add_events(self): def add_events(self):
self.parent.target.event.add('pdirty') self.parent.target.event.add("pdirty")
self.parent.target.event.add('ldirty') self.parent.target.event.add("ldirty")
self.after(500, self.resume_updates) self.after(500, self.resume_updates)
def pause_updates(self, func, *args): def pause_updates(self, func, *args):
@ -115,7 +115,7 @@ class ChannelLabelFrame(ttk.LabelFrame):
self.gain.set(12) self.gain.set(12)
elif self.gain.get() < -60: elif self.gain.get() < -60:
self.gain.set(-60) self.gain.set(-60)
self.setter('gain', self.gain.get()) self.setter("gain", self.gain.get())
self.gainlabel.set(round(self.gain.get(), 1)) self.gainlabel.set(round(self.gain.get(), 1))
def open_config(self): def open_config(self):
@ -125,36 +125,36 @@ class ChannelLabelFrame(ttk.LabelFrame):
self.parent.parent.config_frame.teardown() self.parent.parent.config_frame.teardown()
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
self.styletable.configure( self.styletable.configure(
f'{self.identifier}Conf{self.index}.TButton', f"{self.identifier}Conf{self.index}.TButton",
background=f'{"yellow" if self.conf.get() else "white"}', background=f'{"yellow" if self.conf.get() else "white"}',
) )
def on_update(self, subject): def on_update(self, subject):
if subject == 'ldirty': if subject == "ldirty":
self.upd_levels() self.upd_levels()
elif subject == 'pdirty': elif subject == "pdirty":
self.sync_params() self.sync_params()
elif subject == 'labelframe': elif subject == "labelframe":
self.after(5, self.sync_labels) self.after(5, self.sync_labels)
def sync_params(self): def sync_params(self):
"""sync parameter states, update button colours""" """sync parameter states, update button colours"""
self.gain.set(self.getter('gain')) self.gain.set(self.getter("gain"))
self.gainlabel.set(round(self.gain.get(), 1)) self.gainlabel.set(round(self.gain.get(), 1))
self.mute.set(self.getter('mute')) self.mute.set(self.getter("mute"))
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
self.styletable.configure( self.styletable.configure(
f'{self.identifier}Mute{self.index}.TButton', f"{self.identifier}Mute{self.index}.TButton",
background=f'{"red" if self.mute.get() else "white"}', background=f'{"red" if self.mute.get() else "white"}',
) )
def sync_labels(self): def sync_labels(self):
"""sync labelframes according to label text""" """sync labelframes according to label text"""
retval = self.getter('label') retval = self.getter("label")
if self.parent.label_cache[self.id][self.index] != retval: if self.parent.label_cache[self.id][self.index] != retval:
self.parent.label_cache[self.id][self.index] = retval self.parent.label_cache[self.id][self.index] = retval
if len(retval) > 10: if len(retval) > 10:
retval = f'{retval[:8]}..' retval = f"{retval[:8]}.."
if not retval: if not retval:
self.parent.columnconfigure(self.index, minsize=0) self.parent.columnconfigure(self.index, minsize=0)
self.parent.parent.subject.remove(self) self.parent.parent.subject.remove(self)
@ -236,8 +236,8 @@ class ChannelFrame(ttk.Frame):
self.phys_in, self.virt_in = parent.kind.ins self.phys_in, self.virt_in = parent.kind.ins
self.phys_out, self.virt_out = parent.kind.outs self.phys_out, self.virt_out = parent.kind.outs
self.label_cache = { self.label_cache = {
'strip': [''] * (self.phys_in + self.virt_in), "strip": [""] * (self.phys_in + self.virt_in),
'bus': [''] * (self.phys_out + self.virt_out), "bus": [""] * (self.phys_out + self.virt_out),
} }
self.parent.subject.add(self) self.parent.subject.add(self)
self.update_labels() self.update_labels()
@ -264,10 +264,10 @@ class ChannelFrame(ttk.Frame):
def update_labels(self): def update_labels(self):
for labelframe in self.labelframes: for labelframe in self.labelframes:
labelframe.on_update('labelframe') labelframe.on_update("labelframe")
def on_update(self, subject): def on_update(self, subject):
if subject == 'pdirty': if subject == "pdirty":
self.update_labels() self.update_labels()
def grid_configure(self): def grid_configure(self):
@ -281,7 +281,7 @@ class ChannelFrame(ttk.Frame):
[self.parent.subject.remove(frame) for frame in self.labelframes] [self.parent.subject.remove(frame) for frame in self.labelframes]
self.parent.subject.remove(self) self.parent.subject.remove(self)
self.destroy() self.destroy()
setattr(self.parent, f'{self.identifier}_frame', None) setattr(self.parent, f"{self.identifier}_frame", None)
def _make_channelframe(parent, identifier): def _make_channelframe(parent, identifier):
@ -298,7 +298,7 @@ def _make_channelframe(parent, identifier):
""" """
for i, labelframe in enumerate( for i, labelframe in enumerate(
getattr(self, 'strips' if identifier == 'strip' else 'buses') getattr(self, "strips" if identifier == "strip" else "buses")
): ):
labelframe.grid(row=0, column=i) labelframe.grid(row=0, column=i)
label = labelframe.target.label label = labelframe.target.label
@ -329,20 +329,20 @@ def _make_channelframe(parent, identifier):
self.grid_configure() self.grid_configure()
init_labels(self) init_labels(self)
if identifier == 'strip': if identifier == "strip":
CHANNELFRAME_cls = type( CHANNELFRAME_cls = type(
f'ChannelFrame{identifier.capitalize()}', f"ChannelFrame{identifier.capitalize()}",
(ChannelFrame,), (ChannelFrame,),
{ {
'__init__': init_strip, "__init__": init_strip,
}, },
) )
else: else:
CHANNELFRAME_cls = type( CHANNELFRAME_cls = type(
f'ChannelFrame{identifier.capitalize()}', f"ChannelFrame{identifier.capitalize()}",
(ChannelFrame,), (ChannelFrame,),
{ {
'__init__': init_bus, "__init__": init_bus,
}, },
) )
return CHANNELFRAME_cls(parent) return CHANNELFRAME_cls(parent)

View File

@ -31,7 +31,7 @@ class Config(ttk.Frame):
return self.parent.target return self.parent.target
def getter(self, param): def getter(self, param):
param = param.split('.') param = param.split(".")
try: try:
if len(param) == 2: if len(param) == 2:
target = getattr(self.target, param[0]) target = getattr(self.target, param[0])
@ -39,10 +39,10 @@ class Config(ttk.Frame):
else: else:
return getattr(self.target, param[0]) return getattr(self.target, param[0])
except AttributeError as e: except AttributeError as e:
self.logger.error(f'{type(e).__name__}: {e}') self.logger.error(f"{type(e).__name__}: {e}")
def setter(self, param, value): def setter(self, param, value):
param = param.split('.') param = param.split(".")
try: try:
if len(param) == 2: if len(param) == 2:
target = getattr(self.target, param[0]) target = getattr(self.target, param[0])
@ -50,22 +50,22 @@ class Config(ttk.Frame):
else: else:
setattr(self.target, param[0], value) setattr(self.target, param[0], value)
except AttributeError as e: except AttributeError as e:
self.logger(f'{type(e).__name__}: {e}') self.logger(f"{type(e).__name__}: {e}")
def scale_press(self, *args): def scale_press(self, *args):
self.after(1, self.remove_events) self.after(1, self.remove_events)
def remove_events(self): def remove_events(self):
self.parent.target.event.remove('pdirty') self.parent.target.event.remove("pdirty")
self.parent.target.event.remove('ldirty') self.parent.target.event.remove("ldirty")
def scale_release(self, *args): def scale_release(self, *args):
_base_values.run_update = False _base_values.run_update = False
self.after(1, self.add_events) self.after(1, self.add_events)
def add_events(self): def add_events(self):
self.parent.target.event.add('pdirty') self.parent.target.event.add("pdirty")
self.parent.target.event.add('ldirty') self.parent.target.event.add("ldirty")
self.after(350, self.resume_updates) self.after(350, self.resume_updates)
def pause_updates(self, func, *args): def pause_updates(self, func, *args):
@ -84,7 +84,7 @@ class Config(ttk.Frame):
self.parent.nav_frame.info_text.set(round(val, 1)) self.parent.nav_frame.info_text.set(round(val, 1))
def scale_leave(self, *args): def scale_leave(self, *args):
self.parent.nav_frame.info_text.set('') self.parent.nav_frame.info_text.set("")
def scale_callback(self, param, *args): def scale_callback(self, param, *args):
"""callback function for scale widget""" """callback function for scale widget"""
@ -102,12 +102,12 @@ class Config(ttk.Frame):
self.setter(param, val) self.setter(param, val)
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
self.styletable.configure( self.styletable.configure(
f'{param}.TButton', background=f'{"green" if val else "white"}' f"{param}.TButton", background=f'{"green" if val else "white"}'
) )
def on_update(self, subject): def on_update(self, subject):
"""update parameters""" """update parameters"""
if subject == 'pdirty': if subject == "pdirty":
self.sync() self.sync()
@ -134,7 +134,7 @@ class StripConfig(Config):
def make_row_0(self): def make_row_0(self):
if self.index < self.phys_in: if self.index < self.phys_in:
if self.parent.kind.name == 'basic': if self.parent.kind.name == "basic":
self.builder.create_audibility_slider() self.builder.create_audibility_slider()
else: else:
self.builder.create_comp_slider() self.builder.create_comp_slider()
@ -153,7 +153,7 @@ class StripConfig(Config):
self.setter(param, val) self.setter(param, val)
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
self.styletable.configure( self.styletable.configure(
f'{param}.TButton', background=f'{"green" if val else "white"}' f"{param}.TButton", background=f'{"green" if val else "white"}'
) )
def toggle_b(self, param): def toggle_b(self, param):
@ -161,7 +161,7 @@ class StripConfig(Config):
self.setter(param, val) self.setter(param, val)
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
self.styletable.configure( self.styletable.configure(
f'{param}.TButton', background=f'{"green" if val else "white"}' f"{param}.TButton", background=f'{"green" if val else "white"}'
) )
def teardown(self): def teardown(self):
@ -190,21 +190,21 @@ class StripConfig(Config):
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
[ [
self.styletable.configure( self.styletable.configure(
f'{param}.TButton', f"{param}.TButton",
background=f'{"green" if self.phys_out_params_vars[i].get() else "white"}', background=f'{"green" if self.phys_out_params_vars[i].get() else "white"}',
) )
for i, param in enumerate(self.phys_out_params) for i, param in enumerate(self.phys_out_params)
] ]
[ [
self.styletable.configure( self.styletable.configure(
f'{param}.TButton', f"{param}.TButton",
background=f'{"green" if self.virt_out_params_vars[i].get() else "white"}', background=f'{"green" if self.virt_out_params_vars[i].get() else "white"}',
) )
for i, param in enumerate(self.virt_out_params) for i, param in enumerate(self.virt_out_params)
] ]
[ [
self.styletable.configure( self.styletable.configure(
f'{param}.TButton', f"{param}.TButton",
background=f'{"green" if self.param_vars[i].get() else "white"}', background=f'{"green" if self.param_vars[i].get() else "white"}',
) )
for i, param in enumerate(self.params) for i, param in enumerate(self.params)
@ -241,7 +241,9 @@ class BusConfig(Config):
self.builder.create_param_buttons() self.builder.create_param_buttons()
def current_bus_mode(self): def current_bus_mode(self):
return self.target.mode.get() for mode in self.bus_modes:
if getattr(self.target.mode, mode):
return mode
def rotate_bus_modes_right(self, *args): def rotate_bus_modes_right(self, *args):
current_mode = self.current_bus_mode() current_mode = self.current_bus_mode()
@ -255,14 +257,14 @@ class BusConfig(Config):
self.bus_mode_label_text.set(self.bus_mode_map[self.bus_modes[next]]) self.bus_mode_label_text.set(self.bus_mode_map[self.bus_modes[next]])
else: else:
self.target.mode.normal = True self.target.mode.normal = True
self.bus_mode_label_text.set('Normal') self.bus_mode_label_text.set("Normal")
def rotate_bus_modes_left(self, *args): def rotate_bus_modes_left(self, *args):
current_mode = self.current_bus_mode() current_mode = self.current_bus_mode()
prev = self.bus_modes.index(current_mode) - 1 prev = self.bus_modes.index(current_mode) - 1
if prev < 0: if prev < 0:
self.target.mode.rearonly = True self.target.mode.rearonly = True
self.bus_mode_label_text.set('Rear Only') self.bus_mode_label_text.set("Rear Only")
else: else:
setattr( setattr(
self.target.mode, self.target.mode,
@ -283,7 +285,7 @@ class BusConfig(Config):
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
[ [
self.styletable.configure( self.styletable.configure(
f'{param}.TButton', f"{param}.TButton",
background=f'{"green" if self.param_vars[i].get() else "white"}', background=f'{"green" if self.param_vars[i].get() else "white"}',
) )
for i, param in enumerate(self.params) for i, param in enumerate(self.params)

View File

@ -12,66 +12,66 @@ configuration = {}
def get_configpath(): def get_configpath():
for pn in ( configpaths = [
Path.home() / '.config' / 'vm-compact', Path.cwd() / "configs",
Path.home() / 'Documents' / 'Voicemeeter' / 'vm-compact', Path.home() / ".config" / "vm-compact" / "configs",
Path.cwd() / '_internal' / 'configs', Path.home() / "Documents" / "Voicemeeter" / "configs",
Path.cwd() / 'configs', ]
): for configpath in configpaths:
if pn.exists(): if configpath.exists():
return pn return configpath
if configpath := get_configpath(): if configpath := get_configpath():
filepaths = list(configpath.glob('*.toml')) filepaths = list(configpath.glob("*.toml"))
if any(f.stem in ('app', 'vban') for f in filepaths): if any(f.stem in ("app", "vban") for f in filepaths):
configs = {} configs = {}
for filepath in filepaths: for filepath in filepaths:
filename = filepath.with_suffix('').stem filename = filepath.with_suffix("").stem
if filename in ('app', 'vban'): if filename in ("app", "vban"):
try: try:
with open(filepath, 'rb') as f: with open(filepath, "rb") as f:
configs[filename] = tomllib.load(f) configs[filename] = tomllib.load(f)
logger.info(f'configuration: {filename} loaded into memory') logger.info(f"configuration: {filename} loaded into memory")
except tomllib.TOMLDecodeError: except tomllib.TOMLDecodeError:
logger.error(f'Invalid TOML config: configs/{filename.stem}') logger.error(f"Invalid TOML config: configs/{filename.stem}")
configuration |= configs configuration |= configs
_defaults = { _defaults = {
'configs': { "configs": {
'config': None, "config": None,
}, },
'theme': { "theme": {
'enabled': True, "enabled": True,
'mode': 'light', "mode": "light",
}, },
'extends': { "extends": {
'extended': True, "extended": True,
'extends_horizontal': True, "extends_horizontal": True,
}, },
'channel': { "channel": {
'width': 80, "width": 80,
'height': 130, "height": 130,
'xpadding': 3, "xpadding": 3,
}, },
'mwscroll_step': { "mwscroll_step": {
'size': 3, "size": 3,
}, },
'submixes': { "submixes": {
'default': 0, "default": 0,
}, },
'navigation': {'show': True}, "navigation": {"show": True},
} }
if 'app' in configuration: if "app" in configuration:
for key in _defaults: for key in _defaults:
if key in configuration['app']: if key in configuration["app"]:
configuration['app'][key] = _defaults[key] | configuration['app'][key] configuration["app"][key] = _defaults[key] | configuration["app"][key]
else: else:
configuration['app'][key] = _defaults[key] configuration["app"][key] = _defaults[key]
else: else:
configuration['app'] = _defaults configuration["app"] = _defaults
def get_configuration(key): def get_configuration(key):
@ -80,19 +80,19 @@ def get_configuration(key):
def loader(kind_id, target): def loader(kind_id, target):
configs = {'reset': target.configs['reset']} configs = {"reset": target.configs["reset"]}
if configpath := get_configpath(): if configpath := get_configpath():
userconfigpath = configpath / kind_id userconfigpath = configpath / kind_id
if userconfigpath.exists(): if userconfigpath.exists():
filepaths = list(userconfigpath.glob('*.toml')) filepaths = list(userconfigpath.glob("*.toml"))
for filepath in filepaths: for filepath in filepaths:
identifier = filepath.with_suffix('').stem identifier = filepath.with_suffix("").stem
try: try:
with open(filepath, 'rb') as f: with open(filepath, "rb") as f:
configs[identifier] = tomllib.load(f) configs[identifier] = tomllib.load(f)
logger.info(f'loader: {identifier} loaded into memory') logger.info(f"loader: {identifier} loaded into memory")
except tomllib.TOMLDecodeError: except tomllib.TOMLDecodeError:
logger.error(f'Invalid TOML config: configs/{filename.stem}') logger.error(f"Invalid TOML config: configs/{filename.stem}")
target.configs = configs target.configs = configs
return target.configs return target.configs

View File

@ -4,7 +4,7 @@ from voicemeeterlib import kinds
from .configurations import get_configuration from .configurations import get_configuration
configuration = get_configuration('app') configuration = get_configuration("app")
class SingletonMeta(type): class SingletonMeta(type):
@ -20,32 +20,32 @@ class SingletonMeta(type):
@dataclass @dataclass
class Configurations(metaclass=SingletonMeta): class Configurations(metaclass=SingletonMeta):
# is the gui extended # is the gui extended
extended: bool = configuration['extends']['extended'] extended: bool = configuration["extends"]["extended"]
# direction the gui extends # direction the gui extends
extends_horizontal: bool = configuration['extends']['extends_horizontal'] extends_horizontal: bool = configuration["extends"]["extends_horizontal"]
# are themes enabled # are themes enabled
themes_enabled: bool = configuration['theme']['enabled'] themes_enabled: bool = configuration["theme"]["enabled"]
# light or dark # light or dark
theme_mode: str = configuration['theme']['mode'] theme_mode: str = configuration["theme"]["mode"]
# size of mousewheel scroll step # size of mousewheel scroll step
mwscroll_step: int = configuration['mwscroll_step']['size'] mwscroll_step: int = configuration["mwscroll_step"]["size"]
# bus assigned as current submix # bus assigned as current submix
submixes: int = configuration['submixes']['default'] submixes: int = configuration["submixes"]["default"]
# width of a single channel labelframe # width of a single channel labelframe
channel_width: int = configuration['channel']['width'] channel_width: int = configuration["channel"]["width"]
# height of a single channel labelframe # height of a single channel labelframe
channel_height: int = configuration['channel']['height'] channel_height: int = configuration["channel"]["height"]
# xpadding for a single channel labelframe # xpadding for a single channel labelframe
channel_xpadding: int = configuration['channel']['xpadding'] channel_xpadding: int = configuration["channel"]["xpadding"]
# do we grid the navigation frame? # do we grid the navigation frame?
navigation_show: bool = configuration['navigation']['show'] navigation_show: bool = configuration["navigation"]["show"]
@property @property
def config(self): def config(self):
if 'configs' in configuration: if "configs" in configuration:
return configuration['configs']['config'] return configuration["configs"]["config"]
@dataclass @dataclass

View File

@ -19,7 +19,7 @@ class GainLayer(ttk.LabelFrame):
else: else:
self.level_offset = parent.phys_in * 2 + (index - parent.phys_in) * 8 self.level_offset = parent.phys_in * 2 + (index - parent.phys_in) * 8
self.builder = builders.ChannelLabelFrameBuilder(self, index, id='gainlayer') self.builder = builders.ChannelLabelFrameBuilder(self, index, id="gainlayer")
self.builder.setup() self.builder.setup()
self.builder.add_progressbar() self.builder.add_progressbar()
self.builder.add_scale() self.builder.add_scale()
@ -38,20 +38,20 @@ class GainLayer(ttk.LabelFrame):
@property @property
def identifier(self): def identifier(self):
return 'gainlayer' return "gainlayer"
def getter(self, param): def getter(self, param):
try: try:
return getattr(self.target, param) return getattr(self.target, param)
except AttributeError as e: except AttributeError as e:
self.logger(f'{type(e).__name__}: {e}') self.logger(f"{type(e).__name__}: {e}")
def setter(self, param, value): def setter(self, param, value):
if param in dir(self.target): # avoid calling getattr (with hasattr) if param in dir(self.target): # avoid calling getattr (with hasattr)
setattr(self.target, param, value) setattr(self.target, param, value)
def reset_gain(self, *args): def reset_gain(self, *args):
self.setter('gain', 0) self.setter("gain", 0)
self.gain.set(0) self.gain.set(0)
self.gainlabel.set(self.gain.get()) self.gainlabel.set(self.gain.get())
@ -59,23 +59,23 @@ class GainLayer(ttk.LabelFrame):
"""callback function for scale widget""" """callback function for scale widget"""
val = round(self.gain.get(), 1) val = round(self.gain.get(), 1)
self.setter('gain', val) self.setter("gain", val)
self.gainlabel.set(val) self.gainlabel.set(val)
def scale_press(self, *args): def scale_press(self, *args):
self.after(1, self.remove_events) self.after(1, self.remove_events)
def remove_events(self): def remove_events(self):
self.parent.target.event.remove('pdirty') self.parent.target.event.remove("pdirty")
self.parent.target.event.remove('ldirty') self.parent.target.event.remove("ldirty")
def scale_release(self, *args): def scale_release(self, *args):
_base_values.run_update = False _base_values.run_update = False
self.after(1, self.add_events) self.after(1, self.add_events)
def add_events(self): def add_events(self):
self.parent.target.event.add('pdirty') self.parent.target.event.add("pdirty")
self.parent.target.event.add('ldirty') self.parent.target.event.add("ldirty")
self.after(500, self.resume_updates) self.after(500, self.resume_updates)
def pause_updates(self, func, *args): def pause_updates(self, func, *args):
@ -103,7 +103,7 @@ class GainLayer(ttk.LabelFrame):
self.gain.set(12) self.gain.set(12)
elif self.gain.get() < -60: elif self.gain.get() < -60:
self.gain.set(-60) self.gain.set(-60)
self.setter('gain', self.gain.get()) self.setter("gain", self.gain.get())
self.after(1, self.resume_updates) self.after(1, self.resume_updates)
def set_on(self): def set_on(self):
@ -116,20 +116,20 @@ class GainLayer(ttk.LabelFrame):
) )
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
self.styletable.configure( self.styletable.configure(
f'{self.identifier}On{self.index}.TButton', f"{self.identifier}On{self.index}.TButton",
background=f'{"green" if self.on.get() else "white"}', background=f'{"green" if self.on.get() else "white"}',
) )
def on_update(self, subject): def on_update(self, subject):
if subject == 'ldirty': if subject == "ldirty":
self.upd_levels() self.upd_levels()
elif subject == 'pdirty': elif subject == "pdirty":
self.sync_params() self.sync_params()
elif subject == 'labelframe': elif subject == "labelframe":
self.after(5, self.sync_labels) self.after(5, self.sync_labels)
def sync_params(self): def sync_params(self):
self.gain.set(self.getter('gain')) self.gain.set(self.getter("gain"))
self.gainlabel.set(round(self.gain.get(), 1)) self.gainlabel.set(round(self.gain.get(), 1))
self.on.set( self.on.set(
getattr( getattr(
@ -139,7 +139,7 @@ class GainLayer(ttk.LabelFrame):
) )
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
self.styletable.configure( self.styletable.configure(
f'{self.identifier}On{self.index}.TButton', f"{self.identifier}On{self.index}.TButton",
background=f'{"green" if self.on.get() else "white"}', background=f'{"green" if self.on.get() else "white"}',
) )
@ -147,7 +147,7 @@ class GainLayer(ttk.LabelFrame):
"""sync params with voicemeeter""" """sync params with voicemeeter"""
retval = self.parent.target.strip[self.index].label retval = self.parent.target.strip[self.index].label
if len(retval) > 10: if len(retval) > 10:
retval = f'{retval[:8]}..' retval = f"{retval[:8]}.."
if not retval: if not retval:
self.parent.columnconfigure(self.index, minsize=0) self.parent.columnconfigure(self.index, minsize=0)
self.parent.parent.subject.remove(self) self.parent.parent.subject.remove(self)
@ -201,8 +201,8 @@ class SubMixFrame(ttk.Frame):
self.parent = parent self.parent = parent
self.phys_in, self.virt_in = parent.kind.ins self.phys_in, self.virt_in = parent.kind.ins
self.phys_out, self.virt_out = parent.kind.outs self.phys_out, self.virt_out = parent.kind.outs
self.buses = tuple(f'A{i + 1}' for i in range(self.phys_out)) + tuple( self.buses = tuple(f"A{i+1}" for i in range(self.phys_out)) + tuple(
f'B{i + 1}' for i in range(self.virt_out) f"B{i+1}" for i in range(self.virt_out)
) )
self.gainlayers = [ self.gainlayers = [
@ -221,7 +221,7 @@ class SubMixFrame(ttk.Frame):
else: else:
if parent.bus_frame and parent.bus_frame.grid_info(): if parent.bus_frame and parent.bus_frame.grid_info():
self.grid( self.grid(
row=parent.bus_frame.grid_info()['row'], column=0, sticky=(tk.W) row=parent.bus_frame.grid_info()["row"], column=0, sticky=(tk.W)
) )
parent.bus_frame.grid_remove() parent.bus_frame.grid_remove()
else: else:
@ -256,9 +256,9 @@ class SubMixFrame(ttk.Frame):
) )
def on_update(self, subject): def on_update(self, subject):
if subject == 'pdirty': if subject == "pdirty":
for labelframe in self.labelframes: for labelframe in self.labelframes:
labelframe.on_update('labelframe') labelframe.on_update("labelframe")
def grid_configure(self): def grid_configure(self):
[ [

View File

@ -1 +0,0 @@
from .main import run

View File

@ -1,11 +0,0 @@
import voicemeeterlib
import vmcompact
def run():
KIND_ID = 'banana'
with voicemeeterlib.api(KIND_ID) as vmr:
app = vmcompact.connect(KIND_ID, vmr)
app.mainloop()

View File

@ -1 +0,0 @@
from .main import run

View File

@ -1,11 +0,0 @@
import voicemeeterlib
import vmcompact
def run():
KIND_ID = 'basic'
with voicemeeterlib.api(KIND_ID) as vmr:
app = vmcompact.connect(KIND_ID, vmr)
app.mainloop()

View File

@ -1 +0,0 @@
from .main import run

View File

@ -1,11 +0,0 @@
import voicemeeterlib
import vmcompact
def run():
KIND_ID = 'potato'
with voicemeeterlib.api(KIND_ID) as vmr:
app = vmcompact.connect(KIND_ID, vmr)
app.mainloop()

View File

@ -19,8 +19,8 @@ class Menus(tk.Menu):
self.parent = parent self.parent = parent
self.vmr = vmr self.vmr = vmr
self.logger = logger.getChild(self.__class__.__name__) self.logger = logger.getChild(self.__class__.__name__)
self.vban_config = get_configuration('vban') self.vban_config = get_configuration("vban")
self.app_config = get_configuration('app') self.app_config = get_configuration("app")
self._is_topmost = tk.BooleanVar() self._is_topmost = tk.BooleanVar()
self._lock = tk.BooleanVar() self._lock = tk.BooleanVar()
self._unlock = tk.BooleanVar() self._unlock = tk.BooleanVar()
@ -30,9 +30,9 @@ class Menus(tk.Menu):
# voicemeeter menu # voicemeeter menu
self.menu_voicemeeter = tk.Menu(self, tearoff=0) self.menu_voicemeeter = tk.Menu(self, tearoff=0)
self.add_cascade(menu=self.menu_voicemeeter, label='Voicemeeter') self.add_cascade(menu=self.menu_voicemeeter, label="Voicemeeter")
self.menu_voicemeeter.add_checkbutton( self.menu_voicemeeter.add_checkbutton(
label='Always On Top', label="Always On Top",
onvalue=1, onvalue=1,
offvalue=0, offvalue=0,
variable=self._is_topmost, variable=self._is_topmost,
@ -40,51 +40,51 @@ class Menus(tk.Menu):
) )
self.menu_voicemeeter.add_separator() self.menu_voicemeeter.add_separator()
self.menu_voicemeeter.add_command( self.menu_voicemeeter.add_command(
label='Show', label="Show",
underline=0, underline=0,
command=partial(self.action_invoke_voicemeeter, 'show'), command=partial(self.action_invoke_voicemeeter, "show"),
) )
self.menu_voicemeeter.add_command( self.menu_voicemeeter.add_command(
label='Hide', label="Hide",
underline=0, underline=0,
command=partial(self.action_invoke_voicemeeter, 'hide'), command=partial(self.action_invoke_voicemeeter, "hide"),
) )
self.menu_voicemeeter.add_command( self.menu_voicemeeter.add_command(
label='Restart', label="Restart",
underline=0, underline=0,
command=partial(self.action_invoke_voicemeeter, 'restart'), command=partial(self.action_invoke_voicemeeter, "restart"),
) )
self.menu_voicemeeter.add_command( self.menu_voicemeeter.add_command(
label='Shutdown', label="Shutdown",
underline=0, underline=0,
command=partial(self.action_invoke_voicemeeter, 'shutdown'), command=partial(self.action_invoke_voicemeeter, "shutdown"),
) )
self.menu_voicemeeter.add_separator() self.menu_voicemeeter.add_separator()
self.menu_lock = tk.Menu(self.menu_voicemeeter, tearoff=0) self.menu_lock = tk.Menu(self.menu_voicemeeter, tearoff=0)
self.menu_voicemeeter.add_cascade( self.menu_voicemeeter.add_cascade(
menu=self.menu_lock, label='GUI Lock', underline=0 menu=self.menu_lock, label="GUI Lock", underline=0
) )
self.menu_lock.add_checkbutton( self.menu_lock.add_checkbutton(
label='Lock', label="Lock",
onvalue=1, onvalue=1,
offvalue=0, offvalue=0,
variable=self._lock, variable=self._lock,
command=partial(self.action_set_voicemeeter, 'lock'), command=partial(self.action_set_voicemeeter, "lock"),
) )
self.menu_lock.add_checkbutton( self.menu_lock.add_checkbutton(
label='Unlock', label="Unlock",
onvalue=1, onvalue=1,
offvalue=0, offvalue=0,
variable=self._unlock, variable=self._unlock,
command=partial(self.action_set_voicemeeter, 'lock', False), command=partial(self.action_set_voicemeeter, "lock", False),
) )
# configs menu # configs menu
self.menu_configs = tk.Menu(self, tearoff=0) self.menu_configs = tk.Menu(self, tearoff=0)
self.add_cascade(menu=self.menu_configs, label='Configs') self.add_cascade(menu=self.menu_configs, label="Configs")
self.menu_configs_load = tk.Menu(self.menu_configs, tearoff=0) self.menu_configs_load = tk.Menu(self.menu_configs, tearoff=0)
self.menu_configs.add_cascade(menu=self.menu_configs_load, label='Load config') self.menu_configs.add_cascade(menu=self.menu_configs_load, label="Load config")
self.config_defaults = {'reset'} self.config_defaults = {"reset"}
if len(self.parent.userconfigs) > len(self.config_defaults) and all( if len(self.parent.userconfigs) > len(self.config_defaults) and all(
key in self.parent.userconfigs for key in self.config_defaults key in self.parent.userconfigs for key in self.config_defaults
): ):
@ -96,24 +96,22 @@ class Menus(tk.Menu):
if profile not in self.config_defaults if profile not in self.config_defaults
] ]
else: else:
self.menu_configs.entryconfig(0, state='disabled') self.menu_configs.entryconfig(0, state="disabled")
self.menu_configs.add_command( self.menu_configs.add_command(
label='Reset to defaults', command=self.load_defaults label="Reset to defaults", command=self.load_defaults
) )
# layout menu # layout menu
self.menu_layout = tk.Menu(self, tearoff=0) self.menu_layout = tk.Menu(self, tearoff=0)
self.add_cascade(menu=self.menu_layout, label='Layout') self.add_cascade(menu=self.menu_layout, label="Layout")
# layout/submixes # layout/submixes
# here we build menu regardless of kind but disable if not potato # here we build menu regardless of kind but disable if not potato
buses = tuple(f'A{i + 1}' for i in range(5)) + tuple( buses = tuple(f"A{i+1}" for i in range(5)) + tuple(f"B{i+1}" for i in range(3))
f'B{i + 1}' for i in range(3)
)
self.menu_submixes = tk.Menu(self.menu_layout, tearoff=0) self.menu_submixes = tk.Menu(self.menu_layout, tearoff=0)
self.menu_layout.add_cascade(menu=self.menu_submixes, label='Submixes') self.menu_layout.add_cascade(menu=self.menu_submixes, label="Submixes")
[ [
self.menu_submixes.add_checkbutton( self.menu_submixes.add_checkbutton(
label=f'Bus {buses[i]}', label=f"Bus {buses[i]}",
underline=0, underline=0,
onvalue=1, onvalue=1,
offvalue=0, offvalue=0,
@ -123,94 +121,94 @@ class Menus(tk.Menu):
for i in range(8) for i in range(8)
] ]
self._selected_bus[_configuration.submixes].set(True) self._selected_bus[_configuration.submixes].set(True)
if self.parent.kind.name != 'potato': if self.parent.kind.name != "potato":
self.menu_layout.entryconfig(0, state='disabled') self.menu_layout.entryconfig(0, state="disabled")
# layout/extends # layout/extends
self.menu_extends = tk.Menu(self.menu_layout, tearoff=0) self.menu_extends = tk.Menu(self.menu_layout, tearoff=0)
self.menu_layout.add_cascade( self.menu_layout.add_cascade(
menu=self.menu_extends, label='Extends', underline=0 menu=self.menu_extends, label="Extends", underline=0
) )
self.menu_extends.add_command( self.menu_extends.add_command(
label='horizontal', label="horizontal",
underline=0, underline=0,
command=partial(self.switch_orientation, extends_horizontal=True), command=partial(self.switch_orientation, extends_horizontal=True),
) )
self.menu_extends.add_command( self.menu_extends.add_command(
label='vertical', label="vertical",
underline=0, underline=0,
command=partial(self.switch_orientation, extends_horizontal=False), command=partial(self.switch_orientation, extends_horizontal=False),
) )
self.menu_extends.entryconfig( self.menu_extends.entryconfig(
0 if _configuration.extends_horizontal else 1, state='disabled' 0 if _configuration.extends_horizontal else 1, state="disabled"
) )
# layout/themes # layout/themes
self.menu_themes = tk.Menu(self.menu_layout, tearoff=0) self.menu_themes = tk.Menu(self.menu_layout, tearoff=0)
self.menu_layout.add_cascade(menu=self.menu_themes, label='Themes') self.menu_layout.add_cascade(menu=self.menu_themes, label="Themes")
self.menu_themes.add_command( self.menu_themes.add_command(
label='light', command=partial(self.load_theme, 'light') label="light", command=partial(self.load_theme, "light")
) )
self.menu_themes.add_command( self.menu_themes.add_command(
label='dark', command=partial(self.load_theme, 'dark') label="dark", command=partial(self.load_theme, "dark")
) )
self.menu_themes.entryconfig( self.menu_themes.entryconfig(
0 if self.app_config['theme']['mode'] == 'light' else 1, 0 if self.app_config["theme"]["mode"] == "light" else 1,
state='disabled', state="disabled",
) )
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
self.menu_layout.entryconfig(2, state='disabled') self.menu_layout.entryconfig(2, state="disabled")
# layout/navigation # layout/navigation
self.menu_navigation = tk.Menu(self.menu_layout, tearoff=0) self.menu_navigation = tk.Menu(self.menu_layout, tearoff=0)
self.menu_layout.add_cascade(menu=self.menu_navigation, label='Navigation') self.menu_layout.add_cascade(menu=self.menu_navigation, label="Navigation")
self.menu_navigation.add_checkbutton( self.menu_navigation.add_checkbutton(
label='show', label="show",
onvalue=1, onvalue=1,
offvalue=0, offvalue=0,
variable=self._navigation_show, variable=self._navigation_show,
command=partial(self.toggle_navigation, 'show'), command=partial(self.toggle_navigation, "show"),
) )
self.menu_navigation.add_checkbutton( self.menu_navigation.add_checkbutton(
label='hide', label="hide",
onvalue=1, onvalue=1,
offvalue=0, offvalue=0,
variable=self._navigation_hide, variable=self._navigation_hide,
command=partial(self.toggle_navigation, 'hide'), command=partial(self.toggle_navigation, "hide"),
) )
# vban connect menu # vban connect menu
self.menu_vban = tk.Menu(self, tearoff=0) self.menu_vban = tk.Menu(self, tearoff=0)
self.add_cascade(menu=self.menu_vban, label='VBAN') self.add_cascade(menu=self.menu_vban, label="VBAN")
if self.vban_config: if self.vban_config:
for i, _ in enumerate(self.vban_config): for i, _ in enumerate(self.vban_config):
setattr(self, f'menu_vban_{i + 1}', tk.Menu(self.menu_vban, tearoff=0)) setattr(self, f"menu_vban_{i+1}", tk.Menu(self.menu_vban, tearoff=0))
target_menu = getattr(self, f'menu_vban_{i + 1}') target_menu = getattr(self, f"menu_vban_{i+1}")
self.menu_vban.add_cascade( self.menu_vban.add_cascade(
menu=target_menu, menu=target_menu,
label=f'{self.vban_config[f"connection-{i + 1}"]["streamname"]}', label=f"{self.vban_config[f'connection-{i+1}']['streamname']}",
underline=0, underline=0,
) )
target_menu.add_command( target_menu.add_command(
label='Connect', command=partial(self.vban_connect, i) label="Connect", command=partial(self.vban_connect, i)
) )
target_menu.add_command( target_menu.add_command(
label='Disconnect', command=partial(self.vban_disconnect, i) label="Disconnect", command=partial(self.vban_disconnect, i)
) )
target_menu.entryconfig(1, state='disabled') target_menu.entryconfig(1, state="disabled")
else: else:
self.entryconfig(4, state='disabled') self.entryconfig(4, state="disabled")
# Help menu # Help menu
self.menu_help = tk.Menu(self, tearoff=0) self.menu_help = tk.Menu(self, tearoff=0)
self.add_cascade(menu=self.menu_help, label='Help') self.add_cascade(menu=self.menu_help, label="Help")
self.menu_help.add_command( self.menu_help.add_command(
label='Voicemeeter Site', label="Voicemeeter Site",
command=self.documentation, command=self.documentation,
) )
self.menu_help.add_command( self.menu_help.add_command(
label='Source Code', label="Source Code",
command=self.github, command=self.github,
) )
self.menu_help.add_command( self.menu_help.add_command(
label='App Creator', label="App Creator",
command=self.onyxandiris, command=self.onyxandiris,
) )
@ -221,56 +219,52 @@ class Menus(tk.Menu):
def enable_vban_menus(self): def enable_vban_menus(self):
[ [
self.menu_vban.entryconfig(j, state='normal') self.menu_vban.entryconfig(j, state="normal")
for j, _ in enumerate(self.menu_vban.winfo_children()) for j, _ in enumerate(self.menu_vban.winfo_children())
] ]
def action_invoke_voicemeeter(self, cmd): def action_invoke_voicemeeter(self, cmd):
if fn := getattr(self.target.command, cmd): if fn := getattr(self.target.command, cmd):
fn() fn()
if cmd == 'shutdown': if cmd == "shutdown":
self.parent.on_close_window() self.parent.on_close_window()
def action_set_voicemeeter(self, cmd, val=True): def action_set_voicemeeter(self, cmd, val=True):
if cmd == 'lock': if cmd == "lock":
self._lock.set(val) self._lock.set(val)
self._unlock.set(not self._lock.get()) self._unlock.set(not self._lock.get())
setattr(self.target.command, cmd, val) setattr(self.target.command, cmd, val)
def load_custom_profile(self, profile): def load_custom_profile(self, profile):
self.logger.info(f'loading user profile {profile}') self.logger.info(f"loading user profile {profile}")
self.target.apply(profile) self.target.apply(profile)
if not _base_values.run_update:
self.parent.subject.notify('pdirty')
def load_profile(self, profile): def load_profile(self, profile):
self.logger.info(f'loading user profile {profile}') self.logger.info(f"loading user profile {profile}")
self.target.apply_config(profile) self.target.apply_config(profile)
if not _base_values.run_update:
self.parent.subject.notify('pdirty')
def load_defaults(self): def load_defaults(self):
msg = ( msg = (
'Are you sure you want to Reset values to defaults?', "Are you sure you want to Reset values to defaults?",
'Physical strips B1, Virtual strips A1', "Physical strips B1, Virtual strips A1",
'Mono, Solo, Mute, EQ all OFF', "Mono, Solo, Mute, EQ all OFF",
'Gain sliders for Strip/Bus at 0.0', "Gain sliders for Strip/Bus at 0.0",
) )
resp = messagebox.askyesno(message='\n'.join(msg)) resp = messagebox.askyesno(message="\n".join(msg))
if resp: if resp:
self.load_profile('reset') self.load_profile("reset")
def always_on_top(self): def always_on_top(self):
self.parent.attributes('-topmost', self._is_topmost.get()) self.parent.attributes("-topmost", self._is_topmost.get())
def switch_orientation(self, extends_horizontal: bool = True, *args): def switch_orientation(self, extends_horizontal: bool = True, *args):
_configuration.extends_horizontal = extends_horizontal _configuration.extends_horizontal = extends_horizontal
if extends_horizontal: if extends_horizontal:
self.menu_extends.entryconfig(0, state='disabled') self.menu_extends.entryconfig(0, state="disabled")
self.menu_extends.entryconfig(1, state='normal') self.menu_extends.entryconfig(1, state="normal")
else: else:
self.menu_extends.entryconfig(1, state='disabled') self.menu_extends.entryconfig(1, state="disabled")
self.menu_extends.entryconfig(0, state='normal') self.menu_extends.entryconfig(0, state="normal")
def set_submix(self, i): def set_submix(self, i):
if _configuration.submixes != i: if _configuration.submixes != i:
@ -280,38 +274,38 @@ class Menus(tk.Menu):
self.parent.nav_frame.show_submix() self.parent.nav_frame.show_submix()
for j, var in enumerate(self._selected_bus): for j, var in enumerate(self._selected_bus):
var.set(i == j) var.set(i == j)
self.parent.subject.notify('submix') self.parent.subject.notify("submix")
def load_theme(self, theme): def load_theme(self, theme):
sv_ttk.set_theme(theme) sv_ttk.set_theme(theme)
_configuration.theme_mode = theme _configuration.theme_mode = theme
self.menu_themes.entryconfig( self.menu_themes.entryconfig(
0, 0,
state=f'{"disabled" if theme == "light" else "normal"}', state=f"{'disabled' if theme == 'light' else 'normal'}",
) )
self.menu_themes.entryconfig( self.menu_themes.entryconfig(
1, 1,
state=f'{"disabled" if theme == "dark" else "normal"}', state=f"{'disabled' if theme == 'dark' else 'normal'}",
) )
[ [
menu.config(bg=f'{"black" if theme == "dark" else "white"}') menu.config(bg=f"{'black' if theme == 'dark' else 'white'}")
for menu in self.winfo_children() for menu in self.winfo_children()
if isinstance(menu, tk.Menu) if isinstance(menu, tk.Menu)
] ]
self.menu_lock.config(bg=f'{"black" if theme == "dark" else "white"}') self.menu_lock.config(bg=f"{'black' if theme == 'dark' else 'white'}")
self.menu_configs_load.config(bg=f'{"black" if theme == "dark" else "white"}') self.menu_configs_load.config(bg=f"{'black' if theme == 'dark' else 'white'}")
[ [
menu.config(bg=f'{"black" if theme == "dark" else "white"}') menu.config(bg=f"{'black' if theme == 'dark' else 'white'}")
for menu in self.menu_vban.winfo_children() for menu in self.menu_vban.winfo_children()
if isinstance(menu, tk.Menu) if isinstance(menu, tk.Menu)
] ]
[ [
menu.config(bg=f'{"black" if theme == "dark" else "white"}') menu.config(bg=f"{'black' if theme == 'dark' else 'white'}")
for menu in self.menu_layout.winfo_children() for menu in self.menu_layout.winfo_children()
if isinstance(menu, tk.Menu) if isinstance(menu, tk.Menu)
] ]
self.logger.info( self.logger.info(
f'Finished loading theme Sunvalley {sv_ttk.get_theme().capitalize()} theme' f"Finished loading theme Sunvalley {sv_ttk.get_theme().capitalize()} theme"
) )
def menu_teardown(self, i): def menu_teardown(self, i):
@ -322,10 +316,10 @@ class Menus(tk.Menu):
try: try:
self.menu_configs_load.delete(profile) self.menu_configs_load.delete(profile)
except tk._tkinter.tclError as e: except tk._tkinter.tclError as e:
self.logger.warning(f'{type(e).__name__}: {e}') self.logger.warning(f"{type(e).__name__}: {e}")
[ [
self.menu_vban.entryconfig(j, state='disabled') self.menu_vban.entryconfig(j, state="disabled")
for j, _ in enumerate(self.menu_vban.winfo_children()) for j, _ in enumerate(self.menu_vban.winfo_children())
if j != i if j != i
] ]
@ -337,44 +331,44 @@ class Menus(tk.Menu):
self.menu_configs_load.add_command( self.menu_configs_load.add_command(
label=profile, command=partial(self.load_profile, profile) label=profile, command=partial(self.load_profile, profile)
) )
self.menu_configs.entryconfig(0, state='normal') self.menu_configs.entryconfig(0, state="normal")
else: else:
self.menu_configs.entryconfig(0, state='disabled') self.menu_configs.entryconfig(0, state="disabled")
def toggle_navigation(self, cmd=None): def toggle_navigation(self, cmd=None):
if cmd == 'show': if cmd == "show":
self.logger.debug('show navframe') self.logger.debug("show navframe")
self.parent.nav_frame.grid() self.parent.nav_frame.grid()
self._navigation_show.set(True) self._navigation_show.set(True)
self._navigation_hide.set(not self._navigation_show.get()) self._navigation_hide.set(not self._navigation_show.get())
else: else:
self.logger.debug('hide navframe') self.logger.debug("hide navframe")
self.parent.nav_frame.grid_remove() self.parent.nav_frame.grid_remove()
self._navigation_hide.set(True) self._navigation_hide.set(True)
self._navigation_show.set(not self._navigation_hide.get()) self._navigation_show.set(not self._navigation_hide.get())
def vban_connect(self, i): def vban_connect(self, i):
opts = {} opts = {}
opts |= self.vban_config[f'connection-{i + 1}'] opts |= self.vban_config[f"connection-{i+1}"]
kind_id = opts.pop('kind') kind_id = opts.pop("kind")
self.vban = vban_cmd.api(kind_id, **opts) self.vban = vban_cmd.api(kind_id, **opts)
# login to vban interface # login to vban interface
try: try:
self.logger.info(f'Attempting vban connection to {opts.get("ip")}') self.logger.info(f"Attempting vban connection to {opts.get('ip')}")
self.vban.login() self.vban.login()
except VBANCMDConnectionError as e: except VBANCMDConnectionError as e:
self.vban.logout() self.vban.logout()
msg = ( msg = (
f'Timeout attempting to establish connection to {opts.get("ip")}', f"Timeout attempting to establish connection to {opts.get('ip')}",
'Please check your connection settings', f"Please check your connection settings",
) )
messagebox.showerror('Connection Error', '\n'.join(msg)) messagebox.showerror("Connection Error", "\n".join(msg))
msg = (str(e), 'resuming local connection') msg = (str(e), f"resuming local connection")
self.logger.error(', '.join(msg)) self.logger.error(", ".join(msg))
self.after(1, self.enable_vban_menus) self.after(1, self.enable_vban_menus)
return return
self.menu_teardown(i) self.menu_teardown(i)
self.vban.event.add(['pdirty', 'ldirty']) self.vban.event.add(["pdirty", "ldirty"])
# destroy the current App frames # destroy the current App frames
self.parent._destroy_top_level_frames() self.parent._destroy_top_level_frames()
_base_values.vban_connected = True _base_values.vban_connected = True
@ -383,17 +377,17 @@ class Menus(tk.Menu):
# build new app frames according to a kind # build new app frames according to a kind
kind = kind_get(kind_id) kind = kind_get(kind_id)
self.parent.build_app(kind, self.vban) self.parent.build_app(kind, self.vban)
target_menu = getattr(self, f'menu_vban_{i + 1}') target_menu = getattr(self, f"menu_vban_{i+1}")
target_menu.entryconfig(0, state='disabled') target_menu.entryconfig(0, state="disabled")
target_menu.entryconfig(1, state='normal') target_menu.entryconfig(1, state="normal")
self.menu_layout.entryconfig( self.menu_layout.entryconfig(
0, state=f'{"normal" if kind.name == "potato" else "disabled"}' 0, state=f"{'normal' if kind.name == 'potato' else 'disabled'}"
) )
# ensure the configs are reloaded into memory # ensure the configs are reloaded into memory
if 'config' in self.parent.target.__dict__: if "config" in self.parent.target.__dict__:
del self.parent.target.__dict__['config'] del self.parent.target.__dict__["config"]
if 'userconfigs' in self.parent.__dict__: if "userconfigs" in self.parent.__dict__:
del self.parent.__dict__['userconfigs'] del self.parent.__dict__["userconfigs"]
self.menu_setup() self.menu_setup()
def vban_disconnect(self, i): def vban_disconnect(self, i):
@ -408,26 +402,26 @@ class Menus(tk.Menu):
# build new app frames according to a kind # build new app frames according to a kind
kind = kind_get(self.vmr.type) kind = kind_get(self.vmr.type)
self.parent.build_app(kind) self.parent.build_app(kind)
target_menu = getattr(self, f'menu_vban_{i + 1}') target_menu = getattr(self, f"menu_vban_{i+1}")
target_menu.entryconfig(0, state='normal') target_menu.entryconfig(0, state="normal")
target_menu.entryconfig(1, state='disabled') target_menu.entryconfig(1, state="disabled")
self.menu_layout.entryconfig( self.menu_layout.entryconfig(
0, state=f'{"normal" if kind.name == "potato" else "disabled"}' 0, state=f"{'normal' if kind.name == 'potato' else 'disabled'}"
) )
# ensure the configs are reloaded into memory # ensure the configs are reloaded into memory
if 'config' in self.parent.target.__dict__: if "config" in self.parent.target.__dict__:
del self.parent.target.__dict__['config'] del self.parent.target.__dict__["config"]
if 'userconfigs' in self.parent.__dict__: if "userconfigs" in self.parent.__dict__:
del self.parent.__dict__['userconfigs'] del self.parent.__dict__["userconfigs"]
self.menu_setup() self.menu_setup()
self.after(500, self.enable_vban_menus) self.after(15000, self.enable_vban_menus)
def documentation(self): def documentation(self):
webbrowser.open_new(r'https://voicemeeter.com/') webbrowser.open_new(r"https://voicemeeter.com/")
def github(self): def github(self):
webbrowser.open_new(r'https://github.com/onyx-and-iris/voicemeeter-compact') webbrowser.open_new(r"https://github.com/onyx-and-iris/voicemeeter-compact")
def onyxandiris(self): def onyxandiris(self):
webbrowser.open_new(r'https://onyxandiris.online') webbrowser.open_new(r"https://onyxandiris.online")

View File

@ -33,7 +33,7 @@ class Navigation(ttk.Frame):
if self.submix.get(): if self.submix.get():
self.parent.submix_frame = SubMixFrame(self.parent) self.parent.submix_frame = SubMixFrame(self.parent)
self.logger.info( self.logger.info(
f'Finished building submixframe for submix {_configuration.submixes}' f"Finished building submixframe for submix {_configuration.submixes}"
) )
else: else:
if _configuration.extends_horizontal: if _configuration.extends_horizontal:
@ -49,51 +49,51 @@ class Navigation(ttk.Frame):
else: else:
self.parent.rowconfigure(2, weight=0, minsize=0) self.parent.rowconfigure(2, weight=0, minsize=0)
self.logger.info( self.logger.info(
f'Finished tearing down submixframe for submix {_configuration.submixes}' f"Finished tearing down submixframe for submix {_configuration.submixes}"
) )
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
self.styletable.configure( self.styletable.configure(
'Submix.TButton', f"Submix.TButton",
background=f'{"purple" if self.submix.get() else "white"}', background=f'{"purple" if self.submix.get() else "white"}',
) )
def switch_channel(self): def switch_channel(self):
if self.channel_text.get() == 'STRIP': if self.channel_text.get() == "STRIP":
self.mainframebuilder.create_channelframe('bus') self.mainframebuilder.create_channelframe("bus")
self.parent.strip_frame.teardown() self.parent.strip_frame.teardown()
else: else:
self.mainframebuilder.create_channelframe('strip') self.mainframebuilder.create_channelframe("strip")
self.parent.bus_frame.teardown() self.parent.bus_frame.teardown()
self.extend_button['state'] = ( self.extend_button["state"] = (
'disabled' if self.channel_text.get() == 'STRIP' else 'normal' "disabled" if self.channel_text.get() == "STRIP" else "normal"
) )
[frame.teardown() for frame in self.parent.configframes] [frame.teardown() for frame in self.parent.configframes]
self.channel_text.set('BUS' if self.channel_text.get() == 'STRIP' else 'STRIP') self.channel_text.set("BUS" if self.channel_text.get() == "STRIP" else "STRIP")
def extend_frame(self): def extend_frame(self):
_configuration.extended = self.extend.get() _configuration.extended = self.extend.get()
if self.extend.get(): if self.extend.get():
self.channel_button['state'] = 'disabled' self.channel_button["state"] = "disabled"
self.mainframebuilder.create_channelframe('bus') self.mainframebuilder.create_channelframe("bus")
else: else:
[ [
frame.teardown() frame.teardown()
for frame in self.parent.configframes for frame in self.parent.configframes
if '!busconfig' in str(frame) if "!busconfig" in str(frame)
] ]
self.parent.bus_frame.teardown() self.parent.bus_frame.teardown()
self.parent.bus_frame = None self.parent.bus_frame = None
self.channel_button['state'] = 'normal' self.channel_button["state"] = "normal"
if self.parent.submix_frame: if self.parent.submix_frame:
self.parent.submix_frame.teardown() self.parent.submix_frame.teardown()
self.submix.set(False) self.submix.set(False)
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
self.styletable.configure( self.styletable.configure(
'Submix.TButton', f"Submix.TButton",
background=f'{"purple" if self.submix.get() else "white"}', background=f'{"purple" if self.submix.get() else "white"}',
) )
self.extend_text.set('REDUCE' if self.extend.get() else 'EXTEND') self.extend_text.set("REDUCE" if self.extend.get() else "EXTEND")