changes to language stuff

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

src/mod/languages/mod_perl/Makefile

@@ -6,7 +6,8 @@ CFLAGS  += -DEMBED_PERL
 LDFLAGS +=  $(shell $(PERL) -MExtUtils::Embed -e ldopts)
 LDFLAGS +=  $(shell $(PERL) -MConfig -e 'print $$Config{libs}')  
 OBJS += perlxsi.o
-
+SWIGCFILE=../../../switch_swig.c
+SWIGIFILE=../../../switch_swig.i
 
 
 all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) fs_perl.$(DYNAMIC_LIB_EXTEN)
@@ -23,7 +24,10 @@ depends:
 
 reswig: 
 	rm switch_swig_wrap.c
-	swig -lswitch_swig.i -ignoremissing -DMULTIPLICITY -perl5 -module fs_perl switch_swig.c
+	swig -o switch_swig_wrap.c -l$(SWIGIFILE) -ignoremissing -DMULTIPLICITY -perl5 -module fs_perl $(SWIGCFILE)
+
+switch_swig.o: $(SWIGCFILE) Makefile
+	$(CC)  -w $(CFLAGS) -c $< -o $@
 
 switch_swig_wrap.o: switch_swig_wrap.c
 	$(CC) -w $(CFLAGS) -c $< -o $@

src/mod/languages/mod_perl/fs_perl.pm

@@ -1,4 +1,5 @@
-# This file was automatically generated by SWIG
+# This file was created automatically by SWIG 1.3.29.
+# Don't modify this file, modify the SWIG interface instead.
 package fs_perl;
 require Exporter;
 require DynaLoader;
@@ -51,8 +52,8 @@ package fs_perl;
 *fs_loadable_module_init = *fs_perlc::fs_loadable_module_init;
 *fs_loadable_module_shutdown = *fs_perlc::fs_loadable_module_shutdown;
 *fs_console_loop = *fs_perlc::fs_console_loop;
-*fs_console_log = *fs_perlc::fs_console_log;
-*fs_console_clean = *fs_perlc::fs_console_clean;
+*fs_consol_log = *fs_perlc::fs_consol_log;
+*fs_consol_clean = *fs_perlc::fs_consol_clean;
 *fs_core_session_locate = *fs_perlc::fs_core_session_locate;
 *fs_channel_answer = *fs_perlc::fs_channel_answer;
 *fs_channel_pre_answer = *fs_perlc::fs_channel_pre_answer;
@@ -61,7 +62,16 @@ package fs_perl;
 *fs_channel_get_variable = *fs_perlc::fs_channel_get_variable;
 *fs_channel_set_state = *fs_perlc::fs_channel_set_state;
 *fs_ivr_play_file = *fs_perlc::fs_ivr_play_file;
+*fs_switch_ivr_record_file = *fs_perlc::fs_switch_ivr_record_file;
+*fs_switch_ivr_sleep = *fs_perlc::fs_switch_ivr_sleep;
 *fs_ivr_play_file2 = *fs_perlc::fs_ivr_play_file2;
+*fs_switch_ivr_collect_digits_callback = *fs_perlc::fs_switch_ivr_collect_digits_callback;
+*fs_switch_ivr_collect_digits_count = *fs_perlc::fs_switch_ivr_collect_digits_count;
+*fs_switch_ivr_originate = *fs_perlc::fs_switch_ivr_originate;
+*fs_switch_ivr_session_transfer = *fs_perlc::fs_switch_ivr_session_transfer;
+*fs_switch_ivr_speak_text = *fs_perlc::fs_switch_ivr_speak_text;
+*fs_switch_channel_get_variable = *fs_perlc::fs_switch_channel_get_variable;
+*fs_switch_channel_set_variable = *fs_perlc::fs_switch_channel_set_variable;
 
 # ------- VARIABLE STUBS --------
 

src/mod/languages/mod_perl/switch_swig.c

@@ -1,151 +0,0 @@
-#include <switch.h>
-#ifdef __ICC
-#pragma warning (disable:1418)
-#endif
-
-
-
-#ifdef _MSC_VER
-#include <php.h>
-#pragma comment(lib, PHP_LIB)
-#endif
-
-void fs_core_set_globals(void)
-{
-	switch_core_set_globals();
-}
-
-int fs_core_init(char *path)
-{
-	switch_status_t status;
-	const char *err = NULL;
-
-	if (switch_strlen_zero(path)) {
-		path = NULL;
-	}
-
-	status = switch_core_init(path, &err);
-
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_core_destroy(void)
-{
-	switch_status_t status;
-
-	status = switch_core_destroy();
-
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_loadable_module_init(void)
-{
-	return switch_loadable_module_init() == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_loadable_module_shutdown(void)
-{
-	switch_loadable_module_shutdown();
-	return 1;
-}
-
-int fs_console_loop(void) 
-{
-	switch_console_loop();
-	return 0;
-}
-
-void fs_console_log(char *level_str, char *msg)
-{
-	switch_log_level_t level = SWITCH_LOG_DEBUG;
-
-	if (level_str) {
-		level = switch_log_str2level(level_str);
-	}
-	
-	switch_log_printf(SWITCH_CHANNEL_LOG, level, msg);
-}
-
-void fs_console_clean(char *msg)
-{
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, msg);
-}
-
-switch_core_session_t *fs_core_session_locate(char *uuid)
-{
-	switch_core_session_t *session;
-
-	if ((session = switch_core_session_locate(uuid))) {
-		switch_core_session_rwunlock(session);
-	}
-
-	return session;
-}
-
-void fs_channel_answer(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_answer(channel);
-}
-
-void fs_channel_pre_answer(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_pre_answer(channel);
-}
-
-void fs_channel_hangup(switch_core_session_t *session, char *cause)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_hangup(channel, switch_channel_str2cause(cause));
-}
-
-void fs_channel_set_variable(switch_core_session_t *session, char *var, char *val)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_set_variable(channel, var, val);
-}
-
-void fs_channel_get_variable(switch_core_session_t *session, char *var)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_get_variable(channel, var);
-}
-
-void fs_channel_set_state(switch_core_session_t *session, char *state)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_state_t fs_state = switch_channel_get_state(channel);
-
-	if ((fs_state = switch_channel_name_state(state)) < CS_HANGUP) {
-		switch_channel_set_state(channel, fs_state);
-	}
-}
-
-int fs_ivr_play_file(switch_core_session_t *session,
-					 char *file,
-					 char *timer_name,
-					 switch_input_callback_function_t dtmf_callback,
-					 void *buf,
-					 unsigned int buflen)
-{
-	switch_status_t status;
-	if (switch_strlen_zero(timer_name)) {
-		timer_name = NULL;
-	}
-	
-	status = switch_ivr_play_file(session, NULL, file, timer_name, NULL, NULL, 0);
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-
-int fs_ivr_play_file2(switch_core_session_t *session,
-					  char *file)
-
-{
-	switch_status_t status;
-	
-	status = switch_ivr_play_file(session, NULL, file, NULL, NULL, NULL, 0);
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-

src/mod/languages/mod_perl/switch_swig.i

@@ -1,9 +0,0 @@
-// gd.i
-%module fs_perl
-%{
-#include <switch.h>
-%}
-
-// Grab the gd.h header file
-%include <switch.h>
-