mirror of
https://github.com/onyx-and-iris/voicemeeter-compact.git
synced 2026-04-08 17:03:32 +00:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3b6e1f61a4 | ||
|
|
3f306ddf62 | ||
|
|
732368a65b | ||
|
|
d7df79b798 | ||
|
|
0906f3343b | ||
|
|
294dfe7d03 |
10
poetry.lock
generated
10
poetry.lock
generated
@@ -1,10 +1,10 @@
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "black"
|
name = "black"
|
||||||
version = "22.8.0"
|
version = "22.10.0"
|
||||||
description = "The uncompromising code formatter."
|
description = "The uncompromising code formatter."
|
||||||
category = "dev"
|
category = "dev"
|
||||||
optional = false
|
optional = false
|
||||||
python-versions = ">=3.6.2"
|
python-versions = ">=3.7"
|
||||||
|
|
||||||
[package.dependencies]
|
[package.dependencies]
|
||||||
click = ">=8.0.0"
|
click = ">=8.0.0"
|
||||||
@@ -84,7 +84,7 @@ python-versions = ">=3.7"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vban-cmd"
|
name = "vban-cmd"
|
||||||
version = "1.5.3"
|
version = "1.8.1"
|
||||||
description = "Python interface for the VBAN RT Packet Service (Sendtext)"
|
description = "Python interface for the VBAN RT Packet Service (Sendtext)"
|
||||||
category = "main"
|
category = "main"
|
||||||
optional = false
|
optional = false
|
||||||
@@ -95,7 +95,7 @@ tomli = {version = ">=2.0.1,<3.0.0", markers = "python_version < \"3.11\""}
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "voicemeeter-api"
|
name = "voicemeeter-api"
|
||||||
version = "0.8.2"
|
version = "0.8.4"
|
||||||
description = "A Python wrapper for the Voiceemeter API"
|
description = "A Python wrapper for the Voiceemeter API"
|
||||||
category = "main"
|
category = "main"
|
||||||
optional = false
|
optional = false
|
||||||
@@ -107,7 +107,7 @@ tomli = {version = ">=2.0.1,<3.0.0", markers = "python_version < \"3.11\""}
|
|||||||
[metadata]
|
[metadata]
|
||||||
lock-version = "1.1"
|
lock-version = "1.1"
|
||||||
python-versions = "^3.10"
|
python-versions = "^3.10"
|
||||||
content-hash = "2da10e88db831f9945432bd84f6423aa16985e1d99cdd95d886101a361a5a922"
|
content-hash = "ba702e1c74c507e75070c2c58bffe5a7787d1dfa1b4ff7b5cedce7374871f7db"
|
||||||
|
|
||||||
[metadata.files]
|
[metadata.files]
|
||||||
black = []
|
black = []
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "voicemeeter-compact"
|
name = "voicemeeter-compact"
|
||||||
version = "1.6.1"
|
version = "1.6.5"
|
||||||
description = "A Compact Voicemeeter Remote App"
|
description = "A Compact Voicemeeter Remote App"
|
||||||
authors = ["onyx-and-iris <code@onyxandiris.online>"]
|
authors = ["onyx-and-iris <code@onyxandiris.online>"]
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
@@ -16,8 +16,8 @@ include = ["vmcompact/img/cat.ico"]
|
|||||||
python = "^3.10"
|
python = "^3.10"
|
||||||
sv-ttk = "^2.0"
|
sv-ttk = "^2.0"
|
||||||
tomli = { version = "^2.0.1", python = "<3.11" }
|
tomli = { version = "^2.0.1", python = "<3.11" }
|
||||||
voicemeeter-api = "^0.8.2"
|
voicemeeter-api = "^0.8.4"
|
||||||
vban-cmd = "^1.5.3"
|
vban-cmd = "^1.8.1"
|
||||||
|
|
||||||
[tool.poetry.dev-dependencies]
|
[tool.poetry.dev-dependencies]
|
||||||
black = {version = "^22.6.0", allow-prereleases = true}
|
black = {version = "^22.6.0", allow-prereleases = true}
|
||||||
|
|||||||
@@ -34,9 +34,8 @@ class App(tk.Tk):
|
|||||||
super().__init__()
|
super().__init__()
|
||||||
|
|
||||||
self._vmr = vmr
|
self._vmr = vmr
|
||||||
self._vmr.event.add("ldirty")
|
self._vmr.event.ldirty = True
|
||||||
self._vmr.event.remove("mdirty")
|
self._vmr.event.remove(["mdirty", "midi"])
|
||||||
self._vmr.event.remove("midi")
|
|
||||||
icon_path = Path(__file__).parent.resolve() / "img" / "cat.ico"
|
icon_path = Path(__file__).parent.resolve() / "img" / "cat.ico"
|
||||||
if icon_path.is_file():
|
if icon_path.is_file():
|
||||||
self.iconbitmap(str(icon_path))
|
self.iconbitmap(str(icon_path))
|
||||||
|
|||||||
@@ -226,7 +226,7 @@ class ChannelLabelFrameBuilder(AbstractBuilder):
|
|||||||
"""Adds a progress bar widget to a single label frame"""
|
"""Adds a progress bar widget to a single label frame"""
|
||||||
self.labelframe.pb = ttk.Progressbar(
|
self.labelframe.pb = ttk.Progressbar(
|
||||||
self.labelframe,
|
self.labelframe,
|
||||||
maximum=100,
|
maximum=72,
|
||||||
orient="vertical",
|
orient="vertical",
|
||||||
mode="determinate",
|
mode="determinate",
|
||||||
variable=self.labelframe.level,
|
variable=self.labelframe.level,
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ class Strip(ChannelLabelFrame):
|
|||||||
if self.target.levels.is_updated:
|
if self.target.levels.is_updated:
|
||||||
val = max(self.target.levels.prefader)
|
val = max(self.target.levels.prefader)
|
||||||
self.level.set(
|
self.level.set(
|
||||||
(0 if self.mute.get() else 100 + val - 18 + self.gain.get())
|
(0 if self.mute.get() else 72 + val - 12 + self.gain.get())
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -208,7 +208,7 @@ class Bus(ChannelLabelFrame):
|
|||||||
if self.index < self.parent.parent.kind.num_bus:
|
if self.index < self.parent.parent.kind.num_bus:
|
||||||
if self.target.levels.is_updated or self.level.get() != -118:
|
if self.target.levels.is_updated or self.level.get() != -118:
|
||||||
val = max(self.target.levels.all)
|
val = max(self.target.levels.all)
|
||||||
self.level.set((0 if self.mute.get() else 100 + val - 18))
|
self.level.set((0 if self.mute.get() else 72 + val - 12))
|
||||||
|
|
||||||
|
|
||||||
class ChannelFrame(ttk.Frame):
|
class ChannelFrame(ttk.Frame):
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ class GainLayer(ttk.LabelFrame):
|
|||||||
(
|
(
|
||||||
0
|
0
|
||||||
if self.parent.target.strip[self.index].mute or not self.on.get()
|
if self.parent.target.strip[self.index].mute or not self.on.get()
|
||||||
else 100 + val - 18 + self.gain.get()
|
else 72 + val - 12 + self.gain.get()
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -321,7 +321,7 @@ class Menus(tk.Menu):
|
|||||||
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("ldirty")
|
self.vban.event.ldirty = True
|
||||||
# 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
|
||||||
|
|||||||
Reference in New Issue
Block a user