mx-remote 4.7.4__tar.gz → 4.7.6__tar.gz

{mx_remote-4.7.4 → mx_remote-4.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx_remote
-Version: 4.7.4
+Version: 4.7.6
 Summary: Python 3 library for interfacing with MX Remote compatible devices
 Project-URL: Homepage, https://github.com/opdenkamp/mx-remote/
 Project-URL: Documentation, https://github.com/opdenkamp/mx-remote/

{mx_remote-4.7.4 → mx_remote-4.7.6}/mx_remote/Interface.py

@@ -332,6 +332,11 @@ class V2IPStreamSources:
     All V2IP multicast IP addresses and port numbers used by a device
     """
 
+    @property
+    @abstractmethod
+    def uid(self) -> MxrDeviceUid|None:
+        ''' uid of the originating source device, when known '''
+
     @property
     @abstractmethod
     def video(self) -> V2IPStreamSource:

{mx_remote-4.7.4 → mx_remote-4.7.6}/mx_remote/Interface.pyi

@@ -102,6 +102,9 @@ class V2IPStreamSource(ABC):
     def port(self) -> int: ...
 
 class V2IPStreamSources:
+    @property
+    @abstractmethod
+    def uid(self) -> MxrDeviceUid | None: ...
     @property
     @abstractmethod
     def video(self) -> V2IPStreamSource: ...

{mx_remote-4.7.4 → mx_remote-4.7.6}/mx_remote/const.py

@@ -14,7 +14,7 @@ Default communication modes:
 """
 import os
 
-VERSION = '4.7.4'
+VERSION = '4.7.6'
 __version__ = VERSION
 
 MX_BCAST_UDP_PORT = 8811

{mx_remote-4.7.4 → mx_remote-4.7.6}/mx_remote/proto/FrameV2IPSources.py

@@ -29,7 +29,7 @@ class FrameV2IPSources(FrameBase):
             if (pl is None):
                 break
             cfg = V2IPConfig(self, srcnum, pl)
-            rv.append(V2IPStreamSourcesImpl(video=cfg.video, audio=cfg.audio, anc=cfg.anc))
+            rv.append(V2IPStreamSourcesImpl(video=cfg.video, audio=cfg.audio, anc=cfg.anc, uid=cfg.uid))
             srcnum += 1
         return rv
 

{mx_remote-4.7.4 → mx_remote-4.7.6}/mx_remote/proto/V2IPConfig.py

@@ -71,11 +71,17 @@ class V2IPConfig:
 class V2IPStreamSourcesImpl(V2IPStreamSources):
     '''Concrete collection of V2IP stream sources (video, audio, ancillary, ARC).'''
 
-    def __init__(self, video:V2IPStreamSource, audio:V2IPStreamSource, anc:V2IPStreamSource, arc:V2IPStreamSource|None=None) -> None:
+    def __init__(self, video:V2IPStreamSource, audio:V2IPStreamSource, anc:V2IPStreamSource, arc:V2IPStreamSource|None=None, uid:MxrDeviceUid|None=None) -> None:
         self._video = video
         self._audio = audio
         self._anc = anc
         self._arc = arc
+        self._uid = uid
+
+    @property
+    @override
+    def uid(self) -> MxrDeviceUid|None:
+        return self._uid
 
     @property
     @override

{mx_remote-4.7.4 → mx_remote-4.7.6}/mx_remote/proto/V2IPConfig.pyi

@@ -28,7 +28,10 @@ class V2IPConfig:
     def uid(self) -> MxrDeviceUid: ...
 
 class V2IPStreamSourcesImpl(V2IPStreamSources):
-    def __init__(self, video: V2IPStreamSource, audio: V2IPStreamSource, anc: V2IPStreamSource, arc: V2IPStreamSource | None = None) -> None: ...
+    def __init__(self, video: V2IPStreamSource, audio: V2IPStreamSource, anc: V2IPStreamSource, arc: V2IPStreamSource | None = None, uid: MxrDeviceUid | None = None) -> None: ...
+    @property
+    @override
+    def uid(self) -> MxrDeviceUid | None: ...
     @property
     @override
     def video(self) -> V2IPStreamSource: ...

{mx_remote-4.7.4 → mx_remote-4.7.6}/mx_remote/remote/Bay.py

@@ -143,11 +143,13 @@ class Bay(BayBase):
     @property
     @override
     def bay_uid(self) -> MxrBayUid:
-        # remote v2ip source bays are per-RX views of the same physical source
-        # on a OneIP TX/TZ; collapse them to the originating TX's first input so
-        # the same source has the same bay_uid regardless of which RX sees it.
-        if BayFeaturesMask.V2IP_SOURCE_REMOTE in self.features:
-            src_dev = self.v2ip_device
+        # In a OneIP mesh the same source can be advertised by multiple devices
+        # (mesh forwarding etc.). MXR_OP_SYS_BAY_V2IP_SOURCES carries the uid of
+        # the originating source device alongside each stream, so collapse a
+        # v2ip source bay to its originating TX's first-input bay_uid — that
+        # gives the same physical source a single stable bay_uid.
+        if self.is_v2ip_source and ((stream := self.v2ip_source) is not None) and (stream.uid is not None):
+            src_dev = self.device.registry.get_by_uid(remote_id=stream.uid)
             if (src_dev is not None) and ((src_input := src_dev.first_input) is not None):
                 return MxrBayUid(src_dev.remote_id, src_input.port)
         return MxrBayUid(self.device.remote_id, self.port)