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

Removed all references to "Cotija" and replaced with "MobileControl". Progress on multi display routing in room logic and Mobile Control bridging.

Browse source
This commit is contained in:
Neil Dorin 2019-11-15 22:03:45 -07:00
parent 405677a3df
commit c0b59c375e
35 changed files with 1027 additions and 1053 deletions
Download patch file Download diff file Expand all files Collapse all files

2
essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/EssentialsConfig.cs
View file

@ -21,8 +21,6 @@ namespace PepperDash.Essentials.Core.Config
public string TemplateUrl { get; set; }
//public CotijaConfig Cotija { get; private set; }
[JsonProperty("systemUuid")]
public string SystemUuid
{

10
essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Interfaces.cs
View file

@ -22,6 +22,14 @@ namespace PepperDash.Essentials.Core
IRoutingSinkWithSwitching DefaultDisplay { get; }
}
/// <summary>
/// For rooms with multiple displays
/// </summary>
public interface IHasMultipleDisplays
{
Dictionary<eSourceListItemDestinationTypes, IRoutingSinkWithSwitching> Displays { get; }
}
/// <summary>
/// For rooms with routing
/// </summary>
@ -30,8 +38,6 @@ namespace PepperDash.Essentials.Core
void RunRouteAction(string routeKey);
void RunRouteAction(string routeKey, Action successCallback);
}
/// <summary>

1
essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingInterfaces.cs
View file

@ -31,7 +31,6 @@ namespace PepperDash.Essentials.Core
event SourceInfoChangeHandler CurrentSourceChange;
}
/// <summary>
/// Defines a class that has a collection of RoutingInputPorts
/// </summary>

8
essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingPort.cs
View file

@ -32,10 +32,10 @@ namespace PepperDash.Essentials.Core
public enum eRoutingSignalType
{
Audio = 1,
Video = 2,
//AudioVideo = 4,
UsbOutput = 4,
UsbInput = 8
Video = 2,
AudioVideo = 4,
UsbOutput = 8,
UsbInput = 16
}
public enum eRoutingPortConnectionType

2
essentials-framework/pepperdashcore-builds

@ -1 +1 @@
Subproject commit 07f4c5975f72eeccc650cda24872d74364f6be35
Subproject commit 45949f09bdcf6548be7fdf5c860ea4e3a5cf152d