Compare commits

...

3 Commits

Author SHA1 Message Date
Neil Dorin
2f9038a501 fix: adds initializer for dictionaries 2024-05-21 22:15:50 -06:00
Neil Dorin
983b18d25a fix: fixes type of AudioControlPointLists 2024-05-21 17:28:05 -06:00
Neil Dorin
048004d441 fix: updates IEssentialsRoom and EssentialsRoomBase for missed changes 2024-05-21 17:14:13 -06:00
4 changed files with 12 additions and 11 deletions

View File

@@ -11,9 +11,10 @@ namespace PepperDash.Essentials.Core.Config
public class AudioControlPointListItem
{
[JsonProperty("levelControls")]
public Dictionary<string, LevelControlListItem> LevelControls { get; set; }
public Dictionary<string, LevelControlListItem> LevelControls { get; set; } = new Dictionary<string, LevelControlListItem>();
[JsonProperty("presets")]
public Dictionary<string, PresetListItem> Presets { get; set; }
public Dictionary<string, PresetListItem> Presets { get; set; } = new Dictionary<string, PresetListItem>();
}
}

View File

@@ -26,7 +26,7 @@ namespace PepperDash.Essentials.Core.Config
public Dictionary<string, Dictionary<string, DestinationListItem>> DestinationLists { get; set; }
[JsonProperty("audioControlPointLists")]
public Dictionary<string, Dictionary<string, AudioControlPointListItem>> AudioControlPointLists { get; set; }
public 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>>();
AudioControlPointLists = new Dictionary<string, Dictionary<string, AudioControlPointListItem>>();
AudioControlPointLists = new Dictionary<string, AudioControlPointListItem>();
TieLines = new List<TieLineConfig>();
JoinMaps = new Dictionary<string, JObject>();
}
@@ -76,7 +76,7 @@ namespace PepperDash.Essentials.Core.Config
/// </summary>
/// <param name="key">key of the list to retrieve</param>
/// <returns>AudioControlPointList if the key exists, null otherwise</returns>
public Dictionary<string, AudioControlPointListItem> GetAudioControlPointListForKey(string key)
public AudioControlPointListItem GetAudioControlPointListForKey(string key)
{
if (string.IsNullOrEmpty(key) || !AudioControlPointLists.ContainsKey(key))
return null;

View File

@@ -110,12 +110,12 @@ namespace PepperDash.Essentials.Core
}
}
private string _levelControlListKey;
public string LevelControlListKey
private string _audioControlPointListKey;
public string AudioControlPointListKey
{
get
{
if (string.IsNullOrEmpty(_levelControlListKey))
if (string.IsNullOrEmpty(_audioControlPointListKey))
{
return _defaultListKey;
}
@@ -126,9 +126,9 @@ namespace PepperDash.Essentials.Core
}
protected set
{
if (value != _levelControlListKey)
if (value != _audioControlPointListKey)
{
_levelControlListKey = value;
_audioControlPointListKey = value;
}
}
}

View File

@@ -29,7 +29,7 @@ namespace PepperDash.Essentials.Core
string DestinationListKey { get; }
string LevelControlListKey { get; }
string AudioControlPointListKey { get; }
SecondsCountdownTimer ShutdownPromptTimer { get; }
int ShutdownPromptSeconds { get; }