pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-01-27 19:34:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Changes LevelControlLists to AudioControlPointLists and modified IHasDspPresets

Browse Source
This commit is contained in:
Neil Dorin
2024-05-21 16:49:13 -06:00
parent d8d2c5b340
commit 2e61d8d709
10 changed files with 130 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/PepperDash.Essentials.Core/Config/AudioControlPointListItem.cs Normal file
View File

@@ -0,0 +1,19 @@
using Crestron.SimplSharpPro;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PepperDash.Essentials.Core.Config
{
public class AudioControlPointListItem
{
[JsonProperty("levelControls")]
public Dictionary<string, LevelControlListItem> LevelControls { get; set; }
[JsonProperty("presets")]
public Dictionary<string, PresetListItem> Presets { get; set; }
}
}

18
src/PepperDash.Essentials.Core/Config/BasicConfig.cs
View File

@@ -25,8 +25,8 @@ namespace PepperDash.Essentials.Core.Config
[JsonProperty("destinationLists")]
public Dictionary<string, Dictionary<string, DestinationListItem>> DestinationLists { get; set; }
[JsonProperty("levelControlLists")]
public Dictionary<string, Dictionary<string, LevelControlListItem>> LevelControlLists { get; set; }
[JsonProperty("audioControlPointLists")]
public Dictionary<string, Dictionary<string, AudioControlPointListItem>> AudioControlPointLists { get; set; }
[JsonProperty("tieLines")]
public List<TieLineConfig> TieLines { get; set; }
@@ -40,7 +40,7 @@ namespace PepperDash.Essentials.Core.Config
Devices = new List<DeviceConfig>();
SourceLists = new Dictionary<string, Dictionary<string, SourceListItem>>();
DestinationLists = new Dictionary<string, Dictionary<string, DestinationListItem>>();
LevelControlLists = new Dictionary<string, Dictionary<string, LevelControlListItem>>();
AudioControlPointLists = new Dictionary<string, Dictionary<string, AudioControlPointListItem>>();
TieLines = new List<TieLineConfig>();
JoinMaps = new Dictionary<string, JObject>();
}
@@ -69,19 +69,19 @@ namespace PepperDash.Essentials.Core.Config
}
return DestinationLists[key];
}
}
/// <summary>
/// Retrieves a LevelControlList based on the key
/// Retrieves a AudioControlPointList based on the key
/// </summary>
/// <param name="key">key of the list to retrieve</param>
/// <returns>LevelControlList if the key exists, null otherwise</returns>
public Dictionary<string, LevelControlListItem> GetLevelControlListForKey(string key)
/// <returns>AudioControlPointList if the key exists, null otherwise</returns>
public Dictionary<string, AudioControlPointListItem> GetAudioControlPointListForKey(string key)
{
if (string.IsNullOrEmpty(key) || !LevelControlLists.ContainsKey(key))
if (string.IsNullOrEmpty(key) || !AudioControlPointLists.ContainsKey(key))
return null;
return LevelControlLists[key];
return AudioControlPointLists[key];
}
/// <summary>

36
src/PepperDash.Essentials.Core/Devices/AudioControlListItemBase.cs Normal file
View File

@@ -0,0 +1,36 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PepperDash.Essentials.Core
{
public abstract class AudioControlListItemBase
{
[JsonProperty("parentDeviceKey")]
public string ParentDeviceKey { get; set; }
[JsonProperty("itemKey")]
public string ItemKey { get; set; }
/// <summary>
/// A name that will override the items's name on the UI
/// </summary>
[JsonProperty("name")]
public string Name { get; set; }
/// <summary>
/// Indicates if the item should be included in the user accessible list
/// </summary>
[JsonProperty("includeInUserList")]
public bool IncludeInUserList { get; set; }
/// <summary>
/// Used to specify the order of the items in the source list when displayed
/// </summary>
[JsonProperty("order")]
public int Order { get; set; }
}
}

17
src/PepperDash.Essentials.Core/Devices/IDspPreset.cs
View File

@@ -1,17 +0,0 @@
using System.Collections.Generic;
namespace PepperDash.Essentials.Core
{
public interface IHasDspPresets
{
List<IDspPreset> Presets { get; }
void RecallPreset(IDspPreset preset);
}
public interface IDspPreset
{
string Name { get; }
}
}

12
src/PepperDash.Essentials.Core/Devices/IDspPresets.cs Normal file
View File

@@ -0,0 +1,12 @@
using PepperDash.Core;
using System.Collections.Generic;
namespace PepperDash.Essentials.Core
{
public interface IDspPresets
{
Dictionary<string, IKeyName> Presets { get; }
void RecallPreset(string key);
}
}

30
src/PepperDash.Essentials.Core/Devices/LevelControlListItem.cs
View File

@@ -5,13 +5,13 @@ using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json;
using PepperDash.Core;
using PepperDash.Essentials.Core.Devices;
namespace PepperDash.Essentials.Core
{
public class LevelControlListItem
public class LevelControlListItem : AudioControlListItemBase
{
[JsonProperty("deviceKey")]
public string DeviceKey { get; set; }
[JsonIgnore]
public IBasicVolumeWithFeedback LevelControl
@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Core
get
{
if (_levelControl == null)
_levelControl = DeviceManager.GetDeviceForKey(DeviceKey) as IBasicVolumeWithFeedback;
_levelControl = DeviceManager.GetDeviceForKey(ParentDeviceKey) as IBasicVolumeWithFeedback;
return _levelControl;
}
}
@@ -34,8 +34,8 @@ namespace PepperDash.Essentials.Core
get
{
if (!string.IsNullOrEmpty(Name)) return Name;
else
{
else
{
if (LevelControl is IKeyName namedLevelControl)
{
if (namedLevelControl == null)
@@ -47,24 +47,6 @@ namespace PepperDash.Essentials.Core
}
}
/// <summary>
/// A name that will override the items's name on the UI
/// </summary>
[JsonProperty("name")]
public string Name { get; set; }
/// <summary>
/// Indicates if the item should be included in the user accessible list
/// </summary>
[JsonProperty("includeInUserList")]
public bool IncludeInUserList { get; set; }
/// <summary>
/// Used to specify the order of the items in the source list when displayed
/// </summary>
[JsonProperty("order")]
public int Order { get; set; }
/// <summary>
/// Indicates if the item is a level, mute , or both
/// </summary>

45
src/PepperDash.Essentials.Core/Devices/PresetListItem.cs Normal file
View File

@@ -0,0 +1,45 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json;
using PepperDash.Core;
namespace PepperDash.Essentials.Core
{
public class PresetListItem : AudioControlListItemBase
{
[JsonIgnore]
public IKeyName Preset
{
get
{
if (_preset == null)
{
var parent = DeviceManager.GetDeviceForKey(ParentDeviceKey) as IDspPresets;
if (parent == null || !parent.Presets.ContainsKey(ItemKey))
return null;
_preset = parent.Presets[ItemKey];
}
return _preset;
}
}
private IKeyName _preset;
/// <summary>
/// Gets the name from the device if it implements IKeyName or else returns the Name property
/// </summary>
[JsonProperty("preferredName")]
public string PreferredName
{
get
{
if (!string.IsNullOrEmpty(Name)) return Name;
else return Preset.Name;
}
}
}
}

2
src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
View File

@@ -23,7 +23,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.42" />
<PackageReference Include="PepperDashCore" Version="2.0.0-alpha-416" />
<PackageReference Include="PepperDashCore" Version="2.0.0-alpha-419" />
</ItemGroup>
<ItemGroup>
<None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />

2
src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
View File

@@ -27,6 +27,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.42" />
<PackageReference Include="PepperDashCore" Version="2.0.0-alpha-416" />
<PackageReference Include="PepperDashCore" Version="2.0.0-alpha-419" />
</ItemGroup>
</Project>

2
src/PepperDash.Essentials/PepperDash.Essentials.csproj
View File

@@ -47,7 +47,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.20.42" />
<PackageReference Include="PepperDashCore" Version="2.0.0-alpha-416" />
<PackageReference Include="PepperDashCore" Version="2.0.0-alpha-419" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />