Revision
15780
Author
joshrivers
Date
2009-12-03 16:15:22 -0600 (Thu, 03 Dec 2009)

Log Message

Added mockable interface to Api class.
Modified api swig generated class to be partial.
Reswig.

Modified Paths

Diff

Modified: freeswitch/branches/joshrivers/mod_managed_working_branch/src/mod/languages/mod_managed/freeswitch.i (15779 => 15780)


--- freeswitch/branches/joshrivers/mod_managed_working_branch/src/mod/languages/mod_managed/freeswitch.i	2009-12-03 20:49:41 UTC (rev 15779)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/src/mod/languages/mod_managed/freeswitch.i	2009-12-03 22:15:22 UTC (rev 15780)
@@ -76,6 +76,7 @@
 %typemap(csclassmodifiers) ManagedSession "public partial class"
 %typemap(csclassmodifiers) Event "public partial class"
 %typemap(csclassmodifiers) Stream "public partial class"
+%typemap(csclassmodifiers) API "public partial class"
 %newobject EventConsumer::pop;
 %newobject Session;
 %newobject CoreSession;

Modified: freeswitch/branches/joshrivers/mod_managed_working_branch/src/mod/languages/mod_managed/freeswitch_wrap.cxx (15779 => 15780)


--- freeswitch/branches/joshrivers/mod_managed_working_branch/src/mod/languages/mod_managed/freeswitch_wrap.cxx	2009-12-03 20:49:41 UTC (rev 15779)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/src/mod/languages/mod_managed/freeswitch_wrap.cxx	2009-12-03 22:15:22 UTC (rev 15780)
@@ -9208,6 +9208,79 @@
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_handle_t_hash_set(void * jarg1, unsigned long jarg2) {
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  unsigned long arg2 ;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  arg2 = (unsigned long)jarg2; 
+  if (arg1) (arg1)->hash = arg2;
+  
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_cache_db_handle_t_hash_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  unsigned long result;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  result = (unsigned long) ((arg1)->hash);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_handle_t_creator_set(void * jarg1, char * jarg2) {
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  char *arg2 ;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) strncpy((char *)arg1->creator, (const char *)arg2, 256);
+    else arg1->creator[0] = 0;
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_handle_t_creator_get(void * jarg1) {
+  char * jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  result = (char *)(char *) ((arg1)->creator);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_handle_t_last_user_set(void * jarg1, char * jarg2) {
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  char *arg2 ;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) strncpy((char *)arg1->last_user, (const char *)arg2, 256);
+    else arg1->last_user[0] = 0;
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_handle_t_last_user_get(void * jarg1) {
+  char * jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  result = (char *)(char *) ((arg1)->last_user);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_cache_db_handle_t() {
   void * jresult ;
   switch_cache_db_handle_t *result = 0 ;
@@ -9333,6 +9406,14 @@
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_status(void * jarg1) {
+  switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
+  
+  arg1 = (switch_stream_handle_t *)jarg1; 
+  switch_cache_db_status(arg1);
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp__switch_core_db_handle(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
   int jresult ;
   switch_cache_db_handle_t **arg1 = (switch_cache_db_handle_t **) 0 ;
@@ -11745,6 +11826,21 @@
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_add_application_printf(void * jarg1, void * jarg2, char * jarg3, char * jarg4) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_caller_extension_t *arg2 = (switch_caller_extension_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  void *arg5 = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_caller_extension_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  switch_caller_extension_add_application_printf(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
+}
+
+
 SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_get_field_by_name(void * jarg1, char * jarg2) {
   char * jresult ;
   switch_caller_profile_t *arg1 = (switch_caller_profile_t *) 0 ;

Modified: freeswitch/branches/joshrivers/mod_managed_working_branch/src/mod/languages/mod_managed/managed/ManagedSession.cs (15779 => 15780)


--- freeswitch/branches/joshrivers/mod_managed_working_branch/src/mod/languages/mod_managed/managed/ManagedSession.cs	2009-12-03 20:49:41 UTC (rev 15779)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/src/mod/languages/mod_managed/managed/ManagedSession.cs	2009-12-03 22:15:22 UTC (rev 15780)
@@ -47,7 +47,7 @@
     [UnmanagedFunctionPointerAttribute(CallingConvention.Cdecl)]
     public delegate switch_status_t switch_state_handler_t_delegate(IntPtr sessionPtr);
 
-    public interface IManagedSession
+    public interface IManagedSession : IDisposable
     {
         int Answer();
         bool Answered();
@@ -86,6 +86,7 @@
         bool Originate(CoreSession aLegSession, string destination, TimeSpan timeout);
         string PlayAndGetDigits(int min_digits, int max_digits, int max_tries, int timeout, string terminators, string audio_files, string bad_input_audio_files, string digits_regex, string var_name);
         int PreAnswer();
+        void QueuePrivateEvent(IEvent sendME);
         string Read(int min_digits, int max_digits, string prompt_audio_file, int timeout, string valid_terminators);
         bool Ready();
         int RecordFile(string file_name, int time_limit, int silence_threshold, int silence_hits);
@@ -324,9 +325,16 @@
                 base.CallCause = value;
             }
         }
+
+        public void QueuePrivateEvent(IEvent sendME)
+        {
+            Event sendEE = sendME as Event;
+            if (sendEE == null) { return; }
+            base.QueuePrivateEvent(sendEE);
+        }
     }
 
-    public interface IEvent
+    public interface IEvent : IDisposable
     {
         switch_event InternalEvent { get; set; }
         string serialized_string { get; set; }
@@ -460,4 +468,13 @@
             this._eventConsumer.Dispose();
         }
     }
+
+
+    public interface IApi : IDisposable
+    {
+        string Execute(string command, string data);
+        string ExecuteString(string command);
+        string getTime();
+    }
+    public partial class Api : IApi { }
 }

Modified: freeswitch/branches/joshrivers/mod_managed_working_branch/src/mod/languages/mod_managed/managed/swig.cs (15779 => 15780)


--- freeswitch/branches/joshrivers/mod_managed_working_branch/src/mod/languages/mod_managed/managed/swig.cs	2009-12-03 20:49:41 UTC (rev 15779)
+++ freeswitch/branches/joshrivers/mod_managed_working_branch/src/mod/languages/mod_managed/managed/swig.cs	2009-12-03 22:15:22 UTC (rev 15780)
@@ -11,7 +11,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-public class Api : IDisposable {
+public partial class Api : IDisposable {
   private HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -2146,6 +2146,10 @@
     return ret;
   }
 
+  public static void switch_cache_db_status(switch_stream_handle stream) {
+    freeswitchPINVOKE.switch_cache_db_status(switch_stream_handle.getCPtr(stream));
+  }
+
   public static switch_status_t _switch_core_db_handle(SWIGTYPE_p_p_switch_cache_db_handle_t dbh, string file, string func, int line) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE._switch_core_db_handle(SWIGTYPE_p_p_switch_cache_db_handle_t.getCPtr(dbh), file, func, line);
     return ret;
@@ -2561,6 +2565,10 @@
     freeswitchPINVOKE.switch_caller_extension_add_application(SWIGTYPE_p_switch_core_session.getCPtr(session), switch_caller_extension.getCPtr(caller_extension), application_name, extra_data);
   }
 
+  public static void switch_caller_extension_add_application_printf(SWIGTYPE_p_switch_core_session session, switch_caller_extension caller_extension, string application_name, string fmt) {
+    freeswitchPINVOKE.switch_caller_extension_add_application_printf(SWIGTYPE_p_switch_core_session.getCPtr(session), switch_caller_extension.getCPtr(caller_extension), application_name, fmt);
+  }
+
   public static string switch_caller_get_field_by_name(switch_caller_profile caller_profile, string name) {
     string ret = freeswitchPINVOKE.switch_caller_get_field_by_name(switch_caller_profile.getCPtr(caller_profile), name);
     return ret;
@@ -6992,6 +7000,24 @@
   [DllImport("mod_managed", EntryPoint="CSharp_switch_cache_db_handle_t_flags_get")]
   public static extern int switch_cache_db_handle_t_flags_get(HandleRef jarg1);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_cache_db_handle_t_hash_set")]
+  public static extern void switch_cache_db_handle_t_hash_set(HandleRef jarg1, uint jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_cache_db_handle_t_hash_get")]
+  public static extern uint switch_cache_db_handle_t_hash_get(HandleRef jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_cache_db_handle_t_creator_set")]
+  public static extern void switch_cache_db_handle_t_creator_set(HandleRef jarg1, string jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_cache_db_handle_t_creator_get")]
+  public static extern string switch_cache_db_handle_t_creator_get(HandleRef jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_cache_db_handle_t_last_user_set")]
+  public static extern void switch_cache_db_handle_t_last_user_set(HandleRef jarg1, string jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_cache_db_handle_t_last_user_get")]
+  public static extern string switch_cache_db_handle_t_last_user_get(HandleRef jarg1);
+
   [DllImport("mod_managed", EntryPoint="CSharp_new_switch_cache_db_handle_t")]
   public static extern IntPtr new_switch_cache_db_handle_t();
 
@@ -7019,6 +7045,9 @@
   [DllImport("mod_managed", EntryPoint="CSharp_switch_cache_db_execute_sql_callback")]
   public static extern int switch_cache_db_execute_sql_callback(HandleRef jarg1, string jarg2, HandleRef jarg3, HandleRef jarg4, ref string jarg5);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_cache_db_status")]
+  public static extern void switch_cache_db_status(HandleRef jarg1);
+
   [DllImport("mod_managed", EntryPoint="CSharp__switch_core_db_handle")]
   public static extern int _switch_core_db_handle(HandleRef jarg1, string jarg2, string jarg3, int jarg4);
 
@@ -7550,6 +7579,9 @@
   [DllImport("mod_managed", EntryPoint="CSharp_switch_caller_extension_add_application")]
   public static extern void switch_caller_extension_add_application(HandleRef jarg1, HandleRef jarg2, string jarg3, string jarg4);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_caller_extension_add_application_printf")]
+  public static extern void switch_caller_extension_add_application_printf(HandleRef jarg1, HandleRef jarg2, string jarg3, string jarg4);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_caller_get_field_by_name")]
   public static extern string switch_caller_get_field_by_name(HandleRef jarg1, string jarg2);
 
@@ -18103,6 +18135,36 @@
     } 
   }
 
+  public uint hash {
+    set {
+      freeswitchPINVOKE.switch_cache_db_handle_t_hash_set(swigCPtr, value);
+    } 
+    get {
+      uint ret = freeswitchPINVOKE.switch_cache_db_handle_t_hash_get(swigCPtr);
+      return ret;
+    } 
+  }
+
+  public string creator {
+    set {
+      freeswitchPINVOKE.switch_cache_db_handle_t_creator_set(swigCPtr, value);
+    } 
+    get {
+      string ret = freeswitchPINVOKE.switch_cache_db_handle_t_creator_get(swigCPtr);
+      return ret;
+    } 
+  }
+
+  public string last_user {
+    set {
+      freeswitchPINVOKE.switch_cache_db_handle_t_last_user_set(swigCPtr, value);
+    } 
+    get {
+      string ret = freeswitchPINVOKE.switch_cache_db_handle_t_last_user_get(swigCPtr);
+      return ret;
+    } 
+  }
+
   public switch_cache_db_handle_t() : this(freeswitchPINVOKE.new_switch_cache_db_handle_t(), true) {
   }
 
@@ -19058,6 +19120,7 @@
   CF_SIGNAL_BRIDGE_TTL,
   CF_MEDIA_BRIDGE_TTL,
   CF_BYPASS_MEDIA_AFTER_BRIDGE,
+  CF_LEG_HOLDING,
   CF_FLAG_MAX
 }