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

Updates to VideoCodecControllerJoinMap to fix joins for Participant triggers. Updated ZoomRoomJoinMaps to implement zConfiguration.eLayoutStyle to pass the name across the bridge.

Browse Source
This commit is contained in:
Jason DeVito
2021-05-11 18:13:18 -05:00
parent b4edb021ee
commit c14193f9ac
3 changed files with 2348 additions and 2340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
View File

@@ -879,7 +879,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete( public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
new JoinData new JoinData
{ {
JoinNumber = 500, JoinNumber = 501,
JoinSpan = 50 JoinSpan = 50
}, },
new JoinMetadata new JoinMetadata
@@ -893,7 +893,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete( public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
new JoinData new JoinData
{ {
JoinNumber = 800, JoinNumber = 801,
JoinSpan = 50 JoinSpan = 50
}, },
new JoinMetadata new JoinMetadata
@@ -907,7 +907,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete( public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
new JoinData new JoinData
{ {
JoinNumber = 1100, JoinNumber = 1101,
JoinSpan = 50 JoinSpan = 50
}, },
new JoinMetadata new JoinMetadata

8
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
View File

@@ -3,11 +3,13 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using Crestron.SimplSharp; using Crestron.SimplSharp;
using Crestron.SimplSharp.Reflection;
using Crestron.SimplSharpPro.CrestronThread; using Crestron.SimplSharpPro.CrestronThread;
using Crestron.SimplSharpPro.DeviceSupport; using Crestron.SimplSharpPro.DeviceSupport;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using PepperDash.Core; using PepperDash.Core;
using PepperDash.Core.Intersystem.Tokens;
using PepperDash.Essentials.Core; using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Bridges; using PepperDash.Essentials.Core.Bridges;
using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Config;
@@ -1735,6 +1737,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
== (a.AvailableLayouts & zConfiguration.eLayoutStyle.Strip)); == (a.AvailableLayouts & zConfiguration.eLayoutStyle.Strip));
trilist.SetBool(joinMap.LayoutShareAllIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.ShareAll trilist.SetBool(joinMap.LayoutShareAllIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.ShareAll
== (a.AvailableLayouts & zConfiguration.eLayoutStyle.ShareAll)); == (a.AvailableLayouts & zConfiguration.eLayoutStyle.ShareAll));
// pass the names used to set the layout through the bridge
trilist.SetString(joinMap.LayoutGalleryIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Gallery.ToString());
trilist.SetString(joinMap.LayoutSpeakerIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Speaker.ToString());
trilist.SetString(joinMap.LayoutStripIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Strip.ToString());
trilist.SetString(joinMap.LayoutShareAllIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.ShareAll.ToString());
}; };
layoutsCodec.CanSwapContentWithThumbnailFeedback.LinkInputSig(trilist.BooleanInput[joinMap.CanSwapContentWithThumbnail.JoinNumber]); layoutsCodec.CanSwapContentWithThumbnailFeedback.LinkInputSig(trilist.BooleanInput[joinMap.CanSwapContentWithThumbnail.JoinNumber]);

8
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomJoinMap.cs
View File

@@ -119,7 +119,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {
Description = "FB Indicates if layout 'Gallery' is available", Description = "FB Indicates if layout 'Gallery' is available",
JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinCapabilities = eJoinCapabilities.ToSIMPL,
JoinType = eJoinType.Digital JoinType = eJoinType.DigitalSerial
}); });
[JoinName("LayoutSpeakerIsAvailable")] [JoinName("LayoutSpeakerIsAvailable")]
@@ -133,7 +133,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {
Description = "FB Indicates if layout 'Speaker' is available", Description = "FB Indicates if layout 'Speaker' is available",
JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinCapabilities = eJoinCapabilities.ToSIMPL,
JoinType = eJoinType.Digital JoinType = eJoinType.DigitalSerial
}); });
[JoinName("LayoutStripIsAvailable")] [JoinName("LayoutStripIsAvailable")]
@@ -147,7 +147,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {
Description = "FB Indicates if layout 'Strip' is available", Description = "FB Indicates if layout 'Strip' is available",
JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinCapabilities = eJoinCapabilities.ToSIMPL,
JoinType = eJoinType.Digital JoinType = eJoinType.DigitalSerial
}); });
[JoinName("LayoutShareAllIsAvailable")] [JoinName("LayoutShareAllIsAvailable")]
@@ -161,7 +161,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {
Description = "FB Indicates if layout 'ShareAll' is available", Description = "FB Indicates if layout 'ShareAll' is available",
JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinCapabilities = eJoinCapabilities.ToSIMPL,
JoinType = eJoinType.Digital JoinType = eJoinType.DigitalSerial
}); });
//[JoinName("ParticipantAudioMuteToggleStart")] //[JoinName("ParticipantAudioMuteToggleStart")]