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

Merge pull request #1042 from PepperDash/hotfix/zoomroom-camera-selection

Browse Source 
Send command to select camera by ID for Zoom Room
This commit is contained in:
jdevito
2022-12-09 09:39:33 -06:00
committed by GitHub
parent 668cbc430c 860182dbfc
commit 3d27b0928f
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
View File

@@ -376,26 +376,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
public void SelectCamera(string key) public void SelectCamera(string key)
{ {
if (Cameras == null) if (CameraIsMutedFeedback.BoolValue)
{ {
return; CameraMuteOff();
} }
var camera = Cameras.FirstOrDefault(c => c.Key.IndexOf(key, StringComparison.OrdinalIgnoreCase) > -1); SendText(string.Format("zConfiguration Video Camera selectedId: {0}", key));
if (camera != null)
{
Debug.Console(1, this, "Selected Camera with key: '{0}'", camera.Key);
SelectedCamera = camera;
if (CameraIsMutedFeedback.BoolValue)
{
CameraMuteOff();
}
}
else
{
Debug.Console(1, this, "Unable to select camera with key: '{0}'", key);
}
} }
public CameraBase FarEndCamera { get; private set; } public CameraBase FarEndCamera { get; private set; }
@@ -658,8 +644,27 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {
if (a.PropertyName == "SelectedId") if (a.PropertyName == "SelectedId")
{ {
SelectCamera(Configuration.Video.Camera.SelectedId); if (Cameras == null)
// this will in turn fire the affected feedbacks {
return;
}
var camera = Cameras.FirstOrDefault(c => c.Key.IndexOf(Configuration.Video.Camera.SelectedId, StringComparison.OrdinalIgnoreCase) > -1);
if (camera != null)
{
Debug.Console(1, this, "Camera selected with key: '{0}'", camera.Key);
SelectedCamera = camera;
if (CameraIsMutedFeedback.BoolValue)
{
CameraMuteOff();
}
}
else
{
Debug.Console(1, this, "No camera found with key: '{0}'", Configuration.Video.Camera.SelectedId);
}
} }
}; };