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

Add support for local playback

Browse Source
pull/1/head
firealarmss 11 months ago
parent d5c4ee07fc
commit b325694590
2 changed files with 96 additions and 7 deletions
Show Stats Download Patch File Download Diff File

13
WhackerLinkConsoleV2/ChannelBox.xaml.cs
Unescape View File

@ -189,6 +189,13 @@ namespace WhackerLinkConsoleV2.Controls
PttButton.Background = grayGradient;
PageSelectButton.Background = grayGradient;
ChannelMarkerBtn.Background = grayGradient;
if (SystemName == MainWindow.PLAYBACKSYS || ChannelName == MainWindow.PLAYBACKCHNAME || DstId == MainWindow.PLAYBACKTG)
{
PttButton.IsEnabled = false;
PageSelectButton.IsEnabled = false;
ChannelMarkerBtn.IsEnabled = false;
}
}
private void ChannelBox_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
@ -240,6 +247,12 @@ namespace WhackerLinkConsoleV2.Controls
private void UpdateBackground()
{
if (SystemName == MainWindow.PLAYBACKSYS || ChannelName == MainWindow.PLAYBACKCHNAME || DstId == MainWindow.PLAYBACKTG)
{
Background = IsSelected ? (Brush)new BrushConverter().ConvertFrom("#FFC90000") : Brushes.DarkGray;
return;
}
Background = IsSelected ? (Brush)new BrushConverter().ConvertFrom("#FF0B004B") : Brushes.DarkGray;
}

88
WhackerLinkConsoleV2/MainWindow.xaml.cs
Unescape View File

@ -38,12 +38,6 @@ using System.Net;
using NAudio.Wave;
using WhackerLinkLib.Interfaces;
using WhackerLinkLib.Models.IOSP;
using Nancy;
using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.ProgressBar;
using System.Media;
using System.Threading.Tasks;
using static WhackerLinkLib.Models.Radio.Codeplug;
namespace WhackerLinkConsoleV2
{
@ -66,6 +60,12 @@ namespace WhackerLinkConsoleV2
private WaveFilePlaybackManager _emergencyAlertPlayback;
private WebSocketManager _webSocketManager = new WebSocketManager();
private ChannelBox playbackChannelBox;
public static string PLAYBACKTG = "LOCPLAYBACK";
public static string PLAYBACKSYS = "LOCPLAYBACKSYS";
public static string PLAYBACKCHNAME = "PLAYBACK";
private readonly WaveInEvent _waveIn;
private readonly AudioManager _audioManager;
@ -325,6 +325,36 @@ namespace WhackerLinkConsoleV2
}
}
playbackChannelBox = new ChannelBox(_selectedChannelsManager, _audioManager, PLAYBACKCHNAME, PLAYBACKSYS, PLAYBACKTG);
if (_settingsManager.ChannelPositions.TryGetValue(PLAYBACKCHNAME, out var pos))
{
Canvas.SetLeft(playbackChannelBox, pos.X);
Canvas.SetTop(playbackChannelBox, pos.Y);
}
else
{
Canvas.SetLeft(playbackChannelBox, offsetX);
Canvas.SetTop(playbackChannelBox, offsetY);
}
playbackChannelBox.PTTButtonClicked += ChannelBox_PTTButtonClicked;
playbackChannelBox.PageButtonClicked += ChannelBox_PageButtonClicked;
playbackChannelBox.HoldChannelButtonClicked += ChannelBox_HoldChannelButtonClicked;
playbackChannelBox.MouseLeftButtonDown += ChannelBox_MouseLeftButtonDown;
playbackChannelBox.MouseMove += ChannelBox_MouseMove;
playbackChannelBox.MouseRightButtonDown += ChannelBox_MouseRightButtonDown;
ChannelsCanvas.Children.Add(playbackChannelBox);
//offsetX += 225;
//if (offsetX + 220 > ChannelsCanvas.ActualWidth)
//{
// offsetX = 20;
// offsetY += 106;
//}
AdjustCanvasHeight();
}
@ -335,14 +365,24 @@ namespace WhackerLinkConsoleV2
private void WaveIn_DataAvailable(object sender, WaveInEventArgs e)
{
bool isAnyTgOn = false;
foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels())
{
if (channel.SystemName == PLAYBACKSYS || channel.ChannelName == PLAYBACKCHNAME || channel.DstId == PLAYBACKTG)
{
playbackChannelBox.IsReceiving = true;
continue;
}
Codeplug.System system = Codeplug.GetSystemForChannel(channel.ChannelName);
Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName);
IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
if (channel.IsSelected && channel.VoiceChannel != null && channel.PttState)
{
isAnyTgOn = true;
object voicePaket = new
{
type = PacketType.AUDIO_DATA,
@ -362,12 +402,18 @@ namespace WhackerLinkConsoleV2
handler.SendMessage(voicePaket);
}
}
if (isAnyTgOn && playbackChannelBox.IsSelected)
_audioManager.AddTalkgroupStream(PLAYBACKTG, e.Buffer);
}
private void SelectedChannelsChanged()
{
foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels())
{
if (channel.SystemName == PLAYBACKSYS || channel.ChannelName == PLAYBACKCHNAME || channel.DstId == PLAYBACKTG)
continue;
Codeplug.System system = Codeplug.GetSystemForChannel(channel.ChannelName);
Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName);
IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
@ -511,6 +557,9 @@ namespace WhackerLinkConsoleV2
{
foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels())
{
if (channel.SystemName == PLAYBACKSYS || channel.ChannelName == PLAYBACKCHNAME || channel.DstId == PLAYBACKTG)
continue;
Codeplug.System system = Codeplug.GetSystemForChannel(channel.ChannelName);
Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName);
IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
@ -671,6 +720,9 @@ namespace WhackerLinkConsoleV2
foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels())
{
if (channel.SystemName == PLAYBACKSYS || channel.ChannelName == PLAYBACKCHNAME || channel.DstId == PLAYBACKTG)
continue;
Codeplug.System system = Codeplug.GetSystemForChannel(channel.ChannelName);
Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName);
IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
@ -687,6 +739,9 @@ namespace WhackerLinkConsoleV2
{
foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels())
{
if (channel.SystemName == PLAYBACKSYS || channel.ChannelName == PLAYBACKCHNAME || channel.DstId == PLAYBACKTG)
continue;
Codeplug.System system = Codeplug.GetSystemForChannel(channel.ChannelName);
Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName);
IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
@ -718,6 +773,9 @@ namespace WhackerLinkConsoleV2
{
foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels())
{
if (channel.SystemName == PLAYBACKSYS || channel.ChannelName == PLAYBACKCHNAME || channel.DstId == PLAYBACKTG)
continue;
Codeplug.System system = Codeplug.GetSystemForChannel(channel.ChannelName);
Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName);
IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
@ -747,6 +805,9 @@ namespace WhackerLinkConsoleV2
{
foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels())
{
if (channel.SystemName == PLAYBACKSYS || channel.ChannelName == PLAYBACKCHNAME || channel.DstId == PLAYBACKTG)
continue;
Codeplug.System system = Codeplug.GetSystemForChannel(channel.ChannelName);
Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName);
IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
@ -785,6 +846,9 @@ namespace WhackerLinkConsoleV2
private void ChannelBox_HoldChannelButtonClicked(object sender, ChannelBox e)
{
if (e.SystemName == PLAYBACKSYS || e.ChannelName == PLAYBACKCHNAME || e.DstId == PLAYBACKTG)
return;
Codeplug.System system = Codeplug.GetSystemForChannel(e.ChannelName);
Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(e.ChannelName);
IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
@ -792,6 +856,9 @@ namespace WhackerLinkConsoleV2
private void ChannelBox_PageButtonClicked(object sender, ChannelBox e)
{
if (e.SystemName == PLAYBACKSYS || e.ChannelName == PLAYBACKCHNAME || e.DstId == PLAYBACKTG)
return;
Codeplug.System system = Codeplug.GetSystemForChannel(e.ChannelName);
Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(e.ChannelName);
IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
@ -824,6 +891,9 @@ namespace WhackerLinkConsoleV2
private void ChannelBox_PTTButtonClicked(object sender, ChannelBox e)
{
if (e.SystemName == PLAYBACKSYS || e.ChannelName == PLAYBACKCHNAME || e.DstId == PLAYBACKTG)
return;
Codeplug.System system = Codeplug.GetSystemForChannel(e.ChannelName);
Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(e.ChannelName);
IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
@ -1035,6 +1105,9 @@ namespace WhackerLinkConsoleV2
{
foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels())
{
if (channel.SystemName == PLAYBACKSYS || channel.ChannelName == PLAYBACKCHNAME || channel.DstId == PLAYBACKTG)
continue;
Codeplug.System system = Codeplug.GetSystemForChannel(channel.ChannelName);
Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName);
IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
@ -1110,6 +1183,9 @@ namespace WhackerLinkConsoleV2
foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels())
{
if (channel.SystemName == PLAYBACKSYS || channel.ChannelName == PLAYBACKCHNAME || channel.DstId == PLAYBACKTG)
continue;
Codeplug.System system = Codeplug.GetSystemForChannel(channel.ChannelName);
Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName);
IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.