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

Merge branch 'development' into feature/room-combining

Browse Source
This commit is contained in:
Neil Dorin
2021-07-30 16:59:52 -06:00
parent 7114e60c04 82af1366df
commit 8ae03a8187
10 changed files with 105 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs
View File

@@ -207,6 +207,7 @@ namespace PepperDash.Essentials
//TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 1);
// Set the call status text
Debug.Console(1, "Active Call Count: {0}", codec.ActiveCalls.Count);
if (codec.ActiveCalls.Count > 0)
{
if (codec.ActiveCalls.Count == 1)

2
PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
View File

@@ -1035,7 +1035,7 @@ namespace PepperDash.Essentials
if (CurrentRoom.CurrentSourceInfo != null && CurrentRoom.CurrentSourceInfo.DisableCodecSharing)
{
Debug.Console(1, CurrentRoom, "Transitioning to in-call, cancelling non-sharable source");
CurrentRoom.RunRouteAction("codecOsd", CurrentRoom.SourceListKey);
CurrentRoom.RunRouteAction("codecOsd");
}
}