Merge pull request #1394 from PepperDash/temp

merge temp into dev

src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs

@@ -30,17 +30,6 @@ namespace PepperDash.Essentials.Core.Bridges
         {
 
         }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="name"></param>
-        protected BridgeApi(string key, string name) :
-            base(key, name)
-        {
-
-        }
     }
 
     /// <summary>
@@ -69,7 +58,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <param name="dc">Device configuration</param>
         /// <param name="eisc">EISC instance</param>
         public EiscApiAdvanced(DeviceConfig dc, BasicTriList eisc) :
-            base(dc.Key, dc.Name)
+            base(dc.Key)
         {
             JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
 

src/PepperDash.Essentials.Core/Room/IHasDestinationList.cs

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using PepperDash.Essentials.Core;
-
-
-/// <summary>
-/// Interface for rooms with a list of destinations
-/// </summary>
-interface IHasDestinationList
-{
-    /// <summary>
-    /// Gets the dictionary of destinations.
-    /// </summary>
-    Dictionary<string, IRoutingSink> Destinations { get; }
-}

src/PepperDash.Essentials.Core/Room/IHasSourceList.cs

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using PepperDash.Essentials.Core;
-
-
-/// <summary>
-/// Interface for rooms with a list of destinations
-/// </summary>
-interface IHasSourceList
-{
-    /// <summary>
-    /// Gets the list of sources.
-    /// </summary>
-    Dictionary<string, SourceListItem> SourceList { get; }
-}

src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
@@ -231,15 +230,6 @@ namespace PepperDash.Essentials.Core.Routing
                             return roomDefaultDisplay.DefaultDisplay.Key == destination.Key;
                         }
 
-                        if (r is IHasDestinationList roomDestinationList)
-                        {
-                            return roomDestinationList.Destinations.Any(d =>
-                                d.Value.Key == destination.Key
-                            );
-                        }
-
-                        var destList = ConfigReader.ConfigObject.GetDestinationListForKey(r.DestinationListKey);
-
                         return false;
                     }
                 );
@@ -257,15 +247,7 @@ namespace PepperDash.Essentials.Core.Routing
 
             // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found room {room} for destination {destination}", this, room.Key, destination.Key);
 
-            Dictionary<string, SourceListItem> sourceList = null;
-
-            if (room is IHasSourceList roomWithSourceList)
-            {
-                sourceList = roomWithSourceList.SourceList;
-            }
-            else {
-                 sourceList = ConfigReader.ConfigObject.GetSourceListForKey(room.SourceListKey);
-            }   
+            var sourceList = ConfigReader.ConfigObject.GetSourceListForKey(room.SourceListKey);
 
             if (sourceList == null)
             {