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

More testing. Only remaining issue is camera selection

Browse Source
This commit is contained in:
Neil Dorin
2020-08-27 18:14:11 -06:00
parent c43503eb27
commit ff6e898091
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs
View File

@@ -131,6 +131,11 @@ namespace PepperDash.Essentials
/// </summary> /// </summary>
public const uint VCCameraManualVisible = 1209; public const uint VCCameraManualVisible = 1209;
/// <summary>
/// 1210
/// </summary>
public const uint VCCameraOffVisible = 1210;
/// <summary> /// <summary>
/// 1211 - 1215 /// 1211 - 1215
/// </summary> /// </summary>

28
PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
View File

@@ -519,12 +519,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
if (a.BoolValue) if (a.BoolValue)
{ {
SetCameraManualModeButtonFeedback(false); SetCameraManualModeButtonFeedback(false);
VCCameraControlModeInterlock.SetButDontShow(UIBoolJoin.VCCameraAutoVisible);
if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCCameraModeBarVisible)
{
VCCameraControlModeInterlock.ShowInterlocked(UIBoolJoin.VCCameraAutoVisible);
}
else
{
VCCameraControlModeInterlock.SetButDontShow(UIBoolJoin.VCCameraAutoVisible);
}
} }
else else
{ {
ShowCameraManualMode(); ShowCameraManualMode();
} }
}; };
} }
@@ -548,7 +557,15 @@ namespace PepperDash.Essentials.UIDrivers.VC
if (a.BoolValue) if (a.BoolValue)
{ {
SetCameraManualModeButtonFeedback(false); SetCameraManualModeButtonFeedback(false);
VCCameraControlModeInterlock.SetButDontShow(UIBoolJoin.VCCameraAutoVisible);
if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCCameraModeBarVisible)
{
VCCameraControlModeInterlock.ShowInterlocked(UIBoolJoin.VCCameraOffVisible);
}
else
{
VCCameraControlModeInterlock.SetButDontShow(UIBoolJoin.VCCameraOffVisible);
}
} }
else else
{ {
@@ -567,6 +584,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
TriList.SmartObjects[UISmartObjectJoin.VCCameraSelect].UShortOutput["Item Clicked"].SetUShortSigAction( TriList.SmartObjects[UISmartObjectJoin.VCCameraSelect].UShortOutput["Item Clicked"].SetUShortSigAction(
(u) => camerasCodec.SelectCamera(camerasCodec.Cameras[u - 1].Key)); (u) => camerasCodec.SelectCamera(camerasCodec.Cameras[u - 1].Key));
//TODO: Fix camera selection and labels
// Set the names for the cameras // Set the names for the cameras
for (int i = 1; i <= camerasCodec.Cameras.Count; i++) for (int i = 1; i <= camerasCodec.Cameras.Count; i++)
{ {
@@ -637,6 +656,11 @@ namespace PepperDash.Essentials.UIDrivers.VC
holdTime, () => presetsCodec.CodecRoomPresetStore(2, presetsCodec.NearEndPresets[1].Description), ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetSelect(2)); holdTime, () => presetsCodec.CodecRoomPresetStore(2, presetsCodec.NearEndPresets[1].Description), ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetSelect(2));
TriList.BooleanOutput[UIBoolJoin.VCCameraPreset3].SetSigHeldAction( TriList.BooleanOutput[UIBoolJoin.VCCameraPreset3].SetSigHeldAction(
holdTime, () => presetsCodec.CodecRoomPresetStore(3, presetsCodec.NearEndPresets[2].Description), ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetSelect(3)); holdTime, () => presetsCodec.CodecRoomPresetStore(3, presetsCodec.NearEndPresets[2].Description), ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetSelect(3));
TriList.StringInput[UIStringJoin.VCCameraPresetLabel1].StringValue = presetsCodec.NearEndPresets[0].Description;
TriList.StringInput[UIStringJoin.VCCameraPresetLabel2].StringValue = presetsCodec.NearEndPresets[1].Description;
TriList.StringInput[UIStringJoin.VCCameraPresetLabel3].StringValue = presetsCodec.NearEndPresets[2].Description;
} }
} }