From c839cea4951986ef0324071f1041e64ca0fe5cc5 Mon Sep 17 00:00:00 2001 From: Heath Volmer Date: Thu, 9 Aug 2018 16:46:05 -0600 Subject: [PATCH] Added JSON property converter to sourceListItem type; commands to start room from call button --- .../RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs | 6 ++++++ essentials-framework | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/PepperDashEssentials/AppServer/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs b/PepperDashEssentials/AppServer/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs index 503c3b1c..24f2340a 100644 --- a/PepperDashEssentials/AppServer/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs +++ b/PepperDashEssentials/AppServer/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs @@ -115,6 +115,12 @@ namespace PepperDash.Essentials //Parent.AddAction("/device/videoCodec/endAllCalls", new Action(() => codec.EndAllCalls())); } + var defCallRm = Room as IRunDefaultCallRoute; + if (defCallRm != null) + { + Parent.AddAction(string.Format(@"/room/{0}/activityVideo", Room.Key), new Action(()=>defCallRm.RunDefaultCallRoute())); + } + Parent.AddAction(string.Format(@"/room/{0}/shutdownStart", Room.Key), new Action(() => Room.StartShutdown(eShutdownType.Manual))); Parent.AddAction(string.Format(@"/room/{0}/shutdownEnd", Room.Key), new Action(() => Room.ShutdownPromptTimer.Finish())); Parent.AddAction(string.Format(@"/room/{0}/shutdownCancel", Room.Key), new Action(() => Room.ShutdownPromptTimer.Cancel())); diff --git a/essentials-framework b/essentials-framework index d3babc37..f28c5903 160000 --- a/essentials-framework +++ b/essentials-framework @@ -1 +1 @@ -Subproject commit d3babc375ec02690385b03618845e04262ab42f0 +Subproject commit f28c59035c5de92dc2c957ad2bd56ada4538d0f3