pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-01-27 11:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed Layout Position properties and methods. Using SelfviewPipPosition properties and methods.

Browse Source
This commit is contained in:
Jason DeVito
2021-06-08 15:20:42 -05:00
parent 655bb954fa
commit ca8207f2bd
3 changed files with 2 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasCodecLayouts.cs
View File

@@ -32,7 +32,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
BoolFeedback CanSwapContentWithThumbnailFeedback { get; }
BoolFeedback ContentSwappedWithThumbnailFeedback { get; }
StringFeedback LayoutSizeFeedback { get; } // TODO: #714 [ ] Feature Layout Size
//StringFeedback LayoutPositionFeedback { get; } // TODO: #714 [ ] Feature Layout Size
ZoomRoom.zConfiguration.eLayoutStyle LastSelectedLayout { get; }
ZoomRoom.zConfiguration.eLayoutStyle AvailableLayouts { get; }
@@ -46,9 +45,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
void GetCurrentLayoutSize(); // TODO: #714 [ ] Feature Layout Size
void SetLayoutSize(ZoomRoom.zConfiguration.eLayoutSize layoutSize); // TODO: #714 [ ] Feature Layout Size
void GetCurrentLayoutPosition(); // TODO: #714 [ ] Feature Layout Size
void SetLayoutPosition(ZoomRoom.zConfiguration.eLayoutPosition layoutPosition); // TODO: #714 [ ] Feature Layout Size
}
public class LayoutInfoChangedEventArgs : EventArgs

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

@@ -108,10 +108,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
ReceivingContent = new BoolFeedback(FarEndIsSharingContentFeedbackFunc);
SelfviewPipPositionFeedback = new StringFeedback(SelfviewPipPositionFeedbackFunc);
// TODO: #714 [ ] Feature Layout Size
// Testing to see if the below is needed or if Selfview PiP Postion handles the feedback
//LayoutPositionFeedback = new StringFeedback(LayoutPositionFeedbackFunc);
SetUpFeedbackActions();
Cameras = new List<CameraBase>();
@@ -132,7 +129,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
// TODO: #714 [ ] Feature Layout Size
LayoutSizeFeedback = new StringFeedback(LayoutSizeFeedbackFunc);
LayoutViewIsOnFirstPageFeedback = new BoolFeedback(LayoutViewIsOnFirstPageFeedbackFunc);
LayoutViewIsOnLastPageFeedback = new BoolFeedback(LayoutViewIsOnLastPageFeedbackFunc);
CanSwapContentWithThumbnailFeedback = new BoolFeedback(CanSwapContentWithThumbnailFeedbackFunc);
@@ -1828,42 +1824,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
Debug.Console(1, this, "Unable to parse '{0}' to zConfiguration.eLayoutSize: {1}", s, e);
}
});
layoutsCodec.LayoutSizeFeedback.LinkInputSig(trilist.StringInput[joinMap.GetSetCurrentLayoutSize.JoinNumber]);
// TODO: #714 [ ] Feature Layout Size
trilist.SetSigFalseAction(joinMap.SetLayoutPositionCenter.JoinNumber,
() => layoutsCodec.SetLayoutPosition(zConfiguration.eLayoutPosition.Center));
trilist.SetSigFalseAction(joinMap.SetLayoutPositionUp.JoinNumber,
() => layoutsCodec.SetLayoutPosition(zConfiguration.eLayoutPosition.Up));
trilist.SetSigFalseAction(joinMap.SetLayoutPositionRight.JoinNumber,
() => layoutsCodec.SetLayoutPosition(zConfiguration.eLayoutPosition.Right));
trilist.SetSigFalseAction(joinMap.SetLayoutPositionUpRight.JoinNumber,
() => layoutsCodec.SetLayoutPosition(zConfiguration.eLayoutPosition.UpRight));
trilist.SetSigFalseAction(joinMap.SetLayoutPositionDown.JoinNumber,
() => layoutsCodec.SetLayoutPosition(zConfiguration.eLayoutPosition.Down));
trilist.SetSigFalseAction(joinMap.SetLayoutPositionDownRight.JoinNumber,
() => layoutsCodec.SetLayoutPosition(zConfiguration.eLayoutPosition.DownRight));
trilist.SetSigFalseAction(joinMap.SetLayoutPositionLeft.JoinNumber,
() => layoutsCodec.SetLayoutPosition(zConfiguration.eLayoutPosition.Left));
trilist.SetSigFalseAction(joinMap.SetLayoutPositionUpLeft.JoinNumber,
() => layoutsCodec.SetLayoutPosition(zConfiguration.eLayoutPosition.UpLeft));
trilist.SetSigFalseAction(joinMap.SetLayoutPositionDownLeft.JoinNumber,
() => layoutsCodec.SetLayoutPosition(zConfiguration.eLayoutPosition.DownLeft));
trilist.SetSigFalseAction(joinMap.GetSetCurrentLayoutPosition.JoinNumber, layoutsCodec.GetCurrentLayoutPosition);
trilist.SetStringSigAction(joinMap.GetSetCurrentLayoutPosition.JoinNumber, (s) =>
{
try
{
var position = (zConfiguration.eLayoutPosition) Enum.Parse(typeof (zConfiguration.eLayoutPosition), s, true);
SetLayoutPosition(position);
}
catch (Exception e)
{
Debug.Console(1, this, "Unable to parse '{0}' to zConfiguration.eLayoutPosition: {1}", s, e);
}
});
//layoutsCodec.LayoutPositionFeedback.LinkInputSig(trilist.StringInput[joinMap.GetSetCurrentLayoutPosition.JoinNumber]);
SelfviewPipPositionFeedback.LinkInputSig(trilist.StringInput[joinMap.GetSetCurrentLayoutPosition.JoinNumber]);
layoutsCodec.LayoutSizeFeedback.LinkInputSig(trilist.StringInput[joinMap.GetSetCurrentLayoutSize.JoinNumber]);
}
var pinCodec = this as IHasParticipantPinUnpin;
@@ -2309,8 +2270,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
private void ComputeAvailableLayouts()
{
zConfiguration.eLayoutStyle availableLayouts = zConfiguration.eLayoutStyle.None;
// TODO: #697 [X] Compute the avaialble layouts and set the value of AvailableLayouts
// Will need to test and confirm that this logic evaluates correctly
if (Status.Layout.can_Switch_Wall_View)
{
availableLayouts |= zConfiguration.eLayoutStyle.Gallery;
@@ -2414,49 +2373,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
/// </summary>
public StringFeedback LayoutSizeFeedback { get; private set; }
// TODO: #714 [ ] Feature Layout Size
/// <summary>
/// Stores last selected layout position
/// </summary>
public zConfiguration.eLayoutPosition LastSelectedLayoutPosition { get; private set; }
// TODO: #714 [ ] Feature Layout Size
/// <summary>
/// Queries for current layout position
/// </summary>
public void GetCurrentLayoutPosition()
{
SendText("zConfiguration Call Layout Position");
}
// TODO: #714 [ ] Feature Layout Size
/// <summary>
/// Sets selected layout position
/// </summary>
/// <param name="layoutPosition"></param>
public void SetLayoutPosition(zConfiguration.eLayoutPosition layoutPosition)
{
LastSelectedLayoutPosition = layoutPosition;
SendText(String.Format("zConfiguration Call Layout Position: {0}", layoutPosition.ToString()));
}
// TODO: #714 [ ] Feature Layout Size
// commented out to test if SelfviewPipPositionFeedback & (Func) would provide feedback
// --> in testing, feedback of the current position is still not updating
//private Func<string> LayoutPositionFeedbackFunc
//{
// get
// {
// return () => Configuration.Call.Layout.Position.ToString();
// }
//}
/// <summary>
/// Layout position feedback
/// </summary>
//public StringFeedback LayoutPositionFeedback { get; private set; }
#endregion
#region IHasCodecLayouts Members

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

@@ -6,8 +6,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{
public class ZoomRoomJoinMap : VideoCodecControllerJoinMap
{
// TODO: #697 [X] Set join numbers
#region Digital
[JoinName("CanSwapContentWithThumbnail")]
@@ -237,141 +235,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
Description = "Sets layout size strip",
JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
JoinType = eJoinType.Digital
});
// TODO: #714 [ ] Feature Layout Size
[JoinName("SetLayoutPositionCenter")]
public JoinDataComplete SetLayoutPositionCenter = new JoinDataComplete(
new JoinData
{
JoinNumber = 241,
JoinSpan = 1
},
new JoinMetadata
{
Description = "Sets layout position to center",
JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
JoinType = eJoinType.Digital
});
// TODO: #714 [ ] Feature Layout Size
[JoinName("SetLayoutPositionUp")]
public JoinDataComplete SetLayoutPositionUp = new JoinDataComplete(
new JoinData
{
JoinNumber = 242,
JoinSpan = 1
},
new JoinMetadata
{
Description = "Sets layout position to up",
JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
JoinType = eJoinType.Digital
});
// TODO: #714 [ ] Feature Layout Size
[JoinName("SetLayoutPositionRight")]
public JoinDataComplete SetLayoutPositionRight = new JoinDataComplete(
new JoinData
{
JoinNumber = 243,
JoinSpan = 1
},
new JoinMetadata
{
Description = "Sets layout position to right",
JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
JoinType = eJoinType.Digital
});
// TODO: #714 [ ] Feature Layout Size
[JoinName("SetLayoutPositionUpRight")]
public JoinDataComplete SetLayoutPositionUpRight = new JoinDataComplete(
new JoinData
{
JoinNumber = 244,
JoinSpan = 1
},
new JoinMetadata
{
Description = "Sets layout position to up right",
JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
JoinType = eJoinType.Digital
});
// TODO: #714 [ ] Feature Layout Size
[JoinName("SetLayoutPositionDown")]
public JoinDataComplete SetLayoutPositionDown = new JoinDataComplete(
new JoinData
{
JoinNumber = 245,
JoinSpan = 1
},
new JoinMetadata
{
Description = "Sets layout position to down",
JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
JoinType = eJoinType.Digital
});
// TODO: #714 [ ] Feature Layout Size
[JoinName("SetLayoutPositionDownRight")]
public JoinDataComplete SetLayoutPositionDownRight = new JoinDataComplete(
new JoinData
{
JoinNumber = 246,
JoinSpan = 1
},
new JoinMetadata
{
Description = "Sets layout position to down right",
JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
JoinType = eJoinType.Digital
});
// TODO: #714 [ ] Feature Layout Size
[JoinName("SetLayoutPositionLeft")]
public JoinDataComplete SetLayoutPositionLeft = new JoinDataComplete(
new JoinData
{
JoinNumber = 247,
JoinSpan = 1
},
new JoinMetadata
{
Description = "Sets layout position todown left",
JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
JoinType = eJoinType.Digital
});
// TODO: #714 [ ] Feature Layout Size
[JoinName("SetLayoutPositionUpLeft")]
public JoinDataComplete SetLayoutPositionUpLeft = new JoinDataComplete(
new JoinData
{
JoinNumber = 248,
JoinSpan = 1
},
new JoinMetadata
{
Description = "Sets layout position to up left",
JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
JoinType = eJoinType.Digital
});
// TODO: #714 [ ] Feature Layout Size
[JoinName("SetLayoutPositionDownLeft")]
public JoinDataComplete SetLayoutPositionDownLeft = new JoinDataComplete(
new JoinData
{
JoinNumber = 249,
JoinSpan = 1
},
new JoinMetadata
{
Description = "Sets layout position to down left",
JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
JoinType = eJoinType.Digital
});
//[JoinName("ParticipantAudioMuteToggleStart")]
@@ -483,22 +346,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
JoinType = eJoinType.DigitalSerial
});
// TODO: #714 [ ] Feature Layout Size
[JoinName("GetSetCurrentLayoutPosition")]
public JoinDataComplete GetSetCurrentLayoutPosition = new JoinDataComplete(
new JoinData
{
JoinNumber = 240,
JoinSpan = 1
},
new JoinMetadata
{
Description = "Sets and reports the current layout position.",
JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
JoinType = eJoinType.DigitalSerial
});
#endregion
public ZoomRoomJoinMap(uint joinStart)