fix mod_perl

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3832 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/languages/mod_perl/switch_swig_wrap.c b/src/mod/languages/mod_perl/switch_swig_wrap.c
index 67d991989afd6925b7c58e8a9336a363ef066f2e..a088af35693962f1ab84ce8485c93568ad8af549 100644 (file)
--- a/src/mod/languages/mod_perl/switch_swig_wrap.c
+++ b/src/mod/languages/mod_perl/switch_swig_wrap.c
@@ -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

diff --git a/src/switch_swig.c b/src/switch_swig.c
index 5bfaf9d9f7fb124755af2c9ba51773a5765a5337..2d799b18a643b37ff1c9a28b02871de733bfa404 100644 (file)
--- a/src/switch_swig.c
+++ b/src/switch_swig.c
@@ -158,29 +158,26 @@ void fs_channel_set_state(switch_core_session_t *session, char *state)
 */
 
 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 @@ int fs_ivr_play_file2(switch_core_session_t *session,
 {
        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;
 }