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

Moved VCDriver manually from development

Browse Source
This commit is contained in:
Heath Volmer
2017-12-29 10:16:30 -07:00
parent 800de511ce
commit 08a4497f2c
3 changed files with 1515 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1487
Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs.orig Normal file
View File

File diff suppressed because it is too large Load Diff

12
Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs.orig Normal file
View File

@@ -0,0 +1,12 @@
using System.Reflection;
[assembly: AssemblyTitle("PepperDashEssentials")]
[assembly: AssemblyCompany("PepperDash Technology Corp")]
[assembly: AssemblyProduct("PepperDashEssentials")]
[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")]
<<<<<<< HEAD
[assembly: AssemblyVersion("1.0.8.*")]
=======
[assembly: AssemblyVersion("1.0.10.*")]
>>>>>>> development

23
Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
View File

@@ -79,6 +79,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
StringBuilder SearchStringBuilder = new StringBuilder(); StringBuilder SearchStringBuilder = new StringBuilder();
BoolFeedback SearchStringBackspaceVisibleFeedback; BoolFeedback SearchStringBackspaceVisibleFeedback;
BoolFeedback LayoutButtonEnableFeedback;
ModalDialog IncomingCallModal; ModalDialog IncomingCallModal;
eKeypadMode KeypadMode; eKeypadMode KeypadMode;
@@ -748,8 +750,14 @@ namespace PepperDash.Essentials.UIDrivers.VC
var lc = Codec as IHasCodecLayouts; var lc = Codec as IHasCodecLayouts;
if (lc != null) if (lc != null)
{ {
TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggle); TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggleSingleProminent);
lc.LocalLayoutFeedback.LinkInputSig(TriList.StringInput[UIStringJoin.VCLayoutModeText]); lc.LocalLayoutFeedback.LinkInputSig(TriList.StringInput[UIStringJoin.VCLayoutModeText]);
lc.LocalLayoutFeedback.OutputChange += (o,a) =>
{
TriList.BooleanInput[UIBoolJoin.VCLayoutTogglePress].BoolValue =
lc.LocalLayoutFeedback.StringValue == "Prominent";
};
// attach to cisco special things to enable buttons // attach to cisco special things to enable buttons
var cisco = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoSparkCodec; var cisco = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoSparkCodec;
@@ -757,7 +765,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
{ {
// Cisco has min/max buttons that need special sauce // Cisco has min/max buttons that need special sauce
cisco.SharingContentIsOnFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges; cisco.SharingContentIsOnFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges;
cisco.PresentationViewMaximizedFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges; //cisco.PresentationViewMaximizedFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges;
TriList.SetSigFalseAction(UIBoolJoin.VCMinMaxPress, cisco.MinMaxLayoutToggle); TriList.SetSigFalseAction(UIBoolJoin.VCMinMaxPress, cisco.MinMaxLayoutToggle);
} }
@@ -775,12 +783,13 @@ namespace PepperDash.Essentials.UIDrivers.VC
var cisco = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoSparkCodec; var cisco = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoSparkCodec;
if (cisco != null) if (cisco != null)
{ {
var sharing = cisco.SharingContentIsOnFeedback.BoolValue; var sharingNear = cisco.SharingContentIsOnFeedback.BoolValue;
var maximized = cisco.PresentationViewMaximizedFeedback.BoolValue;
var sharingFar = cisco.FarEndIsSharingContentFeedback.BoolValue;
//set feedback and enables //set feedback and enables
TriList.BooleanInput[UIBoolJoin.VCMinMaxEnable].BoolValue = sharing; TriList.BooleanInput[UIBoolJoin.VCMinMaxEnable].BoolValue = sharingNear;
TriList.BooleanInput[UIBoolJoin.VCLayoutToggleEnable].BoolValue = sharing && maximized; TriList.BooleanInput[UIBoolJoin.VCLayoutToggleEnable].BoolValue = sharingNear || sharingFar;
TriList.BooleanInput[UIBoolJoin.VCMinMaxPress].BoolValue = maximized; TriList.BooleanInput[UIBoolJoin.VCMinMaxPress].BoolValue = sharingNear;
} }
} }