Digital_Voice_Modem_Project
/
dvmconsole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to work with new AudioPacket format

Browse Source
pull/1/head
firealarmss 1 year ago
parent 1b22968b80
commit 5993107cc9
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File

32
WhackerLinkConsoleV2/MainWindow.xaml.cs
Unescape View File

@ -333,15 +333,17 @@ namespace WhackerLinkConsoleV2
object voicePaket = new object voicePaket = new
{ {
type = PacketType.AUDIO_DATA, type = PacketType.AUDIO_DATA,
data = e.Buffer, data = new {
voiceChannel = new VoiceChannel Data = e.Buffer,
VoiceChannel = new VoiceChannel
{ {
Frequency = channel.VoiceChannel, Frequency = channel.VoiceChannel,
DstId = cpgChannel.Tgid, DstId = cpgChannel.Tgid,
SrcId = system.Rid, SrcId = system.Rid,
Site = system.Site Site = system.Site
}, },
site = system.Site Site = system.Site
}
}; };
handler.SendMessage(voicePaket); handler.SendMessage(voicePaket);
@ -475,15 +477,18 @@ namespace WhackerLinkConsoleV2
object voicePaket = new object voicePaket = new
{ {
type = PacketType.AUDIO_DATA, type = PacketType.AUDIO_DATA,
data = chunk, data = new
voiceChannel = new VoiceChannel {
Data = chunk,
VoiceChannel = new VoiceChannel
{ {
Frequency = channel.VoiceChannel, Frequency = channel.VoiceChannel,
DstId = cpgChannel.Tgid, DstId = cpgChannel.Tgid,
SrcId = system.Rid, SrcId = system.Rid,
Site = system.Site Site = system.Site
}, },
site = system.Site Site = system.Site
}
}; };
handler.SendMessage(voicePaket); handler.SendMessage(voicePaket);
@ -567,15 +572,18 @@ namespace WhackerLinkConsoleV2
object voicePaket = new object voicePaket = new
{ {
type = PacketType.AUDIO_DATA, type = PacketType.AUDIO_DATA,
data = chunk, data = new
voiceChannel = new VoiceChannel {
Data = chunk,
VoiceChannel = new VoiceChannel
{ {
Frequency = channel.VoiceChannel, Frequency = channel.VoiceChannel,
DstId = cpgChannel.Tgid, DstId = cpgChannel.Tgid,
SrcId = system.Rid, SrcId = system.Rid,
Site = system.Site Site = system.Site
}, },
site = system.Site Site = system.Site
}
}; };
handler.SendMessage(voicePaket); handler.SendMessage(voicePaket);
@ -655,7 +663,7 @@ namespace WhackerLinkConsoleV2
} }
} }
private void HandleReceivedAudio(byte[] audioData, VoiceChannel voiceChannel) private void HandleReceivedAudio(AudioPacket audioPacket)
{ {
foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels()) foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels())
{ {
@ -663,9 +671,9 @@ namespace WhackerLinkConsoleV2
Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName); Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName);
IWebSocketHandler handler = _webSocketManager.GetWebSocketHandler(system.Name); IWebSocketHandler handler = _webSocketManager.GetWebSocketHandler(system.Name);
if (voiceChannel.SrcId != system.Rid && voiceChannel.Frequency == channel.VoiceChannel && voiceChannel.DstId == cpgChannel.Tgid) if (audioPacket.VoiceChannel.SrcId != system.Rid && audioPacket.VoiceChannel.Frequency == channel.VoiceChannel && audioPacket.VoiceChannel.DstId == cpgChannel.Tgid)
{ {
_waveProvider.AddSamples(audioData, 0, audioData.Length); _waveProvider.AddSamples(audioPacket.Data, 0, audioPacket.Data.Length);
} }
} }
} }

2
WhackerLinkLib

@ -1 +1 @@
Subproject commit ddde77fc3d177cbecd05fcc5a1026e6fa1e5e053 Subproject commit 1befac9df79c4a3e3a759a47e26d4dae7e78103b
Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.