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

lots of changes. Getting things working

Browse Source
This commit is contained in:
Andrew Welker
2020-07-21 13:27:15 -06:00
parent 2b06672800
commit 8d0ea82402
13 changed files with 2071 additions and 2155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs
View File

@@ -33,7 +33,7 @@ namespace PepperDash.Essentials.Core.Rooms
public EssentialsRoomBase Room { get; private set; }
private Fusion.EssentialsHuddleSpaceFusionSystemControllerBase FusionRoom;
private Fusion.EssentialsFusionSystemControllerBase FusionRoom;
public RoomOnToDefaultSourceWhenOccupied(DeviceConfig config) :
base (config)
@@ -58,7 +58,7 @@ namespace PepperDash.Essentials.Core.Rooms
var fusionRoomKey = PropertiesConfig.RoomKey + "-fusion";
FusionRoom = DeviceManager.GetDeviceForKey(fusionRoomKey) as Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase;
FusionRoom = DeviceManager.GetDeviceForKey(fusionRoomKey) as Core.Fusion.EssentialsFusionSystemControllerBase;
if (FusionRoom == null)
Debug.Console(1, this, "Unable to get Fusion Room from Device Manager with key: {0}", fusionRoomKey);

2
essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/EssentialsRoomBase.cs
View File

@@ -391,7 +391,7 @@ namespace PepperDash.Essentials.Core
Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Timeout Minutes from Config is: {0}", timeoutMinutes);
// If status provider is fusion, set flag to remote
if (statusProvider is Fusion.EssentialsHuddleSpaceFusionSystemControllerBase)
if (statusProvider is Fusion.EssentialsFusionSystemControllerBase)
{
OccupancyStatusProviderIsRemote = true;
}

18
essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs
View File

@@ -13,11 +13,26 @@ namespace PepperDash.Essentials.Core
public const string DefaultDestinationListKey = "default";
private const string LeftDestinationKey = "leftDisplay";
private const string RightDestinationKey = "rightDisplay";
private EVideoBehavior _videoRoutingBehavior;
public EssentialsDualDisplayRoomPropertiesConfig RoomConfig { get; private set; }
public EAudioBehavior AudioRoutingBehavior { get; set; }
public EVideoBehavior VideoRoutingBehavior { get; set; }
public EVideoBehavior VideoRoutingBehavior
{
get { return _videoRoutingBehavior; }
set
{
_videoRoutingBehavior = value;
var handler = VideoRoutingBehaviorChanged;
if (handler == null) return;
handler(this, new EventArgs());
}
}
public event EventHandler VideoRoutingBehaviorChanged;
private string _destinationListKey;
@@ -153,7 +168,6 @@ namespace PepperDash.Essentials.Core
throw new NotImplementedException();
}
protected override void IsWarmingUpFeedbackOnOutputChange(object sender, FeedbackEventArgs args)
{
IsWarmingUpFeedback.FireUpdate();

1
essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleVtc1Room.cs
View File

@@ -1,7 +1,6 @@
using System;
using Newtonsoft.Json;
using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Devices.AudioCodec;
using PepperDash.Essentials.Core.Devices.Codec;