add vrmanifest, fix profile parameters

I5UCC · Sep 9, 2023 · 652077a · 652077a
1 parent 488dd5e
commit 652077a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/app.vrmanifest b/src/app.vrmanifest
@@ -2,14 +2,14 @@
 	"source": "builtin",
 	"applications": [
 		{
-			"app_key": "i5ucc.VRCVoiceMeeterControl",
+			"app_key": "i5ucc.VRCMeeter",
 			"launch_type": "binary",
-			"binary_path_windows": "./VRCVoiceMeeterControl_NoConsole.exe",
+			"binary_path_windows": "./VRCMeeter_NoConsole.exe",
 			"is_dashboard_overlay": true,
 
 			"strings": {
 				"en_us": {
-					"name": "VRCVoiceMeeterControl",
+					"name": "VRCMeeter",
 					"description": "Lets you control Voicemeeter from within VRChat over OSC"
 				}
 			}

diff --git a/src/main.py b/src/main.py
@@ -13,6 +13,7 @@
 from psutil import process_iter
 from threading import Thread, Timer
 import logging
+import openvr
 
 
 class RepeatedTimer(object):
@@ -174,6 +175,7 @@ def exit():
 PARAMETER_RESTART = "/avatar/parameters/vm_restart"
 PARAMETER_PREFIX_IN = "/avatar/parameters/vm_in_"
 PARAMETER_PREFIX_OUT = "/avatar/parameters/vm_out_"
+PARAMETER_PREFIX_PROFILE = "/avatar/parameters/vm_profile_"
 
 if OSC_SERVER_PORT != 9001:
     logging.info("OSC Server port is not default, testing port availability and advertising OSCQuery endpoints")
@@ -185,8 +187,12 @@ def exit():
     logging.info("OSC Server port is default.")
 
 try:
+    application = openvr.init(openvr.VRApplication_Utility)
+    openvr.VRApplications().addApplicationManifest(get_absolute_path("app.vrmanifest"))
+    logging.info("Added VRManifest.")
     vmr = voicemeeter.remote(KIND)
     vmr.login()
+    logging.info("Logged in to Voicemeeter.")
     if conf["startup_profile"] is not None and conf["startup_profile"] != "":
         set_profile(conf["startup_profile"], None)
 except Exception as e:
@@ -220,8 +226,8 @@ def exit():
     disp.map(PARAMETER_RESTART, lambda addr, value: vmr.restart())
     logging.info(f"Bound restart to {PARAMETER_RESTART}")
     for i in range(len(PROFILES)):
-        disp.map(f"{PARAMETER_PREFIX_IN}profile_{i}", lambda addr, value: set_profile(int(addr.split('_')[-1]), value))
-        logging.info(f"Bound profile {PROFILES[i]} to {PARAMETER_PREFIX_IN}profile_{i}")
+        disp.map(f"{PARAMETER_PREFIX_PROFILE}{i}", lambda addr, value: set_profile(int(addr.split('_')[-1]), value))
+        logging.info(f"Bound profile {PROFILES[i]} to {PARAMETER_PREFIX_PROFILE}{i}")
 
     for strip in STRIPS_IN:
         disp.map(f"{PARAMETER_PREFIX_IN}gain_{strip}", set_gain_variable)
@@ -244,7 +250,7 @@ def exit():
     oscqs.advertise_endpoint(AVATAR_CHANGE_PARAMETER, access="readwrite")
     oscqs.advertise_endpoint(PARAMETER_RESTART, access="readwrite")
     for i in range(len(PROFILES)):
-        oscqs.advertise_endpoint(f"{PARAMETER_PREFIX_IN}profile_{i}", access="readwrite")
+        oscqs.advertise_endpoint(f"{PARAMETER_PREFIX_PROFILE}{i}", access="readwrite")
 
     for strip in STRIPS_IN:
         oscqs.advertise_endpoint(f"{PARAMETER_PREFIX_IN}gain_{strip}", access="readwrite")

diff --git a/src/requirements.txt b/src/requirements.txt
@@ -2,4 +2,5 @@ python_osc
 zeroconf
 requests
 psutil
-toml
+toml
+openvr
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ python_osc @@
     zeroconf
     requests
     psutil
-    toml
+    toml
+    openvr