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

Initial successful tests of non-sharable source derouting and redraw of source list when in/out of call

Browse Source
This commit is contained in:
Heath Volmer
2018-02-07 09:59:12 -07:00
parent 032bb2b8e5
commit 53ee87c9be
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
View File

@@ -633,6 +633,7 @@ namespace PepperDash.Essentials
/// </summary> /// </summary>
void ActivityShareButtonPressed() void ActivityShareButtonPressed()
{ {
SetupSourceList();
if (VCDriver.IsVisible) if (VCDriver.IsVisible)
VCDriver.Hide(); VCDriver.Hide();
HideNextMeetingPopup(); HideNextMeetingPopup();
@@ -929,7 +930,7 @@ namespace PepperDash.Essentials
CurrentRoom_SyncOnFeedback(); CurrentRoom_SyncOnFeedback();
_CurrentRoom.IsWarmingUpFeedback.OutputChange += CurrentRoom_IsWarmingFeedback_OutputChange; _CurrentRoom.IsWarmingUpFeedback.OutputChange += CurrentRoom_IsWarmingFeedback_OutputChange;
_CurrentRoom.IsCoolingDownFeedback.OutputChange += CurrentRoom_IsCoolingDownFeedback_OutputChange; _CurrentRoom.IsCoolingDownFeedback.OutputChange += CurrentRoom_IsCoolingDownFeedback_OutputChange;
_CurrentRoom.InCallFeedback.OutputChange -= CurrentRoom_InCallFeedback_OutputChange; _CurrentRoom.InCallFeedback.OutputChange += CurrentRoom_InCallFeedback_OutputChange;
_CurrentRoom.CurrentVolumeDeviceChange += CurrentRoom_CurrentAudioDeviceChange; _CurrentRoom.CurrentVolumeDeviceChange += CurrentRoom_CurrentAudioDeviceChange;
@@ -973,7 +974,7 @@ namespace PepperDash.Essentials
if (CurrentRoom.CurrentSourceInfo.DisableCodecSharing) if (CurrentRoom.CurrentSourceInfo.DisableCodecSharing)
{ {
Debug.Console(1, CurrentRoom, "Transitioning to in-call, cancelling non-sharable source"); Debug.Console(1, CurrentRoom, "Transitioning to in-call, cancelling non-sharable source");
CurrentRoom.RunRouteAction("none"); CurrentRoom.RunRouteAction("codecOsd");
} }
} }
@@ -985,7 +986,8 @@ namespace PepperDash.Essentials
/// </summary> /// </summary>
void SetupSourceList() void SetupSourceList()
{ {
var inCall = CurrentRoom.VideoCodec.IsInCall; var inCall = CurrentRoom.InCallFeedback.BoolValue;
Debug.Console(0, "**** REDRAWING SOURCES InCall={0}", inCall);
var config = ConfigReader.ConfigObject.SourceLists; var config = ConfigReader.ConfigObject.SourceLists;
if (config.ContainsKey(_CurrentRoom.SourceListKey)) if (config.ContainsKey(_CurrentRoom.SourceListKey))
{ {
@@ -998,9 +1000,13 @@ namespace PepperDash.Essentials
var srcConfig = kvp.Value; var srcConfig = kvp.Value;
// Skip sources marked as not included, and filter list of non-sharable sources when in call // Skip sources marked as not included, and filter list of non-sharable sources when in call
// or on share screen // or on share screen
Debug.Console(0, "*** Source list item: {0}", Newtonsoft.Json.JsonConvert.SerializeObject(srcConfig));
if (!srcConfig.IncludeInSourceList || (inCall && srcConfig.DisableCodecSharing) if (!srcConfig.IncludeInSourceList || (inCall && srcConfig.DisableCodecSharing)
|| this.CurrentMode == UiDisplayMode.Call) || this.CurrentMode == UiDisplayMode.Call && srcConfig.DisableCodecSharing)
{
Debug.Console(0, "**** SKIPPING {0} IN SOURCE LIST", kvp.Key);
continue; continue;
}
var routeKey = kvp.Key; var routeKey = kvp.Key;
var item = new SubpageReferenceListSourceItem(i++, SourceStagingSrl, srcConfig, var item = new SubpageReferenceListSourceItem(i++, SourceStagingSrl, srcConfig,

BIN
Release Package/PepperDashEssentials.cpz
View File

Binary file not shown.