PreAnswer

danbarua · Feb 10, 2015 · 688921a · 688921a
1 parent 5513d5a
commit 688921a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/src/NEventSocket/Channels/BasicChannel.cs b/src/NEventSocket/Channels/BasicChannel.cs
@@ -140,6 +140,14 @@ public bool IsAnswered
             }
         }
 
+        public bool IsPreAnswered
+        {
+            get
+            {
+                return Answered.HasValue && Answered.Value == AnswerState.Early;
+            }
+        }
+
         public IObservable<string> FeatureCodes(string prefix = "#")
         {
             return eventSocket
@@ -162,7 +170,11 @@ public Task<CommandReply> SendCommand(string command)
 
         public Task Hangup(HangupCause hangupCause = FreeSwitch.HangupCause.NormalClearing)
         {
-            return RunIfAnswered(() => eventSocket.SendApi("uuid_kill {0} {1}".Fmt(UUID, hangupCause.ToString().ToUpperWithUnderscores())));
+            return
+                RunIfAnswered(
+                    () =>
+                    eventSocket.SendApi("uuid_kill {0} {1}".Fmt(UUID, hangupCause.ToString().ToUpperWithUnderscores())),
+                    true);
         }
 
         public async Task PlayFile(string file, Leg leg = Leg.ALeg, bool mix = false, string terminator = null)
@@ -331,9 +343,10 @@ protected virtual void Dispose(bool disposing)
         /// Runs the given async function if the Channel is still connected, otherwise a completed Task.
         /// </summary>
         /// <param name="toRun">An Async function.</param>
-        protected Task RunIfAnswered(Func<Task> toRun)
+        /// <param name="orPreAnswered">Function also run in pre answer state</param>
+        protected Task RunIfAnswered(Func<Task> toRun, bool orPreAnswered = false)
         {
-            if (!IsAnswered)
+            if (!IsAnswered && (!orPreAnswered || !IsPreAnswered))
             {
                 return TaskHelper.Completed;
             }

diff --git a/src/NEventSocket/Channels/Channel.cs b/src/NEventSocket/Channels/Channel.cs
@@ -99,7 +99,7 @@ public async Task BridgeTo(Channel other)
                 throw new InvalidOperationException("Channel {0} is already bridged to {1}".Fmt(UUID, Bridge.Channel.UUID));
             }
 
-            if (Answered != AnswerState.Answered && other.Answered != AnswerState.Answered)
+            if (!(IsAnswered || IsPreAnswered) && !(other.IsAnswered || other.IsPreAnswered))
             {
                 throw new InvalidOperationException("At least one channel must be Answered to bridge them");
             }
@@ -118,7 +118,7 @@ public async Task BridgeTo(Channel other)
 
         public async Task BridgeTo(string destination, BridgeOptions options, Action<EventMessage> onProgress = null)
         {
-            if (!IsAnswered)
+            if (!IsAnswered && !IsPreAnswered)
             {
                 return;
             }
@@ -193,6 +193,11 @@ public Task Answer()
             return eventSocket.ExecuteApplication(UUID, "answer");
         }
 
+        public Task PreAnswer()
+        {
+            return eventSocket.ExecuteApplication(UUID, "pre_answer");
+        }
+
         public Task Sleep(int milliseconds)
         {
             return eventSocket.ExecuteApplication(UUID, "sleep", milliseconds.ToString());

diff --git a/src/NEventSocket/FreeSwitch/AnswerState.cs b/src/NEventSocket/FreeSwitch/AnswerState.cs
@@ -11,6 +11,11 @@ namespace NEventSocket.FreeSwitch
     /// </summary>
     public enum AnswerState
     {
+        /// <summary>
+        /// The Channel is pre answered
+        /// </summary>
+        Early,
+
         /// <summary>
         /// The Channel is Answered
         /// </summary>