pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 20:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(essentials): fixes issue with local var scope when assigning actions for ending individual calls

Browse Source 
Fixes Incoming call name/number feedback in bridge
This commit is contained in:
Neil Dorin
2022-02-11 15:50:09 -07:00
parent cb3c80ff8f
commit b0e3fddec7
1 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
View File

@@ -680,37 +680,37 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
{ {
if (meetingIndex >= maxParticipants * offset) break; if (meetingIndex >= maxParticipants * offset) break;
Debug.Console(2, this, // Debug.Console(2, this,
@"Updating Participant on xsig: //@"Updating Participant on xsig:
Name: {0} (s{9}) //Name: {0} (s{9})
AudioMute: {1} (d{10}) //AudioMute: {1} (d{10})
VideoMute: {2} (d{11}) //VideoMute: {2} (d{11})
CanMuteVideo: {3} (d{12}) //CanMuteVideo: {3} (d{12})
CanUMuteVideo: {4} (d{13}) //CanUMuteVideo: {4} (d{13})
IsHost: {5} (d{14}) //IsHost: {5} (d{14})
HandIsRaised: {6} (d{15}) //HandIsRaised: {6} (d{15})
IsPinned: {7} (d{16}) //IsPinned: {7} (d{16})
ScreenIndexIsPinnedTo: {8} (a{17}) //ScreenIndexIsPinnedTo: {8} (a{17})
", //",
participant.Name, // participant.Name,
participant.AudioMuteFb, // participant.AudioMuteFb,
participant.VideoMuteFb, // participant.VideoMuteFb,
participant.CanMuteVideo, // participant.CanMuteVideo,
participant.CanUnmuteVideo, // participant.CanUnmuteVideo,
participant.IsHost, // participant.IsHost,
participant.HandIsRaisedFb, // participant.HandIsRaisedFb,
participant.IsPinnedFb, // participant.IsPinnedFb,
participant.ScreenIndexIsPinnedToFb, // participant.ScreenIndexIsPinnedToFb,
stringIndex + 1, // stringIndex + 1,
digitalIndex + 1, // digitalIndex + 1,
digitalIndex + 2, // digitalIndex + 2,
digitalIndex + 3, // digitalIndex + 3,
digitalIndex + 4, // digitalIndex + 4,
digitalIndex + 5, // digitalIndex + 5,
digitalIndex + 6, // digitalIndex + 6,
digitalIndex + 7, // digitalIndex + 7,
analogIndex + 1 // analogIndex + 1
); // );
//digitals //digitals
@@ -1160,7 +1160,9 @@ ScreenIndexIsPinnedTo: {8} (a{17})
{ {
trilist.SetSigFalseAction((uint)(joinMap.EndCallStart.JoinNumber + i), () => trilist.SetSigFalseAction((uint)(joinMap.EndCallStart.JoinNumber + i), () =>
{ {
var call = ActiveCalls[i]; var callIndex = i;
var call = ActiveCalls[callIndex];
if (call != null) if (call != null)
{ {
EndCall(call); EndCall(call);
@@ -1186,7 +1188,15 @@ ScreenIndexIsPinnedTo: {8} (a{17})
{ {
trilist.SetSigFalseAction(joinMap.IncomingAnswer.JoinNumber, () => AcceptCall(args.CallItem)); trilist.SetSigFalseAction(joinMap.IncomingAnswer.JoinNumber, () => AcceptCall(args.CallItem));
trilist.SetSigFalseAction(joinMap.IncomingReject.JoinNumber, () => RejectCall(args.CallItem)); trilist.SetSigFalseAction(joinMap.IncomingReject.JoinNumber, () => RejectCall(args.CallItem));
trilist.SetString(joinMap.IncomingCallName.JoinNumber, args.CallItem.Name);
trilist.SetString(joinMap.IncomingCallNumber.JoinNumber, args.CallItem.Number);
} }
else
{
trilist.SetString(joinMap.IncomingCallName.JoinNumber, string.Empty);
trilist.SetString(joinMap.IncomingCallNumber.JoinNumber, string.Empty);
}
trilist.SetString(joinMap.CurrentCallData.JoinNumber, UpdateCallStatusXSig()); trilist.SetString(joinMap.CurrentCallData.JoinNumber, UpdateCallStatusXSig());