From 2028fa308a0f6a2e5cb02c212d246a4c23dfaad0 Mon Sep 17 00:00:00 2001
From: Neil Dorin <ndorin@pepperdash.com>
Date: Fri, 15 Sep 2017 11:13:59 -0600
Subject: [PATCH] Updates to xStatus an CiscoCodec to remove compile errors
 (duplicate objects, InputPort actions)

---
 .../VC/CiscoCodec/CiscoCodec.cs               | 37 +++++++++++++++----
 .../VC/CiscoCodec/xStatus.cs                  | 20 ----------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/Essentials Devices Common/Essentials Devices Common/VC/CiscoCodec/CiscoCodec.cs b/Essentials Devices Common/Essentials Devices Common/VC/CiscoCodec/CiscoCodec.cs
index 9e661e88..93ee8753 100644
--- a/Essentials Devices Common/Essentials Devices Common/VC/CiscoCodec/CiscoCodec.cs	
+++ b/Essentials Devices Common/Essentials Devices Common/VC/CiscoCodec/CiscoCodec.cs	
@@ -132,8 +132,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 socket.ConnectionChange += new EventHandler<GenericSocketStatusChageEventArgs>(socket_ConnectionChange);
             }
 
-            InputPorts.Add(new RoutingInputPort(RoutingPortNames.HdmiIn1, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource(1)), this));
-            InputPorts.Add(new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource(2)), this));
+            InputPorts.Add(new RoutingInputPort(RoutingPortNames.HdmiIn1, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource1), this));
+            InputPorts.Add(new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource2), this));
 
             //Debug.Console(1, this, "Starting Cisco API Server");
 
@@ -203,17 +203,17 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// <param name="args"></param>
         void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
         {
-            if (Debug.Level == 1)
+            if (Debug.Level == 2)
             {
                 if(!JsonFeedbackMessageIsIncoming)
-                    Debug.Console(1, this, "RX: '{0}'", args.Text);
+                    Debug.Console(2, this, "RX: '{0}'", args.Text);
             }
 
             if (args.Text == "{" + Delimiter)        // Check for the beginning of a new JSON message
             {
                 JsonFeedbackMessageIsIncoming = true;
 
-                Debug.Console(1, this, "Incoming JSON message...");
+                Debug.Console(2, this, "Incoming JSON message...");
 
                 JsonMessage = new StringBuilder();
             }
@@ -223,7 +223,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
                 JsonMessage.Append(args.Text);
 
-                Debug.Console(1, this, "Complete JSON Received:\n{0}", JsonMessage.ToString());
+                Debug.Console(2, this, "Complete JSON Received:\n{0}", JsonMessage.ToString());
 
                 // Forward the complete message to be deserialized
                 DeserializeResponse(JsonMessage.ToString());
@@ -489,8 +489,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         protected override Func<bool> ReceiveMuteFeedbackFunc { get { return () => false; } }
 
-        protected override Func<bool> PrivacyModeFeedbackFunc { get { return () => false; } }
-
         /// <summary>
         /// Gets the first CallId or returns null
         /// </summary>
@@ -543,8 +541,31 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             StartSharing();
         }
 
+        /// <summary>
+        /// Select source 1 as the presetnation source
+        /// </summary>
+        public void SelectPresentationSource1()
+        {
+            SelectPresentationSource(1);
+        }
+
+        /// <summary>
+        /// Select source 2 as the presetnation source
+        /// </summary>
+        public void SelectPresentationSource2()
+        {
+            SelectPresentationSource(2);
+        }
+
         public override void StartSharing()
         {
+            string sendingMode = string.Empty;
+
+            if (InCallFeedback.BoolValue)
+                sendingMode = "LocalRemote";
+            else
+                sendingMode = "LocalOnly";
+
             SendText(string.Format("xCommand Presentation Start PresentationSource: {0}", PresentationSource));
         }
 
diff --git a/Essentials Devices Common/Essentials Devices Common/VC/CiscoCodec/xStatus.cs b/Essentials Devices Common/Essentials Devices Common/VC/CiscoCodec/xStatus.cs
index 44cec29f..35fa2a77 100644
--- a/Essentials Devices Common/Essentials Devices Common/VC/CiscoCodec/xStatus.cs	
+++ b/Essentials Devices Common/Essentials Devices Common/VC/CiscoCodec/xStatus.cs	
@@ -1524,26 +1524,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class DisplayName
-        {
-            public string Value { get; set; }
-        }
-
         public class Duration
         {
             public string Value { get; set; }
         }
 
-        public class Type
-        {
-            public string Value { get; set; }
-        }
-
-        public class Encryption
-        {
-            public string id { get; set; }
-            public Type Type { get; set; }
-        }
 
         public class FacilityServiceId
         {
@@ -1575,11 +1560,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Status2
-        {
-            public string Value { get; set; }
-        }
-
         public class TransmitCallRate
         {
             public string Value { get; set; }