mirror of
https://github.com/onyx-and-iris/voicemeeter-api-python.git
synced 2024-11-15 16:40:46 +00:00
move updater thread logic out of base class.
patch bump
This commit is contained in:
parent
a54a232a82
commit
ef0c94a6f1
@ -1,6 +1,6 @@
|
|||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "voicemeeter-api"
|
name = "voicemeeter-api"
|
||||||
version = "0.7.0"
|
version = "0.7.1"
|
||||||
description = "A Python wrapper for the Voiceemeter API"
|
description = "A Python wrapper for the Voiceemeter API"
|
||||||
authors = ["onyx-and-iris <code@onyxandiris.online>"]
|
authors = ["onyx-and-iris <code@onyxandiris.online>"]
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
@ -2,7 +2,6 @@ import ctypes as ct
|
|||||||
import time
|
import time
|
||||||
from abc import abstractmethod
|
from abc import abstractmethod
|
||||||
from functools import partial
|
from functools import partial
|
||||||
from threading import Thread
|
|
||||||
from typing import Iterable, NoReturn, Optional, Union
|
from typing import Iterable, NoReturn, Optional, Union
|
||||||
|
|
||||||
from .cbindings import CBindings
|
from .cbindings import CBindings
|
||||||
@ -11,7 +10,8 @@ from .inst import bits
|
|||||||
from .kinds import KindId
|
from .kinds import KindId
|
||||||
from .misc import Event, Midi
|
from .misc import Event, Midi
|
||||||
from .subject import Subject
|
from .subject import Subject
|
||||||
from .util import comp, grouper, polling, script
|
from .util import grouper, polling, script
|
||||||
|
from .worker import Updater
|
||||||
|
|
||||||
|
|
||||||
class Remote(CBindings):
|
class Remote(CBindings):
|
||||||
@ -47,36 +47,8 @@ class Remote(CBindings):
|
|||||||
"""Starts updates thread."""
|
"""Starts updates thread."""
|
||||||
self.running = True
|
self.running = True
|
||||||
print(f"Listening for {', '.join(self.event.get())} events")
|
print(f"Listening for {', '.join(self.event.get())} events")
|
||||||
t = Thread(target=self._updates, daemon=True)
|
self.updater = Updater(self)
|
||||||
t.start()
|
self.updater.start()
|
||||||
|
|
||||||
def _updates(self):
|
|
||||||
"""
|
|
||||||
Continously update observers of dirty states.
|
|
||||||
|
|
||||||
Generate _strip_comp, _bus_comp and update level cache if ldirty.
|
|
||||||
|
|
||||||
Runs updates at a rate of self.ratelimit.
|
|
||||||
"""
|
|
||||||
while self.running:
|
|
||||||
if self.event.pdirty and self.pdirty:
|
|
||||||
self.subject.notify("pdirty")
|
|
||||||
if self.event.mdirty and self.mdirty:
|
|
||||||
self.subject.notify("mdirty")
|
|
||||||
if self.event.midi and self.get_midi_message():
|
|
||||||
self.subject.notify("midi")
|
|
||||||
if self.event.ldirty and self.ldirty:
|
|
||||||
self._strip_comp, self._bus_comp = (
|
|
||||||
tuple(
|
|
||||||
not x for x in comp(self.cache["strip_level"], self._strip_buf)
|
|
||||||
),
|
|
||||||
tuple(not x for x in comp(self.cache["bus_level"], self._bus_buf)),
|
|
||||||
)
|
|
||||||
self.cache["strip_level"] = self._strip_buf
|
|
||||||
self.cache["bus_level"] = self._bus_buf
|
|
||||||
self.subject.notify("ldirty")
|
|
||||||
|
|
||||||
time.sleep(self.ratelimit if self.event.any() else 0.5)
|
|
||||||
|
|
||||||
def login(self) -> NoReturn:
|
def login(self) -> NoReturn:
|
||||||
"""Login to the API, initialize dirty parameters"""
|
"""Login to the API, initialize dirty parameters"""
|
||||||
|
44
voicemeeterlib/updater.py
Normal file
44
voicemeeterlib/updater.py
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
import threading
|
||||||
|
import time
|
||||||
|
|
||||||
|
from .util import comp
|
||||||
|
|
||||||
|
|
||||||
|
class Updater(threading.Thread):
|
||||||
|
def __init__(self, remote):
|
||||||
|
super().__init__(name="updater", target=self.update, daemon=True)
|
||||||
|
self._remote = remote
|
||||||
|
|
||||||
|
def update(self):
|
||||||
|
"""
|
||||||
|
Continously update observers of dirty states.
|
||||||
|
|
||||||
|
Generate _strip_comp, _bus_comp and update level cache if ldirty.
|
||||||
|
|
||||||
|
Runs updates at a rate of self.ratelimit.
|
||||||
|
"""
|
||||||
|
while self._remote.running:
|
||||||
|
if self._remote.event.pdirty and self._remote.pdirty:
|
||||||
|
self._remote.subject.notify("pdirty")
|
||||||
|
if self._remote.event.mdirty and self._remote.mdirty:
|
||||||
|
self._remote.subject.notify("mdirty")
|
||||||
|
if self._remote.event.midi and self._remote.get_midi_message():
|
||||||
|
self._remote.subject.notify("midi")
|
||||||
|
if self._remote.event.ldirty and self._remote.ldirty:
|
||||||
|
self._remote._strip_comp, self._remote._bus_comp = (
|
||||||
|
tuple(
|
||||||
|
not x
|
||||||
|
for x in comp(
|
||||||
|
self.cache["strip_level"], self._remote._strip_buf
|
||||||
|
)
|
||||||
|
),
|
||||||
|
tuple(
|
||||||
|
not x
|
||||||
|
for x in comp(self.cache["bus_level"], self._remote._bus_buf)
|
||||||
|
),
|
||||||
|
)
|
||||||
|
self._remote.cache["strip_level"] = self._remote._strip_buf
|
||||||
|
self._remote.cache["bus_level"] = self._remote._bus_buf
|
||||||
|
self._remote.subject.notify("ldirty")
|
||||||
|
|
||||||
|
time.sleep(self._remote.ratelimit if self._remote.event.any() else 0.5)
|
Loading…
Reference in New Issue
Block a user