DM Changes

PepperDashEssentials/PepperDashEssentials/Config/DeviceFactory.cs

@@ -23,34 +23,38 @@ namespace PepperDash.Essentials
 
 			var typeName = dc.Type.ToLower();
 
-			if (dc.Group.ToLower() == "touchpanel") //  typeName.StartsWith("tsw"))
-			{
-				var comm = CommFactory.GetControlPropertiesConfig(dc);
+            if (typeName == "amplifier")
+            {
+                return new Amplifier(dc.Key, dc.Name);
+            } 
+            else if (dc.Group.ToLower() == "touchpanel") //  typeName.StartsWith("tsw"))
+            {
+                var comm = CommFactory.GetControlPropertiesConfig(dc);
 
-				var props = JsonConvert.DeserializeObject<CrestronTouchpanelPropertiesConfig>(
-					properties.ToString());
-				return new EssentialsTouchpanelController(key, name, typeName, props, comm.IpIdInt);
-			}
-			else if (typeName == "mockdisplay")
-			{
-				return new MockDisplay(key, name);
-			}
+                var props = JsonConvert.DeserializeObject<CrestronTouchpanelPropertiesConfig>(
+                    properties.ToString());
+                return new EssentialsTouchpanelController(key, name, typeName, props, comm.IpIdInt);
+            }
+            else if (typeName == "mockdisplay")
+            {
+                return new MockDisplay(key, name);
+            }
 
-			// MOVE into something else???
-			else if (typeName == "basicirdisplay")
-			{
-				var ir = IRPortHelper.GetIrPort(properties);
-				if (ir != null)
-					return new BasicIrDisplay(key, name, ir.Port, ir.FileName);
-			}
+            // MOVE into something else???
+            else if (typeName == "basicirdisplay")
+            {
+                var ir = IRPortHelper.GetIrPort(properties);
+                if (ir != null)
+                    return new BasicIrDisplay(key, name, ir.Port, ir.FileName);
+            }
 
-			else if (typeName == "commmock")
-			{
-				var comm = CommFactory.CreateCommForDevice(dc);
-				var props = JsonConvert.DeserializeObject<ConsoleCommMockDevicePropertiesConfig>(
-					properties.ToString());
-				return new ConsoleCommMockDevice(key, name, props, comm);
-			}
+            else if (typeName == "commmock")
+            {
+                var comm = CommFactory.CreateCommForDevice(dc);
+                var props = JsonConvert.DeserializeObject<ConsoleCommMockDevicePropertiesConfig>(
+                    properties.ToString());
+                return new ConsoleCommMockDevice(key, name, props, comm);
+            }
 
 			return null;
 		}

PepperDashEssentials/PepperDashEssentials/Devices/Amplifier.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Routing;
+
+namespace PepperDash.Essentials
+{
+    public class Amplifier : Device, IRoutingSinkNoSwitching
+    {
+        public RoutingInputPort AudioIn { get; private set; }
+
+        public Amplifier(string key, string name)
+            : base(key, name)
+        {
+            AudioIn = new RoutingInputPort(RoutingPortNames.AnyAudioIn, eRoutingSignalType.Audio,
+                eRoutingPortConnectionType.None, null, this);
+            InputPorts = new RoutingPortCollection<RoutingInputPort> { AudioIn };
+        }
+
+        #region IRoutingInputs Members
+
+        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
+
+        #endregion
+    }
+}

PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.csproj

@@ -134,6 +134,7 @@
     <Compile Include="Config\ConfigReader.cs" />
     <Compile Include="Config\EssentialsConfig.cs" />
     <Compile Include="Config\DeviceFactory.cs" />
+    <Compile Include="Devices\Amplifier.cs" />
     <Compile Include="Devices\DiscPlayer\OppoExtendedBdp.cs" />
     <Compile Include="Devices\NUMERIC AppleTV.cs" />
     <Compile Include="ControlSystem.cs" />

PepperDashEssentials/PepperDashEssentials/Room/EssentialsRoomConfig.cs

@@ -42,7 +42,16 @@ namespace PepperDash.Essentials
                     displaysDict.Add(i++, disp);
                 }
 
-                var presRoom = new EssentialsPresentationRoom(Key, Name, displaysDict, null, props);
+                // Need to assign the volume control point and also audio routing endpoint, if routing
+                // is required: For DSP, typically no.  
+                IRoutingSinkNoSwitching masterAudioDev = null;
+                if (props.Volumes.ContainsKey("master"))
+                {
+                    var audioKey = props.Volumes["master"];
+
+                }
+
+                var presRoom = new EssentialsPresentationRoom(Key, Name, displaysDict, masterAudioDev, props);
                 return presRoom;
             }
             return null;
@@ -70,6 +79,12 @@ namespace PepperDash.Essentials
         public List<string> DisplayKeys { get; set; }
         public string SourceListKey { get; set; }
         public Dictionary<string, EssentialsVolumeLevelConfig> Volumes { get; set; }
+
+        public EssentialsPresentationRoomPropertiesConfig()
+        {
+            DisplayKeys = new List<string>();
+            Volumes = new Dictionary<string, EssentialsVolumeLevelConfig>();
+        }
     }
 
     public class EssentialsVolumeLevelConfig

PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-03-06 08-53-09).log

@@ -0,0 +1,22 @@
+3/6/2017 8:53:09 AM, Info: Initializing SIMPLSharp Services...
+3/6/2017 8:53:09 AM, Info: ProjectInfo successfully initialized.
+3/6/2017 1:19:35 PM, Info: Saving project information...
+3/6/2017 1:19:35 PM, Info: Saving project information...
+3/6/2017 1:19:35 PM, Info: Saving project information...
+3/6/2017 1:24:35 PM, Info: Saving project information...
+3/6/2017 1:24:35 PM, Info: Saving project information...
+3/6/2017 1:24:35 PM, Info: Saving project information...
+3/6/2017 1:29:35 PM, Info: Saving project information...
+3/6/2017 1:29:35 PM, Info: Saving project information...
+3/6/2017 1:29:35 PM, Info: Saving project information...
+3/6/2017 1:31:45 PM, Info: Saving project information...
+3/6/2017 1:31:45 PM, Info: Saving project information...
+3/6/2017 1:31:45 PM, Info: Saving project information...
+3/6/2017 1:31:45 PM, Info: Saving project information...
+3/6/2017 1:31:45 PM, Info: Saving project information...
+3/6/2017 1:31:45 PM, Info: Saving project information...
+3/6/2017 1:31:48 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
+3/6/2017 1:31:50 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
+3/6/2017 1:31:50 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
+3/6/2017 1:31:52 PM, Info: Saving project information...
+3/6/2017 5:18:28 PM, Info: Terminating SIMPLSharp Services

PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-03-07 13-43-38).log

@@ -0,0 +1,3 @@
+3/7/2017 1:43:38 PM, Info: Initializing SIMPLSharp Services...
+3/7/2017 1:43:39 PM, Info: ProjectInfo successfully initialized.
+3/7/2017 2:00:35 PM, Info: Terminating SIMPLSharp Services

PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-03-13 10-44-29).log

@@ -0,0 +1,3 @@
+3/13/2017 10:44:29 AM, Info: Initializing SIMPLSharp Services...
+3/13/2017 10:44:29 AM, Info: ProjectInfo successfully initialized.
+3/13/2017 2:48:56 PM, Info: Terminating SIMPLSharp Services

PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config

@@ -10,8 +10,8 @@
     <ArchiveName />
   </RequiredInfo>
   <OptionalInfo>
-    <CompiledOn>3/3/2017 2:10:14 PM</CompiledOn>
-    <CompilerRev>1.0.0.25506</CompilerRev>
+    <CompiledOn>3/13/2017 10:50:47 AM</CompiledOn>
+    <CompilerRev>1.0.0.17722</CompilerRev>
   </OptionalInfo>
   <Plugin>
     <Version>Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10</Version>

PepperDashEssentials/PepperDashEssentials/bin/manifest.info

@@ -1,4 +1,4 @@
-MainAssembly=PepperDashEssentials.dll:5511f262a85934403988d20b8adf9a11
+MainAssembly=PepperDashEssentials.dll:ac3af5e6028ddf61e481b2335937c5c9
 MainAssemblyMinFirmwareVersion=1.009.0029
 MainAssemblyResource=SimplSharpData.dat:820b61c48c8a2cace82957eed4cc377c
 ü
@@ -30,9 +30,9 @@ DependencySource=Crestron.SimplSharpPro.UI.dll:089312a0cb0b4537072d4eb234e71e0e
 DependencyPath=PepperDashEssentials.cpz:Crestron.SimplSharpPro.UI.dll
 DependencyMainAssembly=Crestron.SimplSharpPro.UI.dll:089312a0cb0b4537072d4eb234e71e0e
 ü
-DependencySource=Essentials Devices Common.dll:8aa9519dd8b47681a03ce49bbd85d7ca
+DependencySource=Essentials Devices Common.dll:22c2d648cf02d3bf28b6c42f461c927f
 DependencyPath=PepperDashEssentials.cpz:Essentials Devices Common.dll
-DependencyMainAssembly=Essentials Devices Common.dll:8aa9519dd8b47681a03ce49bbd85d7ca
+DependencyMainAssembly=Essentials Devices Common.dll:22c2d648cf02d3bf28b6c42f461c927f
 ü
 DependencySource=EssentialsHttpServer.dll:0666085bdb0856c1d117699c7859bb8c
 DependencyPath=PepperDashEssentials.cpz:EssentialsHttpServer.dll
@@ -46,17 +46,17 @@ DependencySource=PepperDash_Core.dll:598033e01568965c3bd67b29e5993374
 DependencyPath=PepperDashEssentials.cpz:PepperDash_Core.dll
 DependencyMainAssembly=PepperDash_Core.dll:598033e01568965c3bd67b29e5993374
 ü
-DependencySource=PepperDash_Essentials_Core.dll:fa7be9399267fd4cec1ae0929edbd944
+DependencySource=PepperDash_Essentials_Core.dll:a3ae2c4b5d2e1890a5788cf717d1b579
 DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_Core.dll
-DependencyMainAssembly=PepperDash_Essentials_Core.dll:fa7be9399267fd4cec1ae0929edbd944
+DependencyMainAssembly=PepperDash_Essentials_Core.dll:a3ae2c4b5d2e1890a5788cf717d1b579
 ü
 DependencySource=PepperDash_Essentials_Displays.dll:3135ef6b8f66b5b1bc5223aad3ef66e0
 DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_Displays.dll
 DependencyMainAssembly=PepperDash_Essentials_Displays.dll:3135ef6b8f66b5b1bc5223aad3ef66e0
 ü
-DependencySource=PepperDash_Essentials_DM.dll:e1019b74d6e14079ed0473b76177aae3
+DependencySource=PepperDash_Essentials_DM.dll:6ac51b82e3f70b4b9b30032ccbb9cdc8
 DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_DM.dll
-DependencyMainAssembly=PepperDash_Essentials_DM.dll:e1019b74d6e14079ed0473b76177aae3
+DependencyMainAssembly=PepperDash_Essentials_DM.dll:6ac51b82e3f70b4b9b30032ccbb9cdc8
 ü
 DependencySource=SimplSharpCryptographyInterface.dll:dd4791a86d6f67ddc309c4ab1e24c663
 DependencyPath=PepperDashEssentials.cpz:SimplSharpCryptographyInterface.dll