[Freeswitch-branches] [commit] r3841 - in freeswitch/branches/knhor/trunk: . mac/xcode mac/xcode/FreeSWITCH.xcodeproj src src/mod/languages/mod_perl

[Freeswitch SVN]

Author: knhor
Date: Wed Dec 27 01:20:37 2006
New Revision: 3841

Removed:
   freeswitch/branches/knhor/trunk/mac/xcode/FreeSWITCH.xcodeproj/
   freeswitch/branches/knhor/trunk/mac/xcode/Loadable Bundle.trgttmpl
   freeswitch/branches/knhor/trunk/mac/xcode/apr.plist
   freeswitch/branches/knhor/trunk/mac/xcode/aprutil.plist
   freeswitch/branches/knhor/trunk/mac/xcode/dingaling.plist
   freeswitch/branches/knhor/trunk/mac/xcode/exosip2.plist
   freeswitch/branches/knhor/trunk/mac/xcode/gsm.plist
   freeswitch/branches/knhor/trunk/mac/xcode/iax.plist
   freeswitch/branches/knhor/trunk/mac/xcode/iksemel.plist
   freeswitch/branches/knhor/trunk/mac/xcode/ilbc.plist
   freeswitch/branches/knhor/trunk/mac/xcode/libfreeswitch.plist
   freeswitch/branches/knhor/trunk/mac/xcode/osip2.plist
   freeswitch/branches/knhor/trunk/mac/xcode/osipparser2.plist
   freeswitch/branches/knhor/trunk/mac/xcode/pcre.plist
   freeswitch/branches/knhor/trunk/mac/xcode/portaudio.plist
   freeswitch/branches/knhor/trunk/mac/xcode/resample.plist
   freeswitch/branches/knhor/trunk/mac/xcode/sndfile.plist
   freeswitch/branches/knhor/trunk/mac/xcode/speakup.plist
   freeswitch/branches/knhor/trunk/mac/xcode/speex.plist
   freeswitch/branches/knhor/trunk/mac/xcode/sqlite.plist
   freeswitch/branches/knhor/trunk/mac/xcode/srtp.plist
   freeswitch/branches/knhor/trunk/mac/xcode/teletone.plist
Modified:
   freeswitch/branches/knhor/trunk/   (props changed)
   freeswitch/branches/knhor/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c
   freeswitch/branches/knhor/trunk/src/switch_swig.c

Log:
Merged revisions 3826-3840 via svnmerge from trunk


Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c
==============================================================================
--- freeswitch/branches/knhor/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c	(original)
+++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c	Wed Dec 27 01:20:37 2006
@@ -15,6 +15,7 @@
  * clashes if multiple interpreters are included
  *
  ************************************************************************/
+#include <switch.h>
 
 #define SWIG_TypeRegister    SWIG_Perl_TypeRegister
 #define SWIG_TypeCheck       SWIG_Perl_TypeCheck

Modified: freeswitch/branches/knhor/trunk/src/switch_swig.c
==============================================================================
--- freeswitch/branches/knhor/trunk/src/switch_swig.c	(original)
+++ freeswitch/branches/knhor/trunk/src/switch_swig.c	Wed Dec 27 01:20:37 2006
@@ -158,29 +158,26 @@
 */
 
 int fs_ivr_play_file(switch_core_session_t *session,
-					 char *file)
+                     switch_file_handle_t *fh,
+					 char *file,
+                     switch_input_args_t *args)
 {
 	switch_status_t status;
-	if (switch_strlen_zero(timer_name)) {
-		timer_name = NULL;
-	}
 	
-	status = switch_ivr_play_file(session, NULL, file, NULL);
+	status = switch_ivr_play_file(session, fh, file, args);
 	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
 }
 
 int fs_switch_ivr_record_file(switch_core_session_t *session,
                               switch_file_handle_t *fh,
                               char *file,
-                              switch_input_callback_function_t dtmf_callback,
-                              void *buf,
-                              unsigned int buflen,
+                              switch_input_args_t *args,
                               unsigned int limit
                               )
 {  
 	switch_status_t status;
 	
-    status = switch_ivr_record_file(session, fh, file, dtmf_callback, buf, buflen, limit);
+    status = switch_ivr_record_file(session, fh, file, args, limit);
     return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
 }
 
@@ -198,20 +195,18 @@
 {
 	switch_status_t status;
 	
-	status = switch_ivr_play_file(session, NULL, file, NULL, NULL);
+	status = switch_ivr_play_file(session, NULL, file, NULL);
 	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
 }
 
 
 int fs_switch_ivr_collect_digits_callback (switch_core_session_t *session,
-										   switch_input_callback_function_t dtmf_callback,
-										   void *buf,
-										   unsigned int buflen,
+                                           switch_input_args_t *args,
 										   unsigned int timeout)
 {
     switch_status_t status;
 
-    status = switch_ivr_collect_digits_callback(session, dtmf_callback, buf, buflen, timeout);
+    status = switch_ivr_collect_digits_callback(session, args, timeout);
     return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
 }