Merge branch 'vrc_sfx' into develop

src-python/config.py

@@ -931,6 +931,17 @@ class Config:
             self._VRC_MIC_MUTE_SYNC = value
             self.saveConfig(inspect.currentframe().f_code.co_name, value)
 
+    @property
+    @json_serializable('NOTIFICATION_VRC_SFX')
+    def NOTIFICATION_VRC_SFX(self):
+        return self._NOTIFICATION_VRC_SFX
+
+    @NOTIFICATION_VRC_SFX.setter
+    def NOTIFICATION_VRC_SFX(self, value):
+        if isinstance(value, bool):
+            self._NOTIFICATION_VRC_SFX = value
+            self.saveConfig(inspect.currentframe().f_code.co_name, value)
+
     def init_config(self):
         # Read Only
         self._VERSION = "3.0.2"
@@ -1114,6 +1125,7 @@ class Config:
         self._SEND_RECEIVED_MESSAGE_TO_VRC = False
         self._LOGGER_FEATURE = False
         self._VRC_MIC_MUTE_SYNC = False
+        self._NOTIFICATION_VRC_SFX = True
 
     def load_config(self):
         if os_path.isfile(self.PATH_CONFIG) is not False:

src-python/controller.py

@@ -1099,6 +1099,20 @@ class Controller:
         model.setOscPort(config.OSC_PORT)
         return {"status":200, "result":config.OSC_PORT}
 
+    @staticmethod
+    def getNotificationVrcSfx(*args, **kwargs) -> dict:
+        return {"status":200, "result":config.NOTIFICATION_VRC_SFX}
+
+    @staticmethod
+    def setEnableNotificationVrcSfx(*args, **kwargs) -> dict:
+        config.NOTIFICATION_VRC_SFX = True
+        return {"status":200, "result":config.NOTIFICATION_VRC_SFX}
+
+    @staticmethod
+    def setDisableNotificationVrcSfx(*args, **kwargs) -> dict:
+        config.NOTIFICATION_VRC_SFX = False
+        return {"status":200, "result":config.NOTIFICATION_VRC_SFX}
+
     @staticmethod
     def getDeepLAuthKey(*args, **kwargs) -> dict:
         return {"status":200, "result":config.AUTH_KEYS["DeepL_API"]}

src-python/mainloop.py

@@ -295,6 +295,10 @@ mapping = {
     "/get/data/osc_port": {"status": True, "variable":controller.getOscPort},
     "/set/data/osc_port": {"status": True, "variable":controller.setOscPort},
 
+    "/get/data/notification_vrc_sfx": {"status": True, "variable":controller.getNotificationVrcSfx},
+    "/set/enable/notification_vrc_sfx": {"status": True, "variable":controller.setEnableNotificationVrcSfx},
+    "/set/disable/notification_vrc_sfx": {"status": True, "variable":controller.setDisableNotificationVrcSfx},
+
     "/run/open_filepath_config_file": {"status": True, "variable":controller.openFilepathConfigFile},
 
     # "/run/start_watchdog": {"status": True, "variable":controller.startWatchdog},

src-python/model.py

@@ -289,8 +289,8 @@ class Model:
     def oscStopSendTyping(self):
         self.osc_handler.sendTyping(flag=False)
 
-    def oscSendMessage(self, message, notification=True):
-        self.osc_handler.sendMessage(message=message, notification=notification)
+    def oscSendMessage(self, message:str):
+        self.osc_handler.sendMessage(message=message, notification=config.NOTIFICATION_VRC_SFX)
 
     def getMuteSelfStatus(self):
         return self.osc_handler.getOSCParameterMuteSelf()