From 28d694d0b4fd8373fba9c414d700c9219b39c7b9 Mon Sep 17 00:00:00 2001 From: Heath Volmer Date: Tue, 2 Oct 2018 13:02:46 -0600 Subject: [PATCH] Reset of connected simpl program will no longer add duplicate audioCodec and videoCodec devices to output config --- .../AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs | 11 +++++++---- PepperDashEssentials/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs b/PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs index d99534b4..c68d0463 100644 --- a/PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs +++ b/PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs @@ -365,10 +365,10 @@ namespace PepperDash.Essentials.Room.Cotija var version = Assembly.GetExecutingAssembly().GetName().Version; co.Info.RuntimeInfo.AssemblyVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build); - //Room - if (co.Rooms == null) - co.Rooms = new List(); + //if (co.Rooms == null) + // always start fresh in case simpl changed + co.Rooms = new List(); var rm = new EssentialsRoomConfig(); if (co.Rooms.Count == 0) { @@ -428,7 +428,10 @@ namespace PepperDash.Essentials.Room.Cotija co.Devices = new List(); // 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"; rm.Properties = JToken.FromObject(rmProps); diff --git a/PepperDashEssentials/Properties/AssemblyInfo.cs b/PepperDashEssentials/Properties/AssemblyInfo.cs index 36c70ef4..c1a2d70a 100644 --- a/PepperDashEssentials/Properties/AssemblyInfo.cs +++ b/PepperDashEssentials/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ [assembly: AssemblyCompany("PepperDash Technology Corp")] [assembly: AssemblyProduct("PepperDashEssentials")] [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")] -[assembly: AssemblyVersion("1.2.6.*")] +[assembly: AssemblyVersion("1.2.9.*")]