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

Merge branch 'development' into feature/add-hdbasettx-support

Browse Source
This commit is contained in:
Andrew Welker
2021-01-20 17:06:20 -07:00
committed by GitHub
parent 2f172c998a da5fd7e743
commit 55cbd094be
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,10 +74,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
{ {
get get
{ {
return new List<Feedback> return new List<Feedback>
{ {
PrivacyModeIsOnFeedback, PrivacyModeIsOnFeedback,
SharingSourceFeedback SharingSourceFeedback
}; };
} }
} }
@@ -677,19 +677,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
var meetingIndex = 0; var meetingIndex = 0;
var tokenArray = new XSigToken[maxMeetings * offset]; var tokenArray = new XSigToken[maxMeetings * offset];
/* /*
* Digitals * Digitals
* IsJoinable - 1 * IsJoinable - 1
* IsDialable - 2 * IsDialable - 2
* *
* Serials * Serials
* Organizer - 1 * Organizer - 1
* Title - 2 * Title - 2
* Start Date - 3 * Start Date - 3
* Start Time - 4 * Start Time - 4
* End Date - 5 * End Date - 5
* End Time - 6 * End Time - 6
* Id - 7 * Id - 7
*/ */
@@ -848,7 +848,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
Debug.Console(1, this, "Call Direction: {0}", args.CallItem.Direction); Debug.Console(1, this, "Call Direction: {0}", args.CallItem.Direction);
Debug.Console(1, this, "Call is incoming: {0}", args.CallItem.Direction == eCodecCallDirection.Incoming); Debug.Console(1, this, "Call is incoming: {0}", args.CallItem.Direction == eCodecCallDirection.Incoming);
trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming && args.CallItem.Status != eCodecCallStatus.Disconnected); trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming && args.CallItem.Status == eCodecCallStatus.Ringing);
if (args.CallItem.Direction == eCodecCallDirection.Incoming) if (args.CallItem.Direction == eCodecCallDirection.Incoming)
{ {