From 59624ccb3e12ce765aaa55eec3d2054b2380274d Mon Sep 17 00:00:00 2001 From: onyx-and-iris Date: Thu, 29 Jun 2023 18:05:07 +0100 Subject: [PATCH] add VmGUI class to misc. lets you check if gui was launched by the api --- voicemeeterlib/misc.py | 16 ++++++++++++++++ voicemeeterlib/remote.py | 7 ++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/voicemeeterlib/misc.py b/voicemeeterlib/misc.py index a63c0d2..1bbb357 100644 --- a/voicemeeterlib/misc.py +++ b/voicemeeterlib/misc.py @@ -250,3 +250,19 @@ class Midi: def _set(self, key: int, velocity: int): self.cache[key] = velocity + + +class VmGui: + _launched = None + + @property + def launched(self) -> bool: + return self._launched + + @launched.setter + def launched(self, val: bool): + self._launched = val + + @property + def launched_by_api(self): + return not self.launched diff --git a/voicemeeterlib/remote.py b/voicemeeterlib/remote.py index 88d6448..f51905c 100644 --- a/voicemeeterlib/remote.py +++ b/voicemeeterlib/remote.py @@ -10,7 +10,7 @@ from .error import CAPIError, VMError from .event import Event from .inst import bits from .kinds import KindId -from .misc import Midi +from .misc import Midi, VmGui from .subject import Subject from .updater import Producer, Updater from .util import grouper, polling, script @@ -32,6 +32,7 @@ class Remote(CBindings): self.event = Event( {k: kwargs.pop(k) for k in ("pdirty", "mdirty", "midi", "ldirty")} ) + self.gui = VmGui() self.logger = logger.getChild(self.__class__.__name__) for attr, val in kwargs.items(): @@ -63,8 +64,8 @@ class Remote(CBindings): def login(self) -> NoReturn: """Login to the API, initialize dirty parameters""" - res = self.call(self.vm_login, ok=(0, 1)) - if res == 1: + self.gui.launched = self.call(self.vm_login, ok=(0, 1)) == 0 + if not self.gui.launched: self.logger.info( "Voicemeeter engine running but GUI not launched. Launching the GUI now." )