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

Source-none confirmed; camera selects and FB

Browse Source
This commit is contained in:
Heath Volmer
2019-02-25 17:51:17 -07:00
parent 120dae2e63
commit 59234274dc
2 changed files with 77 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs
View File

@@ -184,8 +184,14 @@ namespace PepperDash.Essentials.Room.Cotija
/// 661
/// </summary>
public const uint SourceTypeJoinStart = 661;
/// <summary>
/// 761
/// </summary>
public const uint CameraNearNameStart = 761;
/// <summary>
/// 770 - presence of this name on the input will cause the camera to be added
/// </summary>
public const uint CameraFarName = 770;
}
/// <summary>
@@ -525,7 +531,7 @@ namespace PepperDash.Essentials.Room.Cotija
newSl.Add("Source-None", codecOsd);
}
// add sources...
for (uint i = 0; i<= 19; i++)
for (uint i = 0; i <= 19; i++)
{
var name = EISC.StringOutput[StringJoin.SourceNameJoinStart + i].StringValue;
if(string.IsNullOrEmpty(name))
@@ -622,9 +628,36 @@ namespace PepperDash.Essentials.Room.Cotija
});
}
// cameras
var camsProps = new List<object>();
for (uint i = 0; i < 9; i++)
{
var name = EISC.GetString(i + StringJoin.CameraNearNameStart);
if (!string.IsNullOrEmpty(name))
{
camsProps.Add(new
{
name = name,
selector = "camera" + (i + 1),
});
}
}
var farName = EISC.GetString(StringJoin.CameraFarName);
if (!string.IsNullOrEmpty(farName))
{
camsProps.Add(new
{
name = farName,
selector = "cameraFar",
});
}
var props = new
{
favorites = favs
favorites = favs,
cameras = camsProps,
};
var str = "videoCodec";
var conf = new DeviceConfig()