From 4b663eea623c8ab38d9108ddbeae96afcb89adb9 Mon Sep 17 00:00:00 2001
From: Nick Genovese <ngenovese@pepperdash.com>
Date: Thu, 28 May 2020 20:07:33 -0400
Subject: [PATCH] -IRoutingSinkWithSwitching now inherits directly from
 IRoutingSink -Marked IRoutingSinkNoSwitching as obsolete -Updated
 HulldeSpace, VTCRoom, DualDisplayRoom that were casting from
 IRoutingSinkNoSwitching to IRoutingSink

---
 .../Room/Types/EssentialsDualDisplayRoom.cs                 | 2 +-
 .../Room/Types/EssentialsHuddleSpaceRoom.cs                 | 6 +++---
 PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs | 2 +-
 .../PepperDashEssentialsBase/Routing/RoutingInterfaces.cs   | 6 +++++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs b/PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs
index 27539ebd..8113174a 100644
--- a/PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs
@@ -555,7 +555,7 @@ namespace PepperDash.Essentials
         /// <returns></returns>
         bool DoRoute(SourceRouteListItem route, SourceListItem sourceItem, string sourceItemKey)
         {
-            IRoutingSinkNoSwitching dest = null;
+            IRoutingSink dest = null;
 
             if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
                 dest = DefaultAudioDevice as IRoutingSinkNoSwitching;
diff --git a/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs b/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
index b14e563d..cce91635 100644
--- a/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
@@ -71,7 +71,7 @@ namespace PepperDash.Essentials
 		public EssentialsHuddleRoomPropertiesConfig PropertiesConfig { get; private set; }
 
 		public IRoutingSinkWithSwitching DefaultDisplay { get; private set; }
-		public IRoutingSinkNoSwitching DefaultAudioDevice { get; private set; }
+		public IRoutingSink DefaultAudioDevice { get; private set; }
 		public IBasicVolumeControls DefaultVolumeControls { get; private set; }
 
 		public bool ExcludeFromGlobalFunctions { get; set; }
@@ -471,14 +471,14 @@ namespace PepperDash.Essentials
 		/// <returns></returns>
 		bool DoRoute(SourceRouteListItem route)
 		{
-			IRoutingSinkNoSwitching dest = null;
+			IRoutingSink dest = null;
 
 			if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
 				dest = DefaultAudioDevice;
 			else if (route.DestinationKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
 				dest = DefaultDisplay;
 			else
-				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSinkNoSwitching;
+				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSink;
 
 			if (dest == null)
 			{
diff --git a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
index c5021526..3909316b 100644
--- a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
@@ -590,7 +590,7 @@ namespace PepperDash.Essentials
 		/// <returns></returns>
 		bool DoRoute(SourceRouteListItem route)
 		{
-			IRoutingSinkNoSwitching dest = null;
+			IRoutingSink dest = null;
 
 			if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
                 dest = DefaultAudioDevice as IRoutingSinkNoSwitching;
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingInterfaces.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingInterfaces.cs
index 7ea8efd1..6c8d520b 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingInterfaces.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingInterfaces.cs	
@@ -48,6 +48,9 @@ namespace PepperDash.Essentials.Core
 		RoutingPortCollection<RoutingOutputPort> OutputPorts { get; }
 	}
 
+    /// <summary>
+    /// For fixed-source endpoint devices
+    /// </summary>
     public interface IRoutingSink : IRoutingInputs, IHasCurrentSourceInfoChange
     {
 
@@ -56,6 +59,7 @@ namespace PepperDash.Essentials.Core
 	/// <summary>
 	/// For fixed-source endpoint devices
 	/// </summary>
+    [Obsolete]
     public interface IRoutingSinkNoSwitching : IRoutingSink
 	{
 
@@ -64,7 +68,7 @@ namespace PepperDash.Essentials.Core
 	/// <summary>
 	/// Endpoint device like a display, that selects inputs
 	/// </summary>
-    public interface IRoutingSinkWithSwitching : IRoutingSinkNoSwitching
+    public interface IRoutingSinkWithSwitching : IRoutingSink
 	{
 		//void ClearRoute();
 		void ExecuteSwitch(object inputSelector);