Moved Directory browsing logic from VideoCodecUiDriver down to IHasDirectory Interface to sync better with VideoCodecBaseMessenger for MC

PepperDashEssentials/AppServer/CotijaSystemController.cs

@@ -317,10 +317,12 @@ namespace PepperDash.Essentials
 			CrestronConsole.ConsoleCommandResponse(@"Mobile Control Information:
 	Server address: {0}
 	System Name: {1}
-	System UUID: {2}
-	System User code: {3}
-	Connected?: {4}
-    Seconds Since Last Ack: {5}", url, name, SystemUuid,
+    System URL: {2}
+	System UUID: {3}
+	System User code: {4}
+	Connected?: {5}
+    Seconds Since Last Ack: {6}"
+                , url, name, ConfigReader.ConfigObject.SystemUrl, SystemUuid,
                     code, conn, secSinceLastAck.Seconds);
 		}
 

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -279,7 +279,7 @@ namespace PepperDash.Essentials
                         inAudioCall = AudioCodec.IsInCall;
 
                     if(VideoCodec != null)
-                        inVideoCall = AudioCodec.IsInCall;
+                        inVideoCall = VideoCodec.IsInCall;
 
                     if (inAudioCall || inVideoCall)
                         return true;

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -59,7 +59,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
 		SmartObjectDynamicList DirectoryList;
 
-		CodecDirectory CurrentDirectoryResult;
+		//CodecDirectory CurrentDirectoryResult;
 
         ///// <summary>
         ///// Tracks the directory browse history when browsing beyond the root directory
@@ -174,7 +174,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 triList.SetSigFalseAction(UIBoolJoin.VCDirectoryBackPress, GetDirectoryParentFolderContents);
 
-                DirectoryBackButtonVisibleFeedback = new BoolFeedback(() => CurrentDirectoryResult != (codec as IHasDirectory).DirectoryRoot);
+                DirectoryBackButtonVisibleFeedback = (codec as IHasDirectory).CurrentDirectoryResultIsNotDirectoryRoot;
                 DirectoryBackButtonVisibleFeedback
                     .LinkInputSig(triList.BooleanInput[UIBoolJoin.VCDirectoryBackVisible]);
 
@@ -546,12 +546,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
 					codec.PhonebookSyncState.InitialSyncCompleted += new EventHandler<EventArgs>(PhonebookSyncState_InitialSyncCompleted);
 				}
 
-
-				// If there is something here now, show it otherwise wait for the event
-				if (CurrentDirectoryResult != null && codec.DirectoryRoot.DirectoryResults.Count > 0)
-				{
-					RefreshDirectory();
-				}
+			    RefreshDirectory();
+				
 			}
 		}
 
@@ -560,12 +556,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void SetCurrentDirectoryToRoot()
         {
-            CurrentDirectoryResult = (Codec as IHasDirectory).DirectoryRoot;
+            (Codec as IHasDirectory).SetCurrentDirectoryToRoot();
 
             SearchKeypadClear();
 
-            DirectoryBackButtonVisibleFeedback.FireUpdate();
-
             RefreshDirectory();
         }
 
@@ -580,10 +574,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
             SetCurrentDirectoryToRoot();
 
-            if (CurrentDirectoryResult != null && codec.DirectoryRoot.DirectoryResults.Count > 0)
-            {
-                RefreshDirectory();
-            }
+            RefreshDirectory();
+            
         }
 
 		/// <summary>
@@ -597,8 +589,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             {
                 NextDirectoryResultIsFolderContents = false;
             }
-			CurrentDirectoryResult = e.Directory;
-            DirectoryBackButtonVisibleFeedback.FireUpdate();
 			RefreshDirectory();
 		}
 
@@ -622,7 +612,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
             if (codec != null)
             {
-                CurrentDirectoryResult = codec.GetDirectoryParentFolderContents();
+                codec.GetDirectoryParentFolderContents();
 
                 RefreshDirectory();
             }
@@ -635,10 +625,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <param name="dir"></param>
 		void RefreshDirectory()
 		{
-            if (CurrentDirectoryResult.DirectoryResults.Count > 0)
+            if ((Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults.Count > 0)
             {
                 ushort i = 0;
-                foreach (var r in CurrentDirectoryResult.DirectoryResults)
+                foreach (var r in (Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults)
                 {
                     if (i == DirectoryList.MaxCount)
                     {
@@ -1092,7 +1082,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
             SearchStringFeedback.FireUpdate();
             SearchStringKeypadCheckEnables();
 
-            if(CurrentDirectoryResult != (Codec as IHasDirectory).DirectoryRoot)
+            if((Codec as IHasDirectory).CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
                 SetCurrentDirectoryToRoot();
         }