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

Updated IHasCodecLayouts and ZoomRoom to test feedback of Layout Size and Layout Position.

Browse Source
This commit is contained in:
Jason DeVito
2021-06-08 14:38:33 -05:00
parent 492e593263
commit 655bb954fa
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
BoolFeedback CanSwapContentWithThumbnailFeedback { get; } BoolFeedback CanSwapContentWithThumbnailFeedback { get; }
BoolFeedback ContentSwappedWithThumbnailFeedback { get; } BoolFeedback ContentSwappedWithThumbnailFeedback { get; }
StringFeedback LayoutSizeFeedback { get; } // TODO: #714 [ ] Feature Layout Size StringFeedback LayoutSizeFeedback { get; } // TODO: #714 [ ] Feature Layout Size
StringFeedback LayoutPositionFeedback { get; } // TODO: #714 [ ] Feature Layout Size //StringFeedback LayoutPositionFeedback { get; } // TODO: #714 [ ] Feature Layout Size
ZoomRoom.zConfiguration.eLayoutStyle LastSelectedLayout { get; } ZoomRoom.zConfiguration.eLayoutStyle LastSelectedLayout { get; }
ZoomRoom.zConfiguration.eLayoutStyle AvailableLayouts { get; } ZoomRoom.zConfiguration.eLayoutStyle AvailableLayouts { get; }

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

@@ -108,6 +108,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
ReceivingContent = new BoolFeedback(FarEndIsSharingContentFeedbackFunc); ReceivingContent = new BoolFeedback(FarEndIsSharingContentFeedbackFunc);
SelfviewPipPositionFeedback = new StringFeedback(SelfviewPipPositionFeedbackFunc); 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(); SetUpFeedbackActions();
@@ -127,8 +130,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
LocalLayoutFeedback = new StringFeedback(LocalLayoutFeedbackFunc); LocalLayoutFeedback = new StringFeedback(LocalLayoutFeedbackFunc);
// TODO: #714 [ ] Feature Layout Size // TODO: #714 [ ] Feature Layout Size
LayoutSizeFeedback = new StringFeedback(LayoutSizeFeedbackFunc); LayoutSizeFeedback = new StringFeedback(LayoutSizeFeedbackFunc);
LayoutPositionFeedback = new StringFeedback(LayoutPositionFeedbackFunc);
LayoutViewIsOnFirstPageFeedback = new BoolFeedback(LayoutViewIsOnFirstPageFeedbackFunc); LayoutViewIsOnFirstPageFeedback = new BoolFeedback(LayoutViewIsOnFirstPageFeedbackFunc);
@@ -516,6 +518,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
LocalLayoutFeedback.FireUpdate(); LocalLayoutFeedback.FireUpdate();
break; break;
} }
case "Size":
{
break;
}
} }
}; };
@@ -1488,7 +1495,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
return; return;
} }
Debug.Console(1, this, "****************************Call Participants***************************"); Debug.Console(1, this, "*************************** Call Participants **************************");
foreach (var participant in Participants.CurrentParticipants) foreach (var participant in Participants.CurrentParticipants)
{ {
Debug.Console(1, this, "Name: {0} Audio: {1} IsHost: {2}", participant.Name, Debug.Console(1, this, "Name: {0} Audio: {1} IsHost: {2}", participant.Name,
@@ -1575,7 +1582,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
} }
} }
Debug.Console(1, this, "****************************Active Calls*********************************"); Debug.Console(1, this, "*************************** Active Calls ********************************");
// Clean up any disconnected calls left in the list // Clean up any disconnected calls left in the list
for (int i = 0; i < ActiveCalls.Count; i++) for (int i = 0; i < ActiveCalls.Count; i++)
@@ -1591,7 +1598,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
if (!call.IsActiveCall) if (!call.IsActiveCall)
{ {
Debug.Console(1, this, "******Removing Inactive Call: {0}******", call.Name); Debug.Console(1, this, "***** Removing Inactive Call: {0} *****", call.Name);
ActiveCalls.Remove(call); ActiveCalls.Remove(call);
} }
} }
@@ -1855,7 +1862,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
Debug.Console(1, this, "Unable to parse '{0}' to zConfiguration.eLayoutPosition: {1}", s, 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]);
} }
var pinCodec = this as IHasParticipantPinUnpin; var pinCodec = this as IHasParticipantPinUnpin;
@@ -2411,7 +2419,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
/// Stores last selected layout position /// Stores last selected layout position
/// </summary> /// </summary>
public zConfiguration.eLayoutPosition LastSelectedLayoutPosition { get; private set; } public zConfiguration.eLayoutPosition LastSelectedLayoutPosition { get; private set; }
// TODO: #714 [ ] Feature Layout Size // TODO: #714 [ ] Feature Layout Size
/// <summary> /// <summary>
/// Queries for current layout position /// Queries for current layout position
@@ -2433,18 +2441,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
} }
// TODO: #714 [ ] Feature Layout Size // TODO: #714 [ ] Feature Layout Size
private Func<string> LayoutPositionFeedbackFunc // commented out to test if SelfviewPipPositionFeedback & (Func) would provide feedback
{ // --> in testing, feedback of the current position is still not updating
get //private Func<string> LayoutPositionFeedbackFunc
{ //{
return () => Configuration.Call.Layout.Position.ToString(); // get
} // {
} // return () => Configuration.Call.Layout.Position.ToString();
// }
//}
/// <summary> /// <summary>
/// Layout position feedback /// Layout position feedback
/// </summary> /// </summary>
public StringFeedback LayoutPositionFeedback { get; private set; } //public StringFeedback LayoutPositionFeedback { get; private set; }
#endregion #endregion
@@ -2479,7 +2490,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
public void MinMaxLayoutToggle() public void MinMaxLayoutToggle()
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
#endregion #endregion