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

#698 merged in join map updates from JKD. Fixed enum bit comparison for available layout feedbacks

Browse Source
This commit is contained in:
Neil Dorin
2021-05-11 12:23:27 -06:00
parent 52caa98f33
commit b4edb021ee
3 changed files with 61 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -875,12 +875,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
JoinType = eJoinType.Digital JoinType = eJoinType.Digital
}); });
// TODO: #698 Set Join number
[JoinName("ParticipantAudioMuteToggleStart")] [JoinName("ParticipantAudioMuteToggleStart")]
public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete( public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
new JoinData new JoinData
{ {
JoinNumber = 2001, JoinNumber = 500,
JoinSpan = 50 JoinSpan = 50
}, },
new JoinMetadata new JoinMetadata
@@ -890,12 +889,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
JoinType = eJoinType.Digital JoinType = eJoinType.Digital
}); });
// TODO: #698 Set Join number
[JoinName("ParticipantVideoMuteToggleStart")] [JoinName("ParticipantVideoMuteToggleStart")]
public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete( public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
new JoinData new JoinData
{ {
JoinNumber = 2101, JoinNumber = 800,
JoinSpan = 50 JoinSpan = 50
}, },
new JoinMetadata new JoinMetadata
@@ -905,12 +903,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
JoinType = eJoinType.Digital JoinType = eJoinType.Digital
}); });
// TODO: #698 Set Join number
[JoinName("ParticipantPinToggleStart")] [JoinName("ParticipantPinToggleStart")]
public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete( public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
new JoinData new JoinData
{ {
JoinNumber = 2201, JoinNumber = 1100,
JoinSpan = 50 JoinSpan = 50
}, },
new JoinMetadata new JoinMetadata
@@ -2177,12 +2174,11 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
JoinType = eJoinType.Digital JoinType = eJoinType.Digital
}); });
// TODO: #698 Set Join number
[JoinName("ParticipantAudioMuteToggleStart")] [JoinName("ParticipantAudioMuteToggleStart")]
public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete( public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
new JoinData new JoinData
{ {
JoinNumber = 2001, JoinNumber = 500,
JoinSpan = 50 JoinSpan = 50
}, },
new JoinMetadata new JoinMetadata
@@ -2192,12 +2188,11 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
JoinType = eJoinType.Digital JoinType = eJoinType.Digital
}); });
// TODO: #698 Set Join number
[JoinName("ParticipantVideoMuteToggleStart")] [JoinName("ParticipantVideoMuteToggleStart")]
public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete( public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
new JoinData new JoinData
{ {
JoinNumber = 2101, JoinNumber = 800,
JoinSpan = 50 JoinSpan = 50
}, },
new JoinMetadata new JoinMetadata
@@ -2207,12 +2202,11 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
JoinType = eJoinType.Digital JoinType = eJoinType.Digital
}); });
// TODO: #698 Set Join number
[JoinName("ParticipantPinToggleStart")] [JoinName("ParticipantPinToggleStart")]
public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete( public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
new JoinData new JoinData
{ {
JoinNumber = 2201, JoinNumber = 1100,
JoinSpan = 50 JoinSpan = 50
}, },
new JoinMetadata new JoinMetadata

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

@@ -1727,13 +1727,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {
layoutsCodec.AvailableLayoutsChanged += (o, a) => layoutsCodec.AvailableLayoutsChanged += (o, a) =>
{ {
trilist.SetBool(joinMap.LayoutGalleryIsAvailable.JoinNumber, a.AvailableLayouts trilist.SetBool(joinMap.LayoutGalleryIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Gallery
== (a.AvailableLayouts & zConfiguration.eLayoutStyle.Gallery)); == (a.AvailableLayouts & zConfiguration.eLayoutStyle.Gallery));
trilist.SetBool(joinMap.LayoutSpeakerIsAvailable.JoinNumber, a.AvailableLayouts trilist.SetBool(joinMap.LayoutSpeakerIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Speaker
== (a.AvailableLayouts & zConfiguration.eLayoutStyle.Speaker)); == (a.AvailableLayouts & zConfiguration.eLayoutStyle.Speaker));
trilist.SetBool(joinMap.LayoutStripIsAvailable.JoinNumber, a.AvailableLayouts trilist.SetBool(joinMap.LayoutStripIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Strip
== (a.AvailableLayouts & zConfiguration.eLayoutStyle.Strip)); == (a.AvailableLayouts & zConfiguration.eLayoutStyle.Strip));
trilist.SetBool(joinMap.LayoutShareAllIsAvailable.JoinNumber, a.AvailableLayouts trilist.SetBool(joinMap.LayoutShareAllIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.ShareAll
== (a.AvailableLayouts & zConfiguration.eLayoutStyle.ShareAll)); == (a.AvailableLayouts & zConfiguration.eLayoutStyle.ShareAll));
}; };

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

@@ -164,47 +164,47 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
JoinType = eJoinType.Digital JoinType = eJoinType.Digital
}); });
[JoinName("ParticipantAudioMuteToggleStart")] //[JoinName("ParticipantAudioMuteToggleStart")]
public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete( //public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
new JoinData // new JoinData
{ // {
JoinNumber = 500, // JoinNumber = 500,
JoinSpan = 100 // JoinSpan = 100
}, // },
new JoinMetadata // new JoinMetadata
{ // {
Description = "Toggles the participant's audio mute status", // Description = "Toggles the participant's audio mute status",
JoinCapabilities = eJoinCapabilities.ToSIMPL, // JoinCapabilities = eJoinCapabilities.ToSIMPL,
JoinType = eJoinType.Digital // JoinType = eJoinType.Digital
}); // });
[JoinName("ParticipantVideoMuteToggleStart")] //[JoinName("ParticipantVideoMuteToggleStart")]
public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete( //public JoinDataComplete ParticipantVideoMuteToggleStart = new JoinDataComplete(
new JoinData // new JoinData
{ // {
JoinNumber = 800, // JoinNumber = 800,
JoinSpan = 100 // JoinSpan = 100
}, // },
new JoinMetadata // new JoinMetadata
{ // {
Description = "Toggles the participant's video mute status", // Description = "Toggles the participant's video mute status",
JoinCapabilities = eJoinCapabilities.ToSIMPL, // JoinCapabilities = eJoinCapabilities.ToSIMPL,
JoinType = eJoinType.Digital // JoinType = eJoinType.Digital
}); // });
[JoinName("ParticipantPinToggleStart")] //[JoinName("ParticipantPinToggleStart")]
public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete( //public JoinDataComplete ParticipantPinToggleStart = new JoinDataComplete(
new JoinData // new JoinData
{ // {
JoinNumber = 1100, // JoinNumber = 1100,
JoinSpan = 100 // JoinSpan = 100
}, // },
new JoinMetadata // new JoinMetadata
{ // {
Description = "Toggles the participant's pin status", // Description = "Toggles the participant's pin status",
JoinCapabilities = eJoinCapabilities.ToSIMPL, // JoinCapabilities = eJoinCapabilities.ToSIMPL,
JoinType = eJoinType.Digital // JoinType = eJoinType.Digital
}); // });
#endregion #endregion