[Freeswitch-svn] [commit] r12900 - in freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket: . Commands General

[FreeSWITCH SVN]

Author: verifier
Date: Fri Apr  3 06:54:01 2009
New Revision: 12900

Log:
Removed the use of call leg variables in originate since session variables really can't be assigned in the form {global vars}[local vars]targetA targetB. Well, its fixed now.

Removed:
   freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/General/CallLegVariable.cs
Modified:
   freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs
   freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.pfx
   freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj

Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs
==============================================================================
--- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs	(original)
+++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs	Fri Apr  3 06:54:01 2009
@@ -85,27 +85,20 @@
 
                     if (_autoAnswer)
                     {
-                        _variables.Add(new CallLegVariable("sip_invite_params", "intercom=true"));
-                        _variables.Add(new CallLegVariable("sip_h_Call-Info", "<sip:$${domain}>;answer-after=0"));
-                        _variables.Add(new CallLegVariable("sip_auto_answer", "true"));
+                        /*_variables.Add(new CallVariable("sip_invite_params", "intercom=true"));*/
+                        _variables.Add(new CallVariable("sip_h_Call-Info", "answer-after=0"));
+                        _variables.Add(new CallVariable("sip_auto_answer", "true"));
                     }
                 }
 
                 string variables = string.Empty;
-                string legVariables = string.Empty;
                 foreach (CallVariable var in _variables)
-                {
-                    if (var is CallLegVariable)
-                        legVariables += var + ",";
-                    else
                         variables += var + ",";
-                }
+
                 if (variables.Length > 0)
                     variables = "{" + variables.Remove(variables.Length - 1, 1) + "}";
-                if (legVariables.Length > 0)
-                    legVariables = "[" + legVariables.Remove(legVariables.Length - 1, 1) + "]";
 
-                return variables + legVariables + Caller + " " + Destination;
+                return variables + Caller + " " + Destination;
             }
         }
 

Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.pfx
==============================================================================
Binary files. No diff available.

Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj
==============================================================================
--- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj	(original)
+++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj	Fri Apr  3 06:54:01 2009
@@ -91,7 +91,6 @@
     <Compile Include="Events\EventHeartbeat.cs" />
     <Compile Include="Events\EventReSchedule.cs" />
     <Compile Include="General\Address.cs" />
-    <Compile Include="General\CallLegVariable.cs" />
     <Compile Include="General\SipAddress.cs" />
     <Compile Include="General\SofiaSipAddress.cs" />
     <Compile Include="PartyInfo.cs" />