diff --git a/Essentials/PepperDashEssentials/Room/Config/EssentialsHuddleVtc1PropertiesConfig.cs b/Essentials/PepperDashEssentials/Room/Config/EssentialsHuddleVtc1PropertiesConfig.cs index 25093c1a..1d9051d5 100644 --- a/Essentials/PepperDashEssentials/Room/Config/EssentialsHuddleVtc1PropertiesConfig.cs +++ b/Essentials/PepperDashEssentials/Room/Config/EssentialsHuddleVtc1PropertiesConfig.cs @@ -9,7 +9,9 @@ namespace PepperDash.Essentials.Room.Config public class EssentialsHuddleVtc1PropertiesConfig : EssentialsRoomPropertiesConfig { - - + public string DefaultDisplayKey { get; set; } + public string DefaultAudioKey { get; set; } + public string SourceListKey { get; set; } + public string DefaultSourceItem { get; set; } } } \ No newline at end of file diff --git a/Essentials/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs b/Essentials/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs index f2b845c8..7761d367 100644 --- a/Essentials/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs +++ b/Essentials/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs @@ -58,9 +58,14 @@ namespace PepperDash.Essentials.Room.Config { var props = JsonConvert.DeserializeObject (this.Properties.ToString()); + var disp = DeviceManager.GetDeviceForKey(props.DefaultDisplayKey) as IRoutingSinkWithSwitching; + var rm = new EssentialsHuddleVtc1Room(Key, Name, disp, disp, props); + rm.LogoUrl = props.Logo.GetUrl(); + rm.SourceListKey = props.SourceListKey; + rm.DefaultSourceItem = props.DefaultSourceItem; + rm.DefaultVolume = (ushort)(props.Volumes.Master.Level * 65535 / 100); - var vtcRoom = new EssentialsHuddleVtc1Room(Key, Name, null, null, props); - return vtcRoom; + return rm; } return null; diff --git a/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs b/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs index cb3d962a..60bed37e 100644 --- a/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs +++ b/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs @@ -250,8 +250,6 @@ namespace PepperDash.Essentials } var item = dict[routeKey]; - //Debug.Console(2, this, "Action {0} has {1} steps", - // item.SourceKey, item.RouteList.Count); // End usage timer on last source if (!string.IsNullOrEmpty(LastSourceKey)) @@ -292,15 +290,6 @@ namespace PepperDash.Essentials Type = eRoutingSignalType.Video }; DoRoute(tempVideo); - - //var tempAudio = new SourceRouteListItem - //{ - // DestinationKey = "$defaultAudio", - // SourceKey = route.SourceKey, - // Type = eRoutingSignalType.Audio - //}; - //DoRoute(tempAudio); - //continue; -- not sure why this was here } else DoRoute(route); @@ -343,8 +332,6 @@ namespace PepperDash.Essentials CurrentSourceInfoKey = routeKey; CurrentSourceInfo = item; } - // And finally, set the "control". This will trigger event - //CurrentControlDevice = DeviceManager.GetDeviceForKey(item.SourceKey) as Device; OnFeedback.FireUpdate(); diff --git a/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsCiscoSparkUiDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsCiscoSparkUiDriver.cs index 171ffcee..80d5d79e 100644 --- a/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsCiscoSparkUiDriver.cs +++ b/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsCiscoSparkUiDriver.cs @@ -69,7 +69,7 @@ namespace PepperDash.Essentials.UIDrivers.VC //DirectorySrl = new SubpageReferenceList(triList, UISmartObjectJoin.VCDirectoryList, 3, 3, 3); VCControlsInterlock = new JoinedSigInterlock(triList); - VCControlsInterlock.SetButDontShow(UIBoolJoin.VCRecentsVisible); + VCControlsInterlock.SetButDontShow(UIBoolJoin.VCDirectoryVisible); StagingBarInterlock = new JoinedSigInterlock(triList); StagingBarInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverVisible); @@ -117,20 +117,20 @@ namespace PepperDash.Essentials.UIDrivers.VC if(TriList.SmartObjects.Contains(UISmartObjectJoin.VCDialKeypad)) { DialKeypad = new SmartObjectNumeric(TriList.SmartObjects[UISmartObjectJoin.VCDialKeypad], true); - DialKeypad.Digit0.SetBoolSigAction(b => ___DialPlaceholder___(0)); - DialKeypad.Digit1.SetBoolSigAction(b => ___DialPlaceholder___(1)); - DialKeypad.Digit2.SetBoolSigAction(b => ___DialPlaceholder___(2)); - DialKeypad.Digit3.SetBoolSigAction(b => ___DialPlaceholder___(3)); - DialKeypad.Digit4.SetBoolSigAction(b => ___DialPlaceholder___(4)); - DialKeypad.Digit5.SetBoolSigAction(b => ___DialPlaceholder___(5)); - DialKeypad.Digit6.SetBoolSigAction(b => ___DialPlaceholder___(6)); - DialKeypad.Digit7.SetBoolSigAction(b => ___DialPlaceholder___(7)); - DialKeypad.Digit8.SetBoolSigAction(b => ___DialPlaceholder___(8)); - DialKeypad.Digit9.SetBoolSigAction(b => ___DialPlaceholder___(9)); + DialKeypad.Digit0.SetSigFalseAction(() => ___DialPlaceholder___(0)); + DialKeypad.Digit1.SetSigFalseAction(() => ___DialPlaceholder___(1)); + DialKeypad.Digit2.SetSigFalseAction(() => ___DialPlaceholder___(2)); + DialKeypad.Digit3.SetSigFalseAction(() => ___DialPlaceholder___(3)); + DialKeypad.Digit4.SetSigFalseAction(() => ___DialPlaceholder___(4)); + DialKeypad.Digit5.SetSigFalseAction(() => ___DialPlaceholder___(5)); + DialKeypad.Digit6.SetSigFalseAction(() => ___DialPlaceholder___(6)); + DialKeypad.Digit7.SetSigFalseAction(() => ___DialPlaceholder___(7)); + DialKeypad.Digit8.SetSigFalseAction(() => ___DialPlaceholder___(8)); + DialKeypad.Digit9.SetSigFalseAction(() => ___DialPlaceholder___(9)); DialKeypad.Misc1SigName = "*"; - DialKeypad.Misc1.SetBoolSigAction(b => { }); + DialKeypad.Misc1.SetSigFalseAction(() => { }); DialKeypad.Misc2SigName = "#"; - DialKeypad.Misc2.SetBoolSigAction(b => { }); + DialKeypad.Misc2.SetSigFalseAction(() => { }); } else Debug.Console(0, "Trilist {0:x2}, VC dial keypad object {1} not found. Check SGD file or VTP", diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz index 9d6c6cf2..8044f6e7 100644 Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll index 442bd101..deaab97e 100644 Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ