mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-13 11:44:54 +00:00
Fixes online feedback for DM endpoints that are attached to a 3 series DM chassis or a DMPS-4K unit.
This commit is contained in:
@@ -47,16 +47,23 @@ namespace PepperDash.Essentials.DM
|
||||
{
|
||||
get
|
||||
{
|
||||
if (InputCard.VideoSourceFeedback != eDmps3InputVideoSource.Auto)
|
||||
return InputCard.VideoSourceFeedback;
|
||||
else // auto
|
||||
try
|
||||
{
|
||||
if (InputCard.HdmiInputPort.SyncDetectedFeedback.BoolValue)
|
||||
return eDmps3InputVideoSource.Hdmi;
|
||||
else if (InputCard.VgaInputPort.SyncDetectedFeedback.BoolValue)
|
||||
return eDmps3InputVideoSource.Vga;
|
||||
else
|
||||
return eDmps3InputVideoSource.Bnc;
|
||||
if (InputCard.VideoSourceFeedback != eDmps3InputVideoSource.Auto)
|
||||
return InputCard.VideoSourceFeedback;
|
||||
else // auto
|
||||
{
|
||||
if (InputCard.HdmiInputPort.SyncDetectedFeedback.BoolValue)
|
||||
return eDmps3InputVideoSource.Hdmi;
|
||||
else if (InputCard.VgaInputPort.SyncDetectedFeedback.BoolValue)
|
||||
return eDmps3InputVideoSource.Vga;
|
||||
else
|
||||
return eDmps3InputVideoSource.Bnc;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
return eDmps3InputVideoSource.Bnc;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -861,6 +861,7 @@ namespace PepperDash.Essentials.DM
|
||||
|
||||
void Dmps_DMInputChange(Switch device, DMInputEventArgs args)
|
||||
{
|
||||
Debug.Console(2, this, "DMInputChange Input: {0} EventId: {1}", args.Number, args.EventId.ToString());
|
||||
try
|
||||
{
|
||||
switch (args.EventId)
|
||||
@@ -871,6 +872,12 @@ namespace PepperDash.Essentials.DM
|
||||
InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
|
||||
break;
|
||||
}
|
||||
case (DMInputEventIds.EndpointOnlineEventId):
|
||||
{
|
||||
Debug.Console(2, this, "DM Input EndpointOnlineEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
|
||||
InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
|
||||
break;
|
||||
}
|
||||
case (DMInputEventIds.VideoDetectedEventId):
|
||||
{
|
||||
Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
|
||||
@@ -916,6 +923,11 @@ namespace PepperDash.Essentials.DM
|
||||
{
|
||||
OutputEndpointOnlineFeedbacks[output].FireUpdate();
|
||||
}
|
||||
else if (args.EventId == DMOutputEventIds.EndpointOnlineEventId
|
||||
&& OutputEndpointOnlineFeedbacks.ContainsKey(output))
|
||||
{
|
||||
OutputEndpointOnlineFeedbacks[output].FireUpdate();
|
||||
}
|
||||
else if (args.EventId == DMOutputEventIds.VideoOutEventId)
|
||||
{
|
||||
if (outputCard != null && outputCard.VideoOutFeedback != null)
|
||||
|
||||
@@ -323,7 +323,7 @@ namespace PepperDash.Essentials.DM.Chassis
|
||||
|
||||
IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
|
||||
|
||||
trilist.StringInput[joinMap.Name.JoinNumber].StringValue = "DM Switcher";
|
||||
trilist.StringInput[joinMap.Name.JoinNumber].StringValue = this.Name;
|
||||
|
||||
for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user