File IO Rate Limiting

feature: adds rate limiting for FileIO

essentials-framework/Essentials Core/PepperDashEssentialsBase/Display/MockDisplay.cs

@@ -111,12 +111,7 @@ namespace PepperDash.Essentials.Core
 
 		public override void ExecuteSwitch(object selector)
 		{
-			Debug.Console(2, this, "ExecuteSwitch: {0}", selector);
-
-		    if (!_PowerIsOn)
-		    {
-		        PowerOn();
-		    }
+			Debug.Console(2, this, "ExecuteSwitch: {0}", selector);
 		}
 
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/File/FileIO.cs

@@ -15,12 +15,19 @@ namespace PepperDash.Essentials.Core
 		static CCriticalSection fileLock = new CCriticalSection();
 		public delegate void GotFileEventHandler(object sender, FileEventArgs e);
 		public static event GotFileEventHandler GotFileEvent;
-
+		private static Dictionary<string, CTimer> WriteTimers;
+		public const long WriteTimeout = 5000;
 		/// <summary>
 		/// Get the full file info from a path/filename, can include wildcards.
 		/// </summary>
 		/// <param name="fileName"></param>
 		/// <returns></returns>
+		/// 
+		static FileIO() 
+		{
+			WriteTimers = new Dictionary<string, CTimer>();
+		}
+
 		public static FileInfo[] GetFiles(string fileName)
 		{
 			DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fileName));
@@ -35,7 +42,7 @@ namespace PepperDash.Essentials.Core
 				return null;
 			}
 		}
-
+		
 		public static FileInfo GetFile(string fileName)
 		{
 			DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fileName));
@@ -81,7 +88,6 @@ namespace PepperDash.Essentials.Core
 			{
 				if (fileLock.TryEnter())
 				{
-					DirectoryInfo dirInfo = new DirectoryInfo(file.Name);
 					Debug.Console(2, "FileIO Getting Data {0}", file.FullName);
 
 					if (File.Exists(file.FullName))
@@ -169,7 +175,8 @@ namespace PepperDash.Essentials.Core
 				}
 				else
 				{
-					Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
+					Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock retrying");
+
 				}
 
 			}
@@ -189,6 +196,41 @@ namespace PepperDash.Essentials.Core
 
 		}
 
+		/// <summary>
+		/// Resets (or starts) the write timer
+		/// </summary>
+		static void ResetTimer(string data, string filePath)
+		{
+			try
+			{
+				if (WriteTimers.ContainsKey(filePath))
+				{
+					WriteTimers[filePath].Stop();
+					WriteTimers[filePath] = null;
+					WriteTimers.Remove(filePath);
+				}
+				WriteTimers.Add(filePath, new CTimer((o) => 
+					{
+						Thread _WriteFileThread;
+						_WriteFileThread = new Thread((O) => _WriteFileMethod(data, filePath), null, Thread.eThreadStartOptions.CreateSuspended);
+						_WriteFileThread.Priority = Thread.eThreadPriority.LowestPriority;
+						_WriteFileThread.Start();
+						Debug.Console(0, Debug.ErrorLogLevel.Notice, "New WriteFile Thread");
+						WriteTimers.Remove(filePath);
+					}, WriteTimeout));
+
+				
+
+				Debug.Console(0, "FileIO write timer has been reset.");
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO ResetTimer failed: \r{0}", e);
+				data = "";
+			}
+		}
+
+
 		/// <summary>
 		/// 
 		/// </summary>
@@ -201,11 +243,7 @@ namespace PepperDash.Essentials.Core
 		/// <param name="filePath"></param>
 		public static void WriteDataToFile(string data, string filePath)
 		{
-			Thread _WriteFileThread;
-			_WriteFileThread = new Thread((O) => _WriteFileMethod(data, filePath), null, Thread.eThreadStartOptions.CreateSuspended);
-			_WriteFileThread.Priority = Thread.eThreadPriority.LowestPriority;
-			_WriteFileThread.Start();
-			Debug.Console(0, Debug.ErrorLogLevel.Notice, "New WriteFile Thread");
+			ResetTimer(data, filePath);
 
 		}
 
@@ -240,6 +278,7 @@ namespace PepperDash.Essentials.Core
 					fileLock.Leave();
 
 			}
+			Debug.Console(0, Debug.ErrorLogLevel.Notice, "File Written to	: '{0}'", filePath);
 			return null;
 
 		}

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasMeetingInfo.cs

@@ -42,11 +42,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
         public Boolean WaitingForHost { get; private set; }
         [JsonProperty("isLocked", NullValueHandling = NullValueHandling.Ignore)]
         public Boolean IsLocked { get; private set; }
-        [JsonProperty("isRecording", NullValueHandling = NullValueHandling.Ignore)]
-        public Boolean IsRecording { get; private set; }
 
 
-        public MeetingInfo(string id, string name, string host, string password, string shareStatus, bool isHost, bool isSharingMeeting, bool waitingForHost, bool isLocked, bool isRecording)
+        public MeetingInfo(string id, string name, string host, string password, string shareStatus, bool isHost, bool isSharingMeeting, bool waitingForHost, bool isLocked)
         {
             Id = id;
             Name = name;
@@ -57,7 +55,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
             IsSharingMeeting = isSharingMeeting;
             WaitingForHost = waitingForHost;
             IsLocked = isLocked;
-            IsRecording = isRecording;
         }
     }
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasMeetingRecording.cs

@@ -15,15 +15,4 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
         void StopRecording();
         void ToggleRecording();
     }
-
-    public interface IHasMeetingRecordingWithPrompt : IHasMeetingRecording
-    {
-        BoolFeedback RecordConsentPromptIsVisible { get; }
-
-        /// <summary>
-        /// Used to agree or disagree to the meeting being recorded when prompted
-        /// </summary>
-        /// <param name="agree"></param>
-        void RecordingPromptAcknowledgement(bool agree);
-    }
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasParticipants.cs

@@ -24,12 +24,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
         /// </summary>
         /// <param name="participant"></param>
         void SetParticipantAsHost(int userId);
-
-        /// <summary>
-        /// Admits a participant from the waiting room
-        /// </summary>
-        /// <param name="userId"></param>
-        void AdmitParticipantFromWaitingRoom(int userId);
 	}
 
 	/// <summary>

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs

@@ -31,15 +31,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		protected void NotifyPropertyChanged(string propertyName)
 		{
-            var handler = PropertyChanged;
-            if (handler != null)
-            {
-                handler(this, new PropertyChangedEventArgs(propertyName));
-            }
-            else
-            {
-                Debug.Console(2, "PropertyChanged event is NULL");
-            }
+			if (PropertyChanged != null)
+			{
+				PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
 		}
 
 		#endregion
@@ -783,20 +778,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 }
                 set
                 {
-                    //Debug.Console(2, "************************************setting value of meetingIsBeingRecorded to: {0}", value);
                     if (value != _meetingIsBeingRecorded)
                     {
                         _meetingIsBeingRecorded = value;
-                        //Debug.Console(2, "********************************set value of meetingIsBeingRecorded to: {0}", _meetingIsBeingRecorded);
                         NotifyPropertyChanged("meetingIsBeingRecorded");
                     }
                 }
             }
-
-            public CallRecordInfo()
-            {
-                Debug.Console(2, Debug.ErrorLogLevel.Notice, "********************************************* CallRecordInfo() ******************************************");
-            }
 		}
 	}
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs

@@ -27,7 +27,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         IHasScheduleAwareness, IHasCodecCameras, IHasParticipants, IHasCameraOff, IHasCameraMuteWithUnmuteReqeust, IHasCameraAutoMode,
 		IHasFarEndContentStatus, IHasSelfviewPosition, IHasPhoneDialing, IHasZoomRoomLayouts, IHasParticipantPinUnpin,
 		IHasParticipantAudioMute, IHasSelfviewSize, IPasswordPrompt, IHasStartMeeting, IHasMeetingInfo, IHasPresentationOnlyMeeting,
-        IHasMeetingLock, IHasMeetingRecordingWithPrompt
+        IHasMeetingLock, IHasMeetingRecording
 	{
         public event EventHandler VideoUnmuteRequested;
 
@@ -113,18 +113,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				eRoutingSignalType.Audio | eRoutingSignalType.Video,
 				eRoutingPortConnectionType.Hdmi, new Action(StopSharing), this);
 
-			Output1 = new RoutingOutputPort(RoutingPortNames.HdmiOut1,
+			Output1 = new RoutingOutputPort(RoutingPortNames.AnyVideoOut,
 				eRoutingSignalType.Audio | eRoutingSignalType.Video,
 				eRoutingPortConnectionType.Hdmi, null, this);
 
-			Output2 = new RoutingOutputPort(RoutingPortNames.HdmiOut2,
+			Output2 = new RoutingOutputPort(RoutingPortNames.AnyVideoOut,
 				eRoutingSignalType.Video,
 				eRoutingPortConnectionType.DisplayPort, null, this);
 
-            Output3 = new RoutingOutputPort(RoutingPortNames.HdmiOut3,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.Hdmi, null, this);
-
 			SelfviewIsOnFeedback = new BoolFeedback(SelfViewIsOnFeedbackFunc);
 
 			CameraIsOffFeedback = new BoolFeedback(CameraIsOffFeedbackFunc);
@@ -174,10 +170,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             MeetingIsLockedFeedback = new BoolFeedback(() => Configuration.Call.Lock.Enable );
 
             MeetingIsRecordingFeedback = new BoolFeedback(() => Status.Call.CallRecordInfo.meetingIsBeingRecorded );
-
-            RecordConsentPromptIsVisible = new BoolFeedback(() => _recordConsentPromptIsVisible);
-
-            SetUpRouting();
 		}
 
 		public CommunicationGather PortGather { get; private set; }
@@ -307,7 +299,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		public RoutingInputPort CodecOsdIn { get; private set; }
 		public RoutingOutputPort Output1 { get; private set; }
 		public RoutingOutputPort Output2 { get; private set; }
-        public RoutingOutputPort Output3 { get; private set; }
 
 		#region ICommunicationMonitor Members
 
@@ -498,63 +489,25 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		private void SyncState_InitialSyncCompleted(object sender, EventArgs e)
 		{
+			SetUpRouting();
+
 			SetIsReady();
 		}
 
-        /// <summary>
-        /// Handles subscriptions to Status.Call and sub objects. Needs to be called whenever Status.Call is constructed
-        /// </summary>
 		private void SetUpCallFeedbackActions()
 		{
-            Status.Call.Sharing.PropertyChanged -= HandleSharingStateUpdate;
-            Status.Call.Sharing.PropertyChanged += HandleSharingStateUpdate;
+		    Status.Call.Sharing.PropertyChanged += HandleSharingStateUpdate;
 
-            Status.Call.PropertyChanged -= HandleCallStateUpdate;
-            Status.Call.PropertyChanged += HandleCallStateUpdate;
-
-            Status.Call.CallRecordInfo.PropertyChanged -= HandleCallRecordInfoStateUpdate;
-            Status.Call.CallRecordInfo.PropertyChanged += HandleCallRecordInfoStateUpdate;
+			Status.Call.PropertyChanged += (o, a) =>
+			{
+				if (a.PropertyName == "Info")
+				{
+					Debug.Console(1, this, "Updating Call Status");
+					UpdateCallStatus();
+				}
+			};
 		}
 
-        private void HandleCallRecordInfoStateUpdate(object sender, PropertyChangedEventArgs a)
-        {
-            if (a.PropertyName == "meetingIsBeingRecorded")
-            {
-                MeetingIsRecordingFeedback.FireUpdate();
-
-                var meetingInfo = new MeetingInfo(MeetingInfo.Id,
-                    MeetingInfo.Name,
-                    MeetingInfo.Host,
-                    MeetingInfo.Password,
-                    GetSharingStatus(),
-                    GetIsHostMyself(),
-                    MeetingInfo.IsSharingMeeting,
-                    MeetingInfo.WaitingForHost,
-                    MeetingIsLockedFeedback.BoolValue,
-                    MeetingIsRecordingFeedback.BoolValue);
-                MeetingInfo = meetingInfo;
-            }
-        }
-
-        private void HandleCallStateUpdate(object sender, PropertyChangedEventArgs a)
-        {
-            switch (a.PropertyName)
-            {
-                case "Info":
-                    {
-                        Debug.Console(1, this, "Updating Call Status");
-                        UpdateCallStatus();
-                        break;
-                    }
-
-                case "Status":
-                    {
-                        UpdateCallStatus();
-                        break;
-                    }
-            }
-        }
-
 	    private void HandleSharingStateUpdate(object sender, PropertyChangedEventArgs a)
 	    {
             if (a.PropertyName != "State")
@@ -572,19 +525,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 {
                     var sharingStatus = GetSharingStatus();
 
-                    MeetingInfo = new MeetingInfo("", "", "", "", sharingStatus, GetIsHostMyself(), true, false, MeetingIsLockedFeedback.BoolValue, MeetingIsRecordingFeedback.BoolValue);
+                    MeetingInfo = new MeetingInfo("", "", "", "", sharingStatus, GetIsHostMyself(), true, false, MeetingIsLockedFeedback.BoolValue);
                     return;
                 }
 
                 var meetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, Participants.Host != null ? Participants.Host.Name : "None",
-                    MeetingInfo.Password, GetSharingStatus(), GetIsHostMyself(), MeetingInfo.IsSharingMeeting, MeetingInfo.WaitingForHost, MeetingIsLockedFeedback.BoolValue, MeetingIsRecordingFeedback.BoolValue);
+                    MeetingInfo.Password, GetSharingStatus(), GetIsHostMyself(), MeetingInfo.IsSharingMeeting, MeetingInfo.WaitingForHost, MeetingIsLockedFeedback.BoolValue);
                 MeetingInfo = meetingInfo;
             }
             catch (Exception e)
             {
                 Debug.Console(1, this, "Error processing state property update. {0}", e.Message);
                 Debug.Console(2, this, e.StackTrace);
-                MeetingInfo = new MeetingInfo("", "", "", "", "None", false, false, false, MeetingIsLockedFeedback.BoolValue, MeetingIsRecordingFeedback.BoolValue);
+                MeetingInfo = new MeetingInfo("", "", "", "", "None", false, false, false, MeetingIsLockedFeedback.BoolValue);
             }
 	    }
 
@@ -593,9 +546,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		/// </summary>
 		private void SetUpFeedbackActions()
 		{
-            // Set these up initially.
-            SetUpCallFeedbackActions();
-
 			Configuration.Audio.Output.PropertyChanged += (o, a) =>
 			{
 				if (a.PropertyName == "Volume")
@@ -690,8 +640,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                                 MeetingInfo.IsHost, 
                                 MeetingInfo.IsSharingMeeting, 
                                 MeetingInfo.WaitingForHost, 
-                                MeetingIsLockedFeedback.BoolValue,
-                                MeetingIsRecordingFeedback.BoolValue
+                                MeetingIsLockedFeedback.BoolValue
                             );
                     }
                 };
@@ -724,6 +673,41 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				}
 			};
 
+			Status.Call.Sharing.PropertyChanged += (o, a) =>
+			{
+				if (a.PropertyName == "State")
+				{
+					SharingContentIsOnFeedback.FireUpdate();
+					ReceivingContent.FireUpdate();
+				}
+			};
+
+			Status.Call.PropertyChanged += (o, a) =>
+			{
+                switch(a.PropertyName)
+                {
+                    case "Info":
+				{
+					Debug.Console(1, this, "Updating Call Status");
+					UpdateCallStatus();
+                    break;
+				}
+
+                case "Status":
+                    {
+                        UpdateCallStatus();
+                        break;
+                    }
+                    }
+			};
+
+            Status.Call.CallRecordInfo.PropertyChanged += (o, a) =>
+                {
+                    if (a.PropertyName == "meetingIsBeingRecorded")
+                    {
+                        MeetingIsRecordingFeedback.FireUpdate();
+                    }
+                };
 
 			Status.Sharing.PropertyChanged += (o, a) =>
 			{
@@ -755,8 +739,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                                 GetIsHostMyself(), 
                                 MeetingInfo.IsSharingMeeting, 
                                 MeetingInfo.WaitingForHost, 
-                                MeetingIsLockedFeedback.BoolValue,
-                                MeetingIsRecordingFeedback.BoolValue);
+                                MeetingIsLockedFeedback.BoolValue);
                             MeetingInfo = meetingInfo;
                             break;
                         }
@@ -1453,8 +1436,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                                     GetIsHostMyself(), 
                                     MeetingInfo.IsSharingMeeting, 
                                     MeetingInfo.WaitingForHost, 
-                                    MeetingIsLockedFeedback.BoolValue,
-                                    MeetingIsRecordingFeedback.BoolValue);
+                                    MeetingIsLockedFeedback.BoolValue);
                                 MeetingInfo = meetingInfo;
 
 								PrintCurrentCallParticipants();
@@ -1669,14 +1651,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 							        if (MeetingInfo == null)
 							        {
 							            MeetingInfo = new MeetingInfo("Waiting For Host", "Waiting For Host", "Waiting For Host", "",
-                                            GetSharingStatus(), false, false, true, MeetingIsLockedFeedback.BoolValue, MeetingIsRecordingFeedback.BoolValue);
+                                            GetSharingStatus(), false, false, true, MeetingIsLockedFeedback.BoolValue);
 
                                         UpdateCallStatus();
 							            break;
 							        }
 
                                     MeetingInfo = new MeetingInfo("Waiting For Host", "Waiting For Host", "Waiting For Host", "",
-                                        GetSharingStatus(), false, false, true, MeetingIsLockedFeedback.BoolValue, MeetingIsRecordingFeedback.BoolValue);
+                                        GetSharingStatus(), false, false, true, MeetingIsLockedFeedback.BoolValue);
 
 							        UpdateCallStatus();
 
@@ -1686,12 +1668,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 							    if (MeetingInfo == null)
 							    {
 							        MeetingInfo = new MeetingInfo("Waiting For Host", "Waiting For Host", "Waiting For Host", "",
-                                        GetSharingStatus(), false, false, false, MeetingIsLockedFeedback.BoolValue, MeetingIsRecordingFeedback.BoolValue);
+                                        GetSharingStatus(), false, false, false, MeetingIsLockedFeedback.BoolValue);
 							        break;
 							    }
 
 							    MeetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, MeetingInfo.Host, MeetingInfo.Password,
-                                    GetSharingStatus(), GetIsHostMyself(), false, false, MeetingIsLockedFeedback.BoolValue, MeetingIsRecordingFeedback.BoolValue);
+                                    GetSharingStatus(), GetIsHostMyself(), false, false, MeetingIsLockedFeedback.BoolValue);
 
 							    break;
 							}
@@ -1700,18 +1682,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 								// TODO: notify user that host has disabled unmuting video
 								break;
 							}
-							case "updatecallrecordinfo":
+							case "updatedcallrecordinfo":
 							{
 								JsonConvert.PopulateObject(responseObj.ToString(), Status.Call.CallRecordInfo);
 
 								break;
 							}
-                            case "recordingconsent":
-                            {
-                                _recordConsentPromptIsVisible = responseObj["isShow"].Value<bool>();
-                                RecordConsentPromptIsVisible.FireUpdate();
-                                break;
-                            }
 							case "phonecallstatus":
 							{
 								JsonConvert.PopulateObject(responseObj.ToString(), Status.PhoneCall);
@@ -1781,7 +1757,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 						        if (result.Success)
 						        {
-                                    MeetingInfo = new MeetingInfo("", "", "", "", "", true, true, MeetingInfo.WaitingForHost, MeetingIsLockedFeedback.BoolValue, MeetingIsRecordingFeedback.BoolValue);
+                                    MeetingInfo = new MeetingInfo("", "", "", "", "", true, true, MeetingInfo.WaitingForHost, MeetingIsLockedFeedback.BoolValue);
 						            break;
 						        }
 
@@ -1982,11 +1958,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				// If not crrently in a meeting, intialize the call object
 				if (callStatus != zStatus.eCallStatus.IN_MEETING && callStatus != zStatus.eCallStatus.CONNECTING_MEETING)
 				{
+                    //Debug.Console(1, this, "[UpdateCallStatus] Creating new Status.Call object");
 					Status.Call = new zStatus.Call {Status = callStatus};
-                    // Resubscribe to all property change events after Status.Call is reconstructed
-                    SetUpCallFeedbackActions();
 
 					OnCallStatusChange(new CodecActiveCallItem() {Status = eCodecCallStatus.Disconnected});
+
+					SetUpCallFeedbackActions();
 				}
 
 				if (ActiveCalls.Count == 0)
@@ -2126,8 +2103,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                     GetIsHostMyself(),
                     !String.Equals(Status.Call.Info.meeting_type,"NORMAL"),
                     false,
-                    MeetingIsLockedFeedback.BoolValue,
-                    MeetingIsRecordingFeedback.BoolValue
+                    MeetingIsLockedFeedback.BoolValue
                     );
             }
             // TODO [ ] Issue #868
@@ -2142,7 +2118,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                     false,
                     false,
                     false,
-                    false,
                     false
                     );
             }
@@ -2368,21 +2343,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		/// <param name="joinMap"></param>
 		public void LinkZoomRoomToApi(BasicTriList trilist, ZoomRoomJoinMap joinMap)
 		{
-            var recordingCodec = this as IHasMeetingRecordingWithPrompt;
-            if (recordingCodec != null)
-            {
-                trilist.SetSigFalseAction(joinMap.StartRecording.JoinNumber, () => recordingCodec.StartRecording());
-                trilist.SetSigFalseAction(joinMap.StopRecording.JoinNumber, () => recordingCodec.StopRecording());
-
-                recordingCodec.MeetingIsRecordingFeedback.LinkInputSig(trilist.BooleanInput[joinMap.StartRecording.JoinNumber]);
-                recordingCodec.MeetingIsRecordingFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.StopRecording.JoinNumber]);
-
-                trilist.SetSigFalseAction(joinMap.RecordingPromptAgree.JoinNumber, () => recordingCodec.RecordingPromptAcknowledgement(true));
-                trilist.SetSigFalseAction(joinMap.RecordingPromptDisagree.JoinNumber, () => recordingCodec.RecordingPromptAcknowledgement(false));
-
-                recordingCodec.RecordConsentPromptIsVisible.LinkInputSig(trilist.BooleanInput[joinMap.RecordConsentPromptIsVisible.JoinNumber]);
-            }
-
 			var layoutsCodec = this as IHasZoomRoomLayouts;
 			if (layoutsCodec != null)
 			{
@@ -2836,11 +2796,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             SendText(string.Format("zCommand Call HostChange Id: {0}", userId));
         }
 
-        public void AdmitParticipantFromWaitingRoom(int userId)
-        {
-            SendText(string.Format("zCommand Call Admit Participant Id: {0}", userId));
-        }
-
 		#endregion
 
 		#region IHasParticipantAudioMute Members
@@ -3451,29 +3406,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         #endregion
 
-        #region IHasMeetingRecordingWithPrompt Members
+        #region IHasMeetingRecording Members
 
         public BoolFeedback MeetingIsRecordingFeedback { get; private set; }
 
-        bool _recordConsentPromptIsVisible;
-
-        public BoolFeedback RecordConsentPromptIsVisible { get; private set; }
-
-        public void RecordingPromptAcknowledgement(bool agree)
-        {
-            var command = string.Format("zCommand Agree Recording: {0}", agree ? "on" : "off");
-            //Debug.Console(2, this, "Sending agree: {0} {1}", agree, command);
-            SendText(command);
-        }
-
         public void StartRecording()
         {
-            SendText(string.Format("zCommand Call Record Enable: on"));
+            SendText(string.Format("Command Call Record Enable: on"));
         }
 
         public void StopRecording()
         {
-            SendText(string.Format("zCommand Call Record Enable: off"));
+            SendText(string.Format("Command Call Record Enable: off"));
         }
 
         public void ToggleRecording()

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomJoinMap.cs

@@ -295,77 +295,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				Description = "Toggles the selfview pip size, (aka layout size)",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Digital
-			});
-
-        [JoinName("StartRecording")]
-        public JoinDataComplete StartRecording = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 241,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Pulse to start the Meeting Recording.  FB high if meeting is currently recording",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("StopRecording")]
-        public JoinDataComplete StopRecording = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 242,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Pulse to stop the Meeting Recording.  FB high if meeting is currently NOT recording",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("RecordConsentPromptIsVisible")]
-        public JoinDataComplete RecordConsentPromptIsVisible = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 243,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "When high, indicates that the recording consent prompt is visible on the ZoomRoom UI",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("RecordingPromptAgree")]
-        public JoinDataComplete RecordingPromptAgree = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 244,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Pulse to agree to consent for meeting recording",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("RecordingPromptDisagree")]
-        public JoinDataComplete RecordingPromptDisagree = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 245,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Pulse to disagree to consent for meeting recording",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
+			});		
 
         //[JoinName("ParticipantAudioMuteToggleStart")]
         //public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(

packages.config

@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashCore" version="1.1.1" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
+  <package id="PepperDashCore" version="1.1.1-rc-247" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
 </packages>