theater/tendrils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 0x0006 dante channel type and default 0x3000 subscriptions to audio

Browse Source 
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Ian Gulliver
2026-01-23 23:16:09 -08:00
parent 604123559b
commit f4b2351de8
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dante_control.go
View File

@@ -278,7 +278,7 @@ func (t *Tendrils) queryDanteDeviceWithPort(ip net.IP, port int) *DanteDeviceInf
if t.DebugDante { if t.DebugDante {
log.Printf("[dante] %s: 0x3000 returned %d subscriptions, hasMulticast=%v", ip, len(info.Subscriptions), info.HasMulticast) log.Printf("[dante] %s: 0x3000 returned %d subscriptions, hasMulticast=%v", ip, len(info.Subscriptions), info.HasMulticast)
} }
if info.RxChannelCount > 0 && (len(info.Subscriptions) == 0 || info.HasMulticast) { if info.RxChannelCount > 0 {
subs3400 := t.queryDanteSubscriptions3400(conn, ip, info.RxChannelCount) subs3400 := t.queryDanteSubscriptions3400(conn, ip, info.RxChannelCount)
if len(subs3400) > 0 { if len(subs3400) > 0 {
info.Subscriptions = subs3400 info.Subscriptions = subs3400
@@ -308,12 +308,13 @@ type DanteChannelType uint16
const ( const (
DanteChannelUnknown DanteChannelType = 0 DanteChannelUnknown DanteChannelType = 0
DanteChannelAudio DanteChannelType = 0x000f DanteChannelAudio DanteChannelType = 0x000f
DanteChannelAudio2 DanteChannelType = 0x0006
DanteChannelVideo DanteChannelType = 0x000e DanteChannelVideo DanteChannelType = 0x000e
) )
func (t DanteChannelType) String() string { func (t DanteChannelType) String() string {
switch t { switch t {
case DanteChannelAudio: case DanteChannelAudio, DanteChannelAudio2:
return "audio" return "audio"
case DanteChannelVideo: case DanteChannelVideo:
return "video" return "video"
@@ -543,6 +544,7 @@ func (t *Tendrils) queryDanteSubscriptions(conn *net.UDPConn, ip net.IP, rxCount
RxChannel: rxChannelNum, RxChannel: rxChannelNum,
TxDeviceName: txDeviceName, TxDeviceName: txDeviceName,
TxChannelName: txChannelName, TxChannelName: txChannelName,
ChannelType: DanteChannelAudio,
}) })
recordOffset += 20 recordOffset += 20
@@ -561,12 +563,12 @@ func (t *Tendrils) queryDanteSubscriptions(conn *net.UDPConn, ip net.IP, rxCount
txChannelName := extractNullTerminatedString(resp, txChannelOffset) txChannelName := extractNullTerminatedString(resp, txChannelOffset)
txDeviceName := extractNullTerminatedString(resp, txDeviceOffset) txDeviceName := extractNullTerminatedString(resp, txDeviceOffset)
if txDeviceName != "" { if txDeviceName != "" {
subscriptions = append(subscriptions, DanteSubscription{ subscriptions = append(subscriptions, DanteSubscription{
RxChannel: rxChannelNum, RxChannel: rxChannelNum,
TxDeviceName: txDeviceName, TxDeviceName: txDeviceName,
TxChannelName: txChannelName, TxChannelName: txChannelName,
ChannelType: DanteChannelAudio,
}) })
} }
@@ -659,6 +661,9 @@ func (t *Tendrils) queryDanteSubscriptions3400(conn *net.UDPConn, ip net.IP, rxC
continue continue
} }
channelType = DanteChannelType(binary.BigEndian.Uint16(resp[rawOffset+14 : rawOffset+16])) channelType = DanteChannelType(binary.BigEndian.Uint16(resp[rawOffset+14 : rawOffset+16]))
if channelType == DanteChannelUnknown {
channelType = DanteChannelAudio
}
txChOffset = int(binary.BigEndian.Uint16(resp[rawOffset+44 : rawOffset+46])) txChOffset = int(binary.BigEndian.Uint16(resp[rawOffset+44 : rawOffset+46]))
txDevOffset = int(binary.BigEndian.Uint16(resp[rawOffset+46 : rawOffset+48])) txDevOffset = int(binary.BigEndian.Uint16(resp[rawOffset+46 : rawOffset+48]))
} else if marker == 0x141a { } else if marker == 0x141a {