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

Changes for layout and selfview

Browse Source
This commit is contained in:
Heath Volmer
2017-10-05 17:43:10 -06:00
parent af33aa41bf
commit f9d320e2b2
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
View File

@@ -46,14 +46,6 @@
<GenerateSerializationAssemblies>off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Cisco One Button To Push, Version=1.0.0.26373, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>References\Cisco One Button To Push.dll</HintPath>
</Reference>
<Reference Include="Cisco SX80 Corporate Phone Book, Version=1.0.0.15355, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>References\Cisco SX80 Corporate Phone Book.dll</HintPath>
</Reference>
<Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL"> <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath> <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>

4
Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCodec.cs
View File

@@ -8,8 +8,8 @@ using Crestron.SimplSharp.CrestronXml;
using Crestron.SimplSharp.CrestronXml.Serialization; using Crestron.SimplSharp.CrestronXml.Serialization;
//using Crestron.SimplSharpPro; //using Crestron.SimplSharpPro;
using Newtonsoft.Json; using Newtonsoft.Json;
using Cisco_One_Button_To_Push; //using Cisco_One_Button_To_Push;
using Cisco_SX80_Corporate_Phone_Book; //using Cisco_SX80_Corporate_Phone_Book;
using PepperDash.Core; using PepperDash.Core;
using PepperDash.Essentials.Core; using PepperDash.Essentials.Core;

4
Essentials/PepperDashEssentials/UI/JoinConstants/UIStringlJoin.cs
View File

@@ -26,6 +26,10 @@ namespace PepperDash.Essentials
public const uint VCRecentListTextStart = 1201; public const uint VCRecentListTextStart = 1201;
// RANGE IN USE // RANGE IN USE
public const uint VCRecentListTextEnd = 1230; public const uint VCRecentListTextEnd = 1230;
/// <summary>
/// 1231 - the current layout mode
/// </summary>
public const uint VCLayoutModeText = 1231;
/// <summary> /// <summary>
/// 1301 - 1400 /// 1301 - 1400

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

@@ -446,9 +446,20 @@ namespace PepperDash.Essentials.UIDrivers.VC
void SetupSelfViewControls() void SetupSelfViewControls()
{ {
TriList.SetSigFalseAction(UIBoolJoin.VCStagingSelfViewLayoutPress, this.ShowSelfViewLayout); TriList.SetSigFalseAction(UIBoolJoin.VCStagingSelfViewLayoutPress, this.ShowSelfViewLayout);
TriList.SetSigFalseAction(UIBoolJoin.VCSelfViewTogglePress, () => { }); var svc = Codec as IHasCodecSelfview;
TriList.SetSigFalseAction(UIBoolJoin.VCRemoteViewTogglePress, () => { }); if (svc != null)
TriList.SetSigFalseAction(UIBoolJoin.VCSelfViewPipTogglePress, () => { }); {
TriList.SetSigFalseAction(UIBoolJoin.VCSelfViewTogglePress, svc.SelfviewModeToggle);
svc.SelfviewIsOnFeedback.LinkInputSig(TriList.BooleanInput[UIBoolJoin.VCSelfViewTogglePress]);
//TriList.SetSigFalseAction(UIBoolJoin.VCSelfViewPipTogglePress, () => { });
}
var lc = Codec as IHasCodecLayouts;
if (lc != null)
{
TriList.SetSigFalseAction(UIBoolJoin.VCRemoteViewTogglePress, lc.LocalLayoutToggle);
lc.LocalLayoutFeedback.LinkInputSig(TriList.StringInput[UIStringJoin.VCLayoutModeText]);
}
} }
/// <summary> /// <summary>