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

getting things working

Browse Source
This commit is contained in:
Andrew Welker
2020-07-17 13:48:03 -06:00
parent aede5355b7
commit d6a6791e7b
5 changed files with 204 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -474,41 +474,41 @@ namespace PepperDash.Essentials.Core
/// <summary>
///
/// </summary>
/// <param name="routeKey"></param>
public virtual void RunRouteAction(string routeKey)
/// <param name="sourceKey"></param>
public virtual void RunRouteAction(string sourceKey)
{
RunRouteAction(routeKey, String.Empty, () => { });
RunRouteAction(sourceKey, String.Empty, () => { });
}
/// <summary>
/// Gets a source from config list SourceListKey and dynamically build and executes the
/// route or commands
/// </summary>
public virtual void RunRouteAction(string routeKey, Action successCallback)
public virtual void RunRouteAction(string sourceKey, Action successCallback)
{
RunRouteAction(routeKey, String.Empty, successCallback);
RunRouteAction(sourceKey, String.Empty, successCallback);
}
/// <summary>
///
/// </summary>
/// <param name="routeKey"></param>
/// <param name="sourceKey"></param>
/// <param name="sourceListKey"></param>
public virtual void RunRouteAction(string routeKey, string sourceListKey)
public virtual void RunRouteAction(string sourceKey, string sourceListKey)
{
RunRouteAction(routeKey, sourceListKey, () => { });
RunRouteAction(sourceKey, sourceListKey, () => { });
}
/// <summary>
///
/// </summary>
/// <param name="routeKey"></param>
/// <param name="sourceKey"></param>
/// <param name="sourceListKey"></param>
/// <param name="successCallback"></param>
public virtual void RunRouteAction(string routeKey, string sourceListKey, Action successCallback)
public virtual void RunRouteAction(string sourceKey, string sourceListKey, Action successCallback)
{
var routeObject =
new {RouteKey = routeKey, SourceListKey = sourceListKey, SuccessCallback = successCallback};
new {RouteKey = sourceKey, SourceListKey = sourceListKey, SuccessCallback = successCallback};
CrestronInvoke.BeginInvoke(RunRouteAction, routeObject); // end of BeginInvoke
}
@@ -572,14 +572,13 @@ namespace PepperDash.Essentials.Core
SetVolumeControl(item);
// store the name and UI info for routes
CurrentSourceInfoKey = routeObj.RouteKey;
if (item.SourceKey == "$off")
{
CurrentSourceInfoKey = routeObj.RouteKey;
CurrentSourceInfo = null;
}
else if (item.SourceKey != null)
{
CurrentSourceInfoKey = routeObj.RouteKey;
CurrentSourceInfo = item;
}
@@ -657,7 +656,7 @@ namespace PepperDash.Essentials.Core
return dest;
}
private void SetVolumeControl(SourceListItem item)
protected void SetVolumeControl(SourceListItem item)
{
IBasicVolumeControls volDev = null;
// Handle special cases for volume control
@@ -730,7 +729,7 @@ namespace PepperDash.Essentials.Core
}
}
private Dictionary<string, SourceListItem> GetSourceListForKey(string routeKey, string sourceListKey)
protected Dictionary<string, SourceListItem> GetSourceListForKey(string routeKey, string sourceListKey)
{
var slKey = String.IsNullOrEmpty(sourceListKey) ? SourceListKey : sourceListKey;