From 374ce13add3e282983793c59df9ddd5867d399ba Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Tue, 7 Jul 2020 13:22:44 -0600 Subject: [PATCH] updates for dual-display Fusion --- .../Fusion/EssentialsDualDisplayFusionController.cs | 12 +++++++++++- .../Fusion/EssentialsHuddleVtc1FusionController.cs | 8 +------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsDualDisplayFusionController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsDualDisplayFusionController.cs index a45168f5..e6ddd80f 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsDualDisplayFusionController.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsDualDisplayFusionController.cs @@ -20,7 +20,12 @@ namespace PepperDash.Essentials.Core.Fusion protected override void ExecuteCustomSteps() { + var leftDisplay = _room.LeftDisplay as DisplayBase; + var rightDisplay = _room.RightDisplay as DisplayBase; + SetUpCodec(); + SetUpDisplay(leftDisplay); + SetUpDisplay(rightDisplay); base.ExecuteCustomSteps(); } @@ -30,7 +35,12 @@ namespace PepperDash.Essentials.Core.Fusion protected override void SetUpDisplay() { - base.SetUpDisplay(); + //todo figure out what to do here... + } + + private void SetUpDisplay(DisplayBase display) + { + FusionAsset tempAsset; } diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleVtc1FusionController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleVtc1FusionController.cs index 84adc0f8..fe16f5cb 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleVtc1FusionController.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleVtc1FusionController.cs @@ -34,13 +34,7 @@ namespace PepperDash.Essentials.Core.Fusion { try { - var essentialsHuddleVtc1Room = Room as EssentialsHuddleVtc1Room; - if (essentialsHuddleVtc1Room == null) - { - return; - } - - var codec = essentialsHuddleVtc1Room.VideoCodec; + var codec = _room.VideoCodec; if (codec == null) {