Update audioservice.py

ovos_utils/skills/audioservice.py

@@ -218,15 +218,30 @@ def is_playing(self):
             return self.track_info() != {}
 
 
-    class OCPInterface(AudioServiceInterface):
+    class OCPInterface:
         """bus api interface for OCP subsystem
         Args:
             bus: Mycroft messagebus connection
         """
 
         def __init__(self, bus=None):
             self.bus = bus or get_mycroft_bus()
-
+
+        def _format_msg(self, msg_type, msg_data=None):
+            # this method ensures all skills are .forward from the utterance
+            # that triggered the skill, this ensures proper routing and metadata
+            msg_data = msg_data or {}
+            msg = dig_for_message()
+            if msg:
+                msg = msg.forward(msg_type, msg_data)
+            else:
+                msg = Message(msg_type, msg_data)
+            # at this stage source == skills, lets indicate audio service took over
+            sauce = msg.context.get("source")
+            if sauce == "skills":
+                msg.context["source"] = "audio_service"
+            return msg
+
         # OCP bus api
         def queue(self, tracks):
             """Queue up a track to OCP playing playlist.