From cdc9cdbe95b58379a1008aa3e8d4626e93b96bdf Mon Sep 17 00:00:00 2001
From: Alex Johnson <ajohnson@pepperdash.com>
Date: Thu, 8 Oct 2020 15:25:51 -0400
Subject: [PATCH] Adds joining meetings 2 and 3 if meetings exist

---
 .../JoinMaps/VideoCodecControllerJoinMap.cs   | 26 ++++++++++++++++---
 .../VideoCodec/VideoCodecBase.cs              | 16 +++++++++---
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index 7e71ec22..50813700 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs	
@@ -225,15 +225,35 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                     JoinType = eJoinType.Serial
                 });
 
-        [JoinName("DialMeeting")] public JoinDataComplete DialMeeting =
+        [JoinName("DialMeeting1")] public JoinDataComplete DialMeeting1 =
             new JoinDataComplete(new JoinData {JoinNumber = 161, JoinSpan = 1},
                 new JoinMetadata
                 {
-                    Description = "Join first joinable meeting",
+                    Description = "Join first meeting",
                     JoinCapabilities = eJoinCapabilities.FromSIMPL,
                     JoinType = eJoinType.Digital
                 });
 
+        [JoinName("DialMeeting2")]
+        public JoinDataComplete DialMeeting2 =
+            new JoinDataComplete(new JoinData { JoinNumber = 162, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Join second meeting",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("DialMeeting3")]
+        public JoinDataComplete DialMeeting3 =
+            new JoinDataComplete(new JoinData { JoinNumber = 163, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Join third meeting",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
         [JoinName("DirectoryDialSelectedLine")] public JoinDataComplete DirectoryDialSelectedLine =
             new JoinDataComplete(new JoinData {JoinNumber = 106, JoinSpan = 1},
                 new JoinMetadata
@@ -678,7 +698,7 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 });
 
         [JoinName("UpdateMeetings")] public JoinDataComplete UpdateMeetings =
-            new JoinDataComplete(new JoinData {JoinNumber = 162, JoinSpan = 1},
+            new JoinDataComplete(new JoinData {JoinNumber = 160, JoinSpan = 1},
                 new JoinMetadata
                 {
                     Description = "Update Meetings",
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 494eea04..b0f6395d 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -595,12 +595,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             trilist.SetString(joinMap.Schedule.JoinNumber, meetingsData);
 
-            trilist.SetSigFalseAction(joinMap.DialMeeting.JoinNumber, () =>
+            trilist.SetSigFalseAction(joinMap.DialMeeting1.JoinNumber, () =>
             {
-                if (codec.CodecSchedule.Meetings[0].Joinable)
-                {
+                if(codec.CodecSchedule.Meetings[0] != null)
                     Dial(codec.CodecSchedule.Meetings[0]);
-                }
+            });
+            trilist.SetSigFalseAction(joinMap.DialMeeting2.JoinNumber, () =>
+            {
+                if (codec.CodecSchedule.Meetings[1] != null)
+                    Dial(codec.CodecSchedule.Meetings[1]);
+            });
+            trilist.SetSigFalseAction(joinMap.DialMeeting3.JoinNumber, () =>
+            {
+                if (codec.CodecSchedule.Meetings[2] != null)
+                    Dial(codec.CodecSchedule.Meetings[2]);
             });
 
             trilist.SetUshort(joinMap.MeetingCount.JoinNumber, (ushort)currentMeetings.Count);