diff --git a/src/mod/applications/mod_rss/mod_rss.c b/src/mod/applications/mod_rss/mod_rss.c index adb5cd4fd7..c17e0a53aa 100644 --- a/src/mod/applications/mod_rss/mod_rss.c +++ b/src/mod/applications/mod_rss/mod_rss.c @@ -185,7 +185,7 @@ SWITCH_STANDARD_APP(rss_function) const char *vcf = NULL; char *chanvars = switch_channel_build_param_string(channel, NULL, NULL); switch_codec_implementation_t read_impl = { 0 }; - uint32_t rate, interval; + uint32_t rate, interval, channels; switch_core_session_get_read_impl(session, &read_impl); interval = read_impl.microseconds_per_packet / 1000; @@ -257,13 +257,14 @@ SWITCH_STANDARD_APP(rss_function) if (switch_channel_media_ready(channel)) { rate = read_impl.actual_samples_per_second; + channels = read_impl.number_of_channels; } else { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Codec Error!\n"); return; } memset(&sh, 0, sizeof(sh)); - if (switch_core_speech_open(&sh, engine, voice, rate, interval, &flags, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + if (switch_core_speech_open(&sh, engine, voice, rate, interval, channels, &flags, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid TTS module!\n"); return; } diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx index 91dbe0900d..02cdabd75b 100644 --- a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx +++ b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx @@ -8044,6 +8044,72 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_held_out_get(v } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_unheld_set(void * jarg1, unsigned long jarg2) { + switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_device_stats_t *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->unheld = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_unheld_get(void * jarg1) { + unsigned long jresult ; + switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ; + uint32_t result; + + arg1 = (switch_device_stats_t *)jarg1; + result = (uint32_t) ((arg1)->unheld); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_unheld_in_set(void * jarg1, unsigned long jarg2) { + switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_device_stats_t *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->unheld_in = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_unheld_in_get(void * jarg1) { + unsigned long jresult ; + switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ; + uint32_t result; + + arg1 = (switch_device_stats_t *)jarg1; + result = (uint32_t) ((arg1)->unheld_in); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_unheld_out_set(void * jarg1, unsigned long jarg2) { + switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_device_stats_t *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->unheld_out = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_unheld_out_get(void * jarg1) { + unsigned long jresult ; + switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ; + uint32_t result; + + arg1 = (switch_device_stats_t *)jarg1; + result = (uint32_t) ((arg1)->unheld_out); + jresult = (unsigned long)result; + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_hup_set(void * jarg1, unsigned long jarg2) { switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ; uint32_t arg2 ; @@ -11936,17 +12002,19 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_destroy(void * jarg1) { } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_insert(void * jarg1, char * jarg2, void * jarg3) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_insert_destructor(void * jarg1, char * jarg2, void * jarg3, void * jarg4) { int jresult ; switch_hash_t *arg1 = (switch_hash_t *) 0 ; char *arg2 = (char *) 0 ; void *arg3 = (void *) 0 ; + hashtable_destructor_t arg4 = (hashtable_destructor_t) 0 ; switch_status_t result; arg1 = (switch_hash_t *)jarg1; arg2 = (char *)jarg2; arg3 = (void *)jarg3; - result = (switch_status_t)switch_core_hash_insert(arg1,(char const *)arg2,(void const *)arg3); + arg4 = (hashtable_destructor_t)jarg4; + result = (switch_status_t)switch_core_hash_insert_destructor(arg1,(char const *)arg2,(void const *)arg3,arg4); jresult = result; return jresult; } @@ -12849,15 +12917,16 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_truncate(void * jarg1, long l } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_speech_open(void * jarg1, char * jarg2, char * jarg3, unsigned int jarg4, unsigned int jarg5, void * jarg6, void * jarg7) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_speech_open(void * jarg1, char * jarg2, char * jarg3, unsigned int jarg4, unsigned int jarg5, unsigned int jarg6, void * jarg7, void * jarg8) { int jresult ; switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; unsigned int arg4 ; unsigned int arg5 ; - switch_speech_flag_t *arg6 = (switch_speech_flag_t *) 0 ; - switch_memory_pool_t *arg7 = (switch_memory_pool_t *) 0 ; + unsigned int arg6 ; + switch_speech_flag_t *arg7 = (switch_speech_flag_t *) 0 ; + switch_memory_pool_t *arg8 = (switch_memory_pool_t *) 0 ; switch_status_t result; arg1 = (switch_speech_handle_t *)jarg1; @@ -12865,9 +12934,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_speech_open(void * jarg1, char * j arg3 = (char *)jarg3; arg4 = (unsigned int)jarg4; arg5 = (unsigned int)jarg5; - arg6 = (switch_speech_flag_t *)jarg6; - arg7 = (switch_memory_pool_t *)jarg7; - result = (switch_status_t)switch_core_speech_open(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6,arg7); + arg6 = (unsigned int)jarg6; + arg7 = (switch_speech_flag_t *)jarg7; + arg8 = (switch_memory_pool_t *)jarg8; + result = (switch_status_t)switch_core_speech_open(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8); jresult = result; return jresult; } @@ -22807,6 +22877,28 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_channels_get(void } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_real_channels_set(void * jarg1, unsigned long jarg2) { + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_file_handle *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->real_channels = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_real_channels_get(void * jarg1) { + unsigned long jresult ; + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + uint32_t result; + + arg1 = (switch_file_handle *)jarg1; + result = (uint32_t) ((arg1)->real_channels); + jresult = (unsigned long)result; + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_format_set(void * jarg1, unsigned int jarg2) { switch_file_handle *arg1 = (switch_file_handle *) 0 ; unsigned int arg2 ; @@ -24662,10 +24754,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_speech_interface_interface_name_get( SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_open_set(void * jarg1, void * jarg2) { switch_speech_interface *arg1 = (switch_speech_interface *) 0 ; - switch_status_t (*arg2)(switch_speech_handle_t *,char const *,int,switch_speech_flag_t *) = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,switch_speech_flag_t *)) 0 ; + switch_status_t (*arg2)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *) = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *)) 0 ; arg1 = (switch_speech_interface *)jarg1; - arg2 = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,switch_speech_flag_t *))jarg2; + arg2 = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *))jarg2; if (arg1) (arg1)->speech_open = arg2; } @@ -24673,10 +24765,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_open_set(void SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_open_get(void * jarg1) { void * jresult ; switch_speech_interface *arg1 = (switch_speech_interface *) 0 ; - switch_status_t (*result)(switch_speech_handle_t *,char const *,int,switch_speech_flag_t *) = 0 ; + switch_status_t (*result)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *) = 0 ; arg1 = (switch_speech_interface *)jarg1; - result = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,switch_speech_flag_t *)) ((arg1)->speech_open); + result = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *)) ((arg1)->speech_open); jresult = (void *)result; return jresult; } @@ -25104,6 +25196,50 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_samples_get(voi } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_channels_set(void * jarg1, unsigned long jarg2) { + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_speech_handle *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->channels = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_channels_get(void * jarg1) { + unsigned long jresult ; + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + uint32_t result; + + arg1 = (switch_speech_handle *)jarg1; + result = (uint32_t) ((arg1)->channels); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_real_channels_set(void * jarg1, unsigned long jarg2) { + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_speech_handle *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->real_channels = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_real_channels_get(void * jarg1) { + unsigned long jresult ; + switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; + uint32_t result; + + arg1 = (switch_speech_handle *)jarg1; + result = (uint32_t) ((arg1)->real_channels); + jresult = (unsigned long)result; + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_voice_set(void * jarg1, char * jarg2) { switch_speech_handle *arg1 = (switch_speech_handle *) 0 ; char *arg2 ; @@ -26720,6 +26856,28 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_fmtp_microseconds_per_packet_get( } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_stereo_set(void * jarg1, int jarg2) { + switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ; + int arg2 ; + + arg1 = (switch_codec_fmtp *)jarg1; + arg2 = (int)jarg2; + if (arg1) (arg1)->stereo = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_fmtp_stereo_get(void * jarg1) { + int jresult ; + switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ; + int result; + + arg1 = (switch_codec_fmtp *)jarg1; + result = (int) ((arg1)->stereo); + jresult = result; + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_private_info_set(void * jarg1, void * jarg2) { switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ; void *arg2 = (void *) 0 ; @@ -33404,6 +33562,28 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_audio_resampler_t_to_size_get } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_channels_set(void * jarg1, int jarg2) { + switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ; + int arg2 ; + + arg1 = (switch_audio_resampler_t *)jarg1; + arg2 = (int)jarg2; + if (arg1) (arg1)->channels = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_audio_resampler_t_channels_get(void * jarg1) { + int jresult ; + switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ; + int result; + + arg1 = (switch_audio_resampler_t *)jarg1; + result = (int) ((arg1)->channels); + jresult = result; + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_audio_resampler_t() { void * jresult ; switch_audio_resampler_t *result = 0 ; @@ -33554,15 +33734,17 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_swap_linear(void * jarg1, int jarg2) { } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_generate_sln_silence(void * jarg1, unsigned long jarg2, unsigned long jarg3) { +SWIGEXPORT void SWIGSTDCALL CSharp_switch_generate_sln_silence(void * jarg1, unsigned long jarg2, unsigned long jarg3, unsigned long jarg4) { int16_t *arg1 = (int16_t *) 0 ; uint32_t arg2 ; uint32_t arg3 ; + uint32_t arg4 ; arg1 = (int16_t *)jarg1; arg2 = (uint32_t)jarg2; arg3 = (uint32_t)jarg3; - switch_generate_sln_silence(arg1,arg2,arg3); + arg4 = (uint32_t)jarg4; + switch_generate_sln_silence(arg1,arg2,arg3,arg4); } @@ -33626,10 +33808,11 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_unmerge_sln(void * jarg1, uns } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_mux_channels(void * jarg1, void * jarg2, unsigned long jarg3) { +SWIGEXPORT void SWIGSTDCALL CSharp_switch_mux_channels(void * jarg1, void * jarg2, unsigned long jarg3, unsigned long jarg4) { int16_t *arg1 = (int16_t *) 0 ; switch_size_t arg2 ; uint32_t arg3 ; + uint32_t arg4 ; switch_size_t *argp2 ; arg1 = (int16_t *)jarg1; @@ -33640,7 +33823,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_mux_channels(void * jarg1, void * jarg } arg2 = *argp2; arg3 = (uint32_t)jarg3; - switch_mux_channels(arg1,arg2,arg3); + arg4 = (uint32_t)jarg4; + switch_mux_channels(arg1,arg2,arg3,arg4); } @@ -34408,7 +34592,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_load_grammar(void * j arg1 = (switch_core_session_t *)jarg1; arg2 = (char *)jarg2; arg3 = (char *)jarg3; - result = (switch_status_t)switch_ivr_detect_speech_load_grammar(arg1,arg2,arg3); + result = (switch_status_t)switch_ivr_detect_speech_load_grammar(arg1,(char const *)arg2,(char const *)arg3); jresult = result; return jresult; } diff --git a/src/mod/languages/mod_managed/managed/swig.2010.cs b/src/mod/languages/mod_managed/managed/swig.2010.cs index 8ae5f05b07..7fc9e3148a 100644 --- a/src/mod/languages/mod_managed/managed/swig.2010.cs +++ b/src/mod/languages/mod_managed/managed/swig.2010.cs @@ -2078,8 +2078,8 @@ public class freeswitch { return ret; } - public static switch_status_t switch_core_hash_insert(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_void data) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data)); + public static switch_status_t switch_core_hash_insert_destructor(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_void data, SWIGTYPE_p_f_p_void__void destructor) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert_destructor(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_f_p_void__void.getCPtr(destructor)); return ret; } @@ -2396,8 +2396,8 @@ public class freeswitch { return ret; } - public static switch_status_t switch_core_speech_open(switch_speech_handle sh, string module_name, string voice_name, uint rate, uint interval, SWIGTYPE_p_unsigned_long flags, SWIGTYPE_p_apr_pool_t pool) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_speech_open(switch_speech_handle.getCPtr(sh), module_name, voice_name, rate, interval, SWIGTYPE_p_unsigned_long.getCPtr(flags), SWIGTYPE_p_apr_pool_t.getCPtr(pool)); + public static switch_status_t switch_core_speech_open(switch_speech_handle sh, string module_name, string voice_name, uint rate, uint interval, uint channels, SWIGTYPE_p_unsigned_long flags, SWIGTYPE_p_apr_pool_t pool) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_speech_open(switch_speech_handle.getCPtr(sh), module_name, voice_name, rate, interval, channels, SWIGTYPE_p_unsigned_long.getCPtr(flags), SWIGTYPE_p_apr_pool_t.getCPtr(pool)); return ret; } @@ -5268,8 +5268,8 @@ public class freeswitch { freeswitchPINVOKE.switch_swap_linear(SWIGTYPE_p_short.getCPtr(buf), len); } - public static void switch_generate_sln_silence(SWIGTYPE_p_short data, uint samples, uint divisor) { - freeswitchPINVOKE.switch_generate_sln_silence(SWIGTYPE_p_short.getCPtr(data), samples, divisor); + public static void switch_generate_sln_silence(SWIGTYPE_p_short data, uint samples, uint channels, uint divisor) { + freeswitchPINVOKE.switch_generate_sln_silence(SWIGTYPE_p_short.getCPtr(data), samples, channels, divisor); } public static void switch_change_sln_volume(SWIGTYPE_p_short data, uint samples, int vol) { @@ -5290,8 +5290,8 @@ public class freeswitch { return ret; } - public static void switch_mux_channels(SWIGTYPE_p_short data, SWIGTYPE_p_switch_size_t samples, uint channels) { - freeswitchPINVOKE.switch_mux_channels(SWIGTYPE_p_short.getCPtr(data), SWIGTYPE_p_switch_size_t.getCPtr(samples), channels); + public static void switch_mux_channels(SWIGTYPE_p_short data, SWIGTYPE_p_switch_size_t samples, uint orig_channels, uint channels) { + freeswitchPINVOKE.switch_mux_channels(SWIGTYPE_p_short.getCPtr(data), SWIGTYPE_p_switch_size_t.getCPtr(samples), orig_channels, channels); if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); } @@ -9381,6 +9381,24 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_device_stats_t_held_out_get")] public static extern uint switch_device_stats_t_held_out_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_device_stats_t_unheld_set")] + public static extern void switch_device_stats_t_unheld_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_device_stats_t_unheld_get")] + public static extern uint switch_device_stats_t_unheld_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_device_stats_t_unheld_in_set")] + public static extern void switch_device_stats_t_unheld_in_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_device_stats_t_unheld_in_get")] + public static extern uint switch_device_stats_t_unheld_in_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_device_stats_t_unheld_out_set")] + public static extern void switch_device_stats_t_unheld_out_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_device_stats_t_unheld_out_get")] + public static extern uint switch_device_stats_t_unheld_out_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_device_stats_t_hup_set")] public static extern void switch_device_stats_t_hup_set(HandleRef jarg1, uint jarg2); @@ -10293,8 +10311,8 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_core_hash_destroy")] public static extern int switch_core_hash_destroy(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_hash_insert")] - public static extern int switch_core_hash_insert(HandleRef jarg1, string jarg2, HandleRef jarg3); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_hash_insert_destructor")] + public static extern int switch_core_hash_insert_destructor(HandleRef jarg1, string jarg2, HandleRef jarg3, HandleRef jarg4); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_hash_insert_locked")] public static extern int switch_core_hash_insert_locked(HandleRef jarg1, string jarg2, HandleRef jarg3, HandleRef jarg4); @@ -10483,7 +10501,7 @@ class freeswitchPINVOKE { public static extern int switch_core_file_truncate(HandleRef jarg1, long jarg2); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_speech_open")] - public static extern int switch_core_speech_open(HandleRef jarg1, string jarg2, string jarg3, uint jarg4, uint jarg5, HandleRef jarg6, HandleRef jarg7); + public static extern int switch_core_speech_open(HandleRef jarg1, string jarg2, string jarg3, uint jarg4, uint jarg5, uint jarg6, HandleRef jarg7, HandleRef jarg8); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_speech_feed_tts")] public static extern int switch_core_speech_feed_tts(HandleRef jarg1, string jarg2, HandleRef jarg3); @@ -12873,6 +12891,12 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_channels_get")] public static extern uint switch_file_handle_channels_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_real_channels_set")] + public static extern void switch_file_handle_real_channels_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_real_channels_get")] + public static extern uint switch_file_handle_real_channels_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_format_set")] public static extern void switch_file_handle_format_set(HandleRef jarg1, uint jarg2); @@ -13467,6 +13491,18 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_samples_get")] public static extern uint switch_speech_handle_samples_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_channels_set")] + public static extern void switch_speech_handle_channels_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_channels_get")] + public static extern uint switch_speech_handle_channels_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_real_channels_set")] + public static extern void switch_speech_handle_real_channels_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_real_channels_get")] + public static extern uint switch_speech_handle_real_channels_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_speech_handle_voice_set")] public static extern void switch_speech_handle_voice_set(HandleRef jarg1, string jarg2); @@ -13899,6 +13935,12 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_fmtp_microseconds_per_packet_get")] public static extern int switch_codec_fmtp_microseconds_per_packet_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_fmtp_stereo_set")] + public static extern void switch_codec_fmtp_stereo_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_fmtp_stereo_get")] + public static extern int switch_codec_fmtp_stereo_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_fmtp_private_info_set")] public static extern void switch_codec_fmtp_private_info_set(HandleRef jarg1, HandleRef jarg2); @@ -15489,6 +15531,12 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_audio_resampler_t_to_size_get")] public static extern uint switch_audio_resampler_t_to_size_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_audio_resampler_t_channels_set")] + public static extern void switch_audio_resampler_t_channels_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_audio_resampler_t_channels_get")] + public static extern int switch_audio_resampler_t_channels_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_new_switch_audio_resampler_t")] public static extern IntPtr new_switch_audio_resampler_t(); @@ -15520,7 +15568,7 @@ class freeswitchPINVOKE { public static extern void switch_swap_linear(HandleRef jarg1, int jarg2); [DllImport("mod_managed", EntryPoint="CSharp_switch_generate_sln_silence")] - public static extern void switch_generate_sln_silence(HandleRef jarg1, uint jarg2, uint jarg3); + public static extern void switch_generate_sln_silence(HandleRef jarg1, uint jarg2, uint jarg3, uint jarg4); [DllImport("mod_managed", EntryPoint="CSharp_switch_change_sln_volume")] public static extern void switch_change_sln_volume(HandleRef jarg1, uint jarg2, int jarg3); @@ -15535,7 +15583,7 @@ class freeswitchPINVOKE { public static extern uint switch_unmerge_sln(HandleRef jarg1, uint jarg2, HandleRef jarg3, uint jarg4); [DllImport("mod_managed", EntryPoint="CSharp_switch_mux_channels")] - public static extern void switch_mux_channels(HandleRef jarg1, HandleRef jarg2, uint jarg3); + public static extern void switch_mux_channels(HandleRef jarg1, HandleRef jarg2, uint jarg3, uint jarg4); [DllImport("mod_managed", EntryPoint="CSharp_switch_unicast_conninfo_session_set")] public static extern void switch_unicast_conninfo_session_set(HandleRef jarg1, HandleRef jarg2); @@ -21231,18 +21279,18 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_p_unsigned_long__switch_status_t { +public class SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_int_p_unsigned_long__switch_status_t { private HandleRef swigCPtr; - internal SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_p_unsigned_long__switch_status_t(IntPtr cPtr, bool futureUse) { + internal SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_int_p_unsigned_long__switch_status_t(IntPtr cPtr, bool futureUse) { swigCPtr = new HandleRef(this, cPtr); } - protected SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_p_unsigned_long__switch_status_t() { + protected SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_int_p_unsigned_long__switch_status_t() { swigCPtr = new HandleRef(null, IntPtr.Zero); } - internal static HandleRef getCPtr(SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_p_unsigned_long__switch_status_t obj) { + internal static HandleRef getCPtr(SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_int_p_unsigned_long__switch_status_t obj) { return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; } } @@ -25764,6 +25812,16 @@ public class switch_audio_resampler_t : IDisposable { } } + public int channels { + set { + freeswitchPINVOKE.switch_audio_resampler_t_channels_set(swigCPtr, value); + } + get { + int ret = freeswitchPINVOKE.switch_audio_resampler_t_channels_get(swigCPtr); + return ret; + } + } + public switch_audio_resampler_t() : this(freeswitchPINVOKE.new_switch_audio_resampler_t(), true) { } @@ -27232,7 +27290,7 @@ public enum switch_channel_callstate_t { CCS_HELD, CCS_RING_WAIT, CCS_HANGUP, - CCS_UNHOLD + CCS_UNHELD } } @@ -28190,6 +28248,16 @@ public class switch_codec_fmtp : IDisposable { } } + public int stereo { + set { + freeswitchPINVOKE.switch_codec_fmtp_stereo_set(swigCPtr, value); + } + get { + int ret = freeswitchPINVOKE.switch_codec_fmtp_stereo_get(swigCPtr); + return ret; + } + } + public SWIGTYPE_p_void private_info { set { freeswitchPINVOKE.switch_codec_fmtp_private_info_set(swigCPtr, SWIGTYPE_p_void.getCPtr(value)); @@ -29352,11 +29420,13 @@ public enum switch_core_session_message_types_t { SWITCH_MESSAGE_INDICATE_BLIND_TRANSFER_RESPONSE, SWITCH_MESSAGE_INDICATE_STUN_ERROR, SWITCH_MESSAGE_INDICATE_MEDIA_RENEG, + SWITCH_MESSAGE_INDICATE_KEEPALIVE, SWITCH_MESSAGE_REFER_EVENT, SWITCH_MESSAGE_ANSWER_EVENT, SWITCH_MESSAGE_PROGRESS_EVENT, SWITCH_MESSAGE_RING_EVENT, SWITCH_MESSAGE_RESAMPLE_EVENT, + SWITCH_MESSAGE_HEARTBEAT_EVENT, SWITCH_MESSAGE_INVALID } @@ -30016,6 +30086,7 @@ public enum switch_device_state_t { SDS_ACTIVE, SDS_ACTIVE_MULTI, SDS_HELD, + SDS_UNHELD, SDS_HANGUP } @@ -30183,6 +30254,36 @@ public class switch_device_stats_t : IDisposable { } } + public uint unheld { + set { + freeswitchPINVOKE.switch_device_stats_t_unheld_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.switch_device_stats_t_unheld_get(swigCPtr); + return ret; + } + } + + public uint unheld_in { + set { + freeswitchPINVOKE.switch_device_stats_t_unheld_in_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.switch_device_stats_t_unheld_in_get(swigCPtr); + return ret; + } + } + + public uint unheld_out { + set { + freeswitchPINVOKE.switch_device_stats_t_unheld_out_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.switch_device_stats_t_unheld_out_get(swigCPtr); + return ret; + } + } + public uint hup { set { freeswitchPINVOKE.switch_device_stats_t_hup_set(swigCPtr, value); @@ -31815,6 +31916,16 @@ public class switch_file_handle : IDisposable { } } + public uint real_channels { + set { + freeswitchPINVOKE.switch_file_handle_real_channels_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.switch_file_handle_real_channels_get(swigCPtr); + return ret; + } + } + public uint format { set { freeswitchPINVOKE.switch_file_handle_format_set(swigCPtr, value); @@ -37364,6 +37475,7 @@ public enum switch_session_ctl_t { SCSC_DEBUG_LEVEL, SCSC_FLUSH_DB_HANDLES, SCSC_SHUTDOWN_NOW, + SCSC_REINCARNATE_NOW, SCSC_CALIBRATE_CLOCK, SCSC_SAVE_HISTORY, SCSC_CRASH, @@ -37623,6 +37735,26 @@ public class switch_speech_handle : IDisposable { } } + public uint channels { + set { + freeswitchPINVOKE.switch_speech_handle_channels_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.switch_speech_handle_channels_get(swigCPtr); + return ret; + } + } + + public uint real_channels { + set { + freeswitchPINVOKE.switch_speech_handle_real_channels_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.switch_speech_handle_real_channels_get(swigCPtr); + return ret; + } + } + public string voice { set { freeswitchPINVOKE.switch_speech_handle_voice_set(swigCPtr, value); @@ -37799,13 +37931,13 @@ public class switch_speech_interface : IDisposable { } } - public SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_p_unsigned_long__switch_status_t speech_open { + public SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_int_p_unsigned_long__switch_status_t speech_open { set { - freeswitchPINVOKE.switch_speech_interface_speech_open_set(swigCPtr, SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_p_unsigned_long__switch_status_t.getCPtr(value)); + freeswitchPINVOKE.switch_speech_interface_speech_open_set(swigCPtr, SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_int_p_unsigned_long__switch_status_t.getCPtr(value)); } get { IntPtr cPtr = freeswitchPINVOKE.switch_speech_interface_speech_open_get(swigCPtr); - SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_p_unsigned_long__switch_status_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_p_unsigned_long__switch_status_t(cPtr, false); + SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_int_p_unsigned_long__switch_status_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_int_p_unsigned_long__switch_status_t(cPtr, false); return ret; } }