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

Update VideoCodecBase.LinkVideoCodecCameraToApi FOR loop checking camera names to first check camera count

Browse Source
This commit is contained in:
Jonathan Arndt
2022-02-08 13:31:13 -08:00
parent b5589364ff
commit 64352811c5
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
View File

@@ -2154,18 +2154,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
{ {
get get
{ {
CrestronConsole.PrintLine("CiscoSparkCodec AutoAnswerEnabled << Get >>"); if (CodecConfiguration.Configuration.Conference.AutoAnswer.Mode.Value == null) return false;
if (CodecConfiguration == null) CrestronConsole.PrintLine("CiscoSparkCodec > CodecConfiguration == Null"); return CodecConfiguration.Configuration.Conference.AutoAnswer.Mode.Value.ToLower() == "on";
if (CodecConfiguration.Configuration == null) CrestronConsole.PrintLine("CiscoSparkCodec > CodecConfiguration.Configuration == Null");
if (CodecConfiguration.Configuration.Conference == null) CrestronConsole.PrintLine("CiscoSparkCodec > CodecConfiguration.Configuration.Conference == Null");
if (CodecConfiguration.Configuration.Conference.AutoAnswer == null) CrestronConsole.PrintLine("CiscoSparkCodec > CodecConfiguration.Configuration.Conference.AutoAnswer == Null");
if (CodecConfiguration.Configuration.Conference.AutoAnswer.Mode == null) CrestronConsole.PrintLine("CiscoSparkCodec > CodecConfiguration.Configuration.Conference.AutoAnswer.Mode == Null");
if (CodecConfiguration.Configuration.Conference.AutoAnswer.Mode.Value == null) CrestronConsole.PrintLine("CiscoSparkCodec > CodecConfiguration.Configuration.Conference.AutoAnswer.Mode.Value == Null");
if (CodecConfiguration.Configuration.Conference.AutoAnswer.Mode.Value.ToLower() == "on")
return true;
else
return false;
} }
} }

3
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
View File

@@ -1478,7 +1478,8 @@ ScreenIndexIsPinnedTo: {8} (a{17})
// Camera names // Camera names
for (uint i = 0; i < joinMap.CameraNamesFb.JoinSpan; i++) for (uint i = 0; i < joinMap.CameraNamesFb.JoinSpan; i++)
{ {
if (codec.Cameras[(int)i] != null) //Check the count first
if (i < codec.Cameras.Count && codec.Cameras[(int)i] != null)
{ {
trilist.SetString(joinMap.CameraNamesFb.JoinNumber + i, codec.Cameras[(int)i].Name); trilist.SetString(joinMap.CameraNamesFb.JoinNumber + i, codec.Cameras[(int)i].Name);
} }