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

Reset of connected simpl program will no longer add duplicate audioCodec and videoCodec devices to output config

Browse Source
This commit is contained in:
Heath Volmer
2018-10-02 13:02:46 -06:00
parent 184144dc3c
commit 28d694d0b4
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,9 +365,9 @@ namespace PepperDash.Essentials.Room.Cotija
var version = Assembly.GetExecutingAssembly().GetName().Version; var version = Assembly.GetExecutingAssembly().GetName().Version;
co.Info.RuntimeInfo.AssemblyVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build); co.Info.RuntimeInfo.AssemblyVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
//Room //Room
if (co.Rooms == null) //if (co.Rooms == null)
// always start fresh in case simpl changed
co.Rooms = new List<EssentialsRoomConfig>(); co.Rooms = new List<EssentialsRoomConfig>();
var rm = new EssentialsRoomConfig(); var rm = new EssentialsRoomConfig();
if (co.Rooms.Count == 0) if (co.Rooms.Count == 0)
@@ -428,7 +428,10 @@ namespace PepperDash.Essentials.Room.Cotija
co.Devices = new List<DeviceConfig>(); co.Devices = new List<DeviceConfig>();
// clear out previous DDVC devices // clear out previous DDVC devices
co.Devices.RemoveAll(d => d.Key.StartsWith("source-", StringComparison.OrdinalIgnoreCase)); co.Devices.RemoveAll(d =>
d.Key.StartsWith("source-", StringComparison.OrdinalIgnoreCase)
|| d.Key.Equals("audioCodec", StringComparison.OrdinalIgnoreCase)
|| d.Key.Equals("videoCodec", StringComparison.OrdinalIgnoreCase));
rmProps.SourceListKey = "default"; rmProps.SourceListKey = "default";
rm.Properties = JToken.FromObject(rmProps); rm.Properties = JToken.FromObject(rmProps);

2
PepperDashEssentials/Properties/AssemblyInfo.cs
View File

@@ -4,5 +4,5 @@
[assembly: AssemblyCompany("PepperDash Technology Corp")] [assembly: AssemblyCompany("PepperDash Technology Corp")]
[assembly: AssemblyProduct("PepperDashEssentials")] [assembly: AssemblyProduct("PepperDashEssentials")]
[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")] [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")]
[assembly: AssemblyVersion("1.2.6.*")] [assembly: AssemblyVersion("1.2.9.*")]