From 21f9795bcd3a103a97aeefed756e919089d82011 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 28 Jan 2021 14:05:59 -0700 Subject: [PATCH] Implements ITvPresetsProvider on IrSetTopBoxBase --- .../DeviceTypeInterfaces/ISetTopBoxControls.cs | 2 +- .../UI PageManagers/SetTopBoxThreePanelPageManager.cs | 4 ++-- .../UI PageManagers/SetTopBoxTwoPanelPageManager.cs | 4 ++-- .../SetTopBox/IRSetTopBoxBase.cs | 9 +++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ISetTopBoxControls.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ISetTopBoxControls.cs index 8b043cac..a9a92126 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ISetTopBoxControls.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ISetTopBoxControls.cs @@ -31,7 +31,7 @@ namespace PepperDash.Essentials.Core /// bool HasDpad { get; } - PepperDash.Essentials.Core.Presets.DevicePresetsModel PresetsModel { get; } + PepperDash.Essentials.Core.Presets.DevicePresetsModel TvPresets { get; } void LoadPresets(string filePath); void DvrList(bool pressRelease); diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/UI PageManagers/SetTopBoxThreePanelPageManager.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/UI PageManagers/SetTopBoxThreePanelPageManager.cs index f8838aed..e0f44046 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/UI PageManagers/SetTopBoxThreePanelPageManager.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/UI PageManagers/SetTopBoxThreePanelPageManager.cs @@ -169,9 +169,9 @@ namespace PepperDash.Essentials.Core.PageManagers } // Build presets - if (stb.HasPresets && stb.PresetsModel != null) + if (stb.HasPresets && stb.TvPresets != null) { - PresetsView = new DevicePresetsView(trilist, stb.PresetsModel); + PresetsView = new DevicePresetsView(trilist, stb.TvPresets); } } diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/UI PageManagers/SetTopBoxTwoPanelPageManager.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/UI PageManagers/SetTopBoxTwoPanelPageManager.cs index cb1e1840..2797695e 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/UI PageManagers/SetTopBoxTwoPanelPageManager.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/UI PageManagers/SetTopBoxTwoPanelPageManager.cs @@ -18,8 +18,8 @@ namespace PepperDash.Essentials.Core.PageManagers { SetTopBox = stb; TriList = trilist; - if(stb.PresetsModel != null) - PresetsView = new DevicePresetsView(trilist, stb.PresetsModel); + if(stb.TvPresets != null) + PresetsView = new DevicePresetsView(trilist, stb.TvPresets); } public override void Show() diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/SetTopBox/IRSetTopBoxBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/SetTopBox/IRSetTopBoxBase.cs index 2746a04a..394d7b8d 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/SetTopBox/IRSetTopBoxBase.cs +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/SetTopBox/IRSetTopBoxBase.cs @@ -12,11 +12,12 @@ using PepperDash.Essentials.Core.Bridges; using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Presets; using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; namespace PepperDash.Essentials.Devices.Common { [Description("Wrapper class for an IR Set Top Box")] - public class IRSetTopBoxBase : EssentialsBridgeableDevice, ISetTopBoxControls, IRoutingOutputs, IUsageTracking, IHasPowerControl + public class IRSetTopBoxBase : EssentialsBridgeableDevice, ISetTopBoxControls, IRoutingOutputs, IUsageTracking, IHasPowerControl, ITvPresetsProvider { public IrOutputPortController IrPort { get; private set; } @@ -28,7 +29,7 @@ namespace PepperDash.Essentials.Devices.Common public bool HasDpad { get; set; } public bool HasNumeric { get; set; } - public DevicePresetsModel PresetsModel { get; private set; } + public DevicePresetsModel TvPresets { get; private set; } public IRSetTopBoxBase(string key, string name, IrOutputPortController portCont, SetTopBoxPropertiesConfig props) @@ -66,8 +67,8 @@ namespace PepperDash.Essentials.Devices.Common public void LoadPresets(string filePath) { - PresetsModel = new DevicePresetsModel(Key + "-presets", this, filePath); - DeviceManager.AddDevice(PresetsModel); + TvPresets = new DevicePresetsModel(Key + "-presets", this, filePath); + DeviceManager.AddDevice(TvPresets); }