pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-13 19:54:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates to xStatus an CiscoCodec to remove compile errors (duplicate objects, InputPort actions)

Browse Source
This commit is contained in:
Neil Dorin
2017-09-15 11:13:59 -06:00
parent 9e4f34acd5
commit 2028fa308a
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Essentials Devices Common/Essentials Devices Common/VC/CiscoCodec/CiscoCodec.cs
View File

@@ -132,8 +132,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
socket.ConnectionChange += new EventHandler<GenericSocketStatusChageEventArgs>(socket_ConnectionChange); 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.HdmiIn1, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource1), this));
InputPorts.Add(new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource(2)), this)); InputPorts.Add(new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource2), this));
//Debug.Console(1, this, "Starting Cisco API Server"); //Debug.Console(1, this, "Starting Cisco API Server");
@@ -203,17 +203,17 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
/// <param name="args"></param> /// <param name="args"></param>
void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args) void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
{ {
if (Debug.Level == 1) if (Debug.Level == 2)
{ {
if(!JsonFeedbackMessageIsIncoming) 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 if (args.Text == "{" + Delimiter) // Check for the beginning of a new JSON message
{ {
JsonFeedbackMessageIsIncoming = true; JsonFeedbackMessageIsIncoming = true;
Debug.Console(1, this, "Incoming JSON message..."); Debug.Console(2, this, "Incoming JSON message...");
JsonMessage = new StringBuilder(); JsonMessage = new StringBuilder();
} }
@@ -223,7 +223,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
JsonMessage.Append(args.Text); 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 // Forward the complete message to be deserialized
DeserializeResponse(JsonMessage.ToString()); 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> ReceiveMuteFeedbackFunc { get { return () => false; } }
protected override Func<bool> PrivacyModeFeedbackFunc { get { return () => false; } }
/// <summary> /// <summary>
/// Gets the first CallId or returns null /// Gets the first CallId or returns null
/// </summary> /// </summary>
@@ -543,8 +541,31 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
StartSharing(); 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() 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)); SendText(string.Format("xCommand Presentation Start PresentationSource: {0}", PresentationSource));
} }

20
Essentials Devices Common/Essentials Devices Common/VC/CiscoCodec/xStatus.cs
View File

@@ -1524,26 +1524,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; } public string Value { get; set; }
} }
public class DisplayName
{
public string Value { get; set; }
}
public class Duration public class Duration
{ {
public string Value { get; set; } 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 public class FacilityServiceId
{ {
@@ -1575,11 +1560,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; } public string Value { get; set; }
} }
public class Status2
{
public string Value { get; set; }
}
public class TransmitCallRate public class TransmitCallRate
{ {
public string Value { get; set; } public string Value { get; set; }