mostly trivial windows fixes for last several commits - anthm pthread_self in mod_dptools is not in scope for windows? commented out.

This commit is contained in:
Jeff Lenk
2012-11-01 21:59:18 -05:00
parent ccb3f7fd2b
commit 98bbb9affe
8 changed files with 57 additions and 21 deletions
@@ -5154,7 +5154,7 @@ void *SWITCH_THREAD_FUNC call_monitor_thread(switch_thread_t *thread, void *obj)
} while (busy);
printf("%ld ASS LAUNCH %s %d %d\n", (long)pthread_self(), argv[sent], sent, size);
/* printf("%ld ASS LAUNCH %s %d %d\n", (long)pthread_self(), argv[sent], sent, size); */
launch_call(argv[sent++], cm->path, cm->exten, cm->context, cm->dp, mutex, &counter, &var_event);
}
+6 -1
View File
@@ -31,7 +31,11 @@
*/
#include "switch.h"
#ifndef WIN32
#include "stfu.h"
#else
#include "../../../libs/stfu/stfu.h"
#endif
#include "SKP_Silk_SDK_API.h"
SWITCH_MODULE_LOAD_FUNCTION(mod_silk_load);
@@ -331,6 +335,7 @@ static switch_status_t switch_silk_decode(switch_codec_t *codec,
SKP_int16 reclen;
int32_t found_frame;
switch_bool_t did_lbrr = SWITCH_FALSE;
int i;
*decoded_data_len = 0;
@@ -339,7 +344,7 @@ static switch_status_t switch_silk_decode(switch_codec_t *codec,
jb = switch_core_session_get_jb(session, SWITCH_MEDIA_TYPE_AUDIO);
}
if (jb && codec && codec->cur_frame) {
for (int i = 1; i <= MAX_LBRR_DELAY; i++) {
for (i = 1; i <= MAX_LBRR_DELAY; i++) {
found_frame = stfu_n_copy_next_frame(jb, codec->cur_frame->timestamp, codec->cur_frame->seq, i, &next_frame);
if (found_frame) {
SKP_Silk_SDK_search_for_LBRR(next_frame.data, next_frame.dlen, i, (SKP_uint8*) &recbuff, &reclen);
@@ -8269,15 +8269,21 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_hupall(int jarg1) {
}
SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_hupall_matching_var(char * jarg1, char * jarg2, int jarg3) {
SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_hupall_matching_var_ans(char * jarg1, char * jarg2, int jarg3, int jarg4) {
unsigned long jresult ;
char *arg1 = (char *) 0 ;
char *arg2 = (char *) 0 ;
switch_call_cause_t arg3 ;
switch_hup_type_t arg4 ;
uint32_t result;
arg1 = (char *)jarg1;
arg2 = (char *)jarg2;
arg3 = (switch_call_cause_t)jarg3;
switch_core_session_hupall_matching_var((char const *)arg1,(char const *)arg2,arg3);
arg4 = (switch_hup_type_t)jarg4;
result = (uint32_t)switch_core_session_hupall_matching_var_ans((char const *)arg1,(char const *)arg2,arg3,arg4);
jresult = (unsigned long)result;
return jresult;
}
@@ -1606,8 +1606,9 @@ public class freeswitch {
freeswitchPINVOKE.switch_core_session_hupall((int)cause);
}
public static void switch_core_session_hupall_matching_var(string var_name, string var_val, switch_call_cause_t cause) {
freeswitchPINVOKE.switch_core_session_hupall_matching_var(var_name, var_val, (int)cause);
public static uint switch_core_session_hupall_matching_var_ans(string var_name, string var_val, switch_call_cause_t cause, switch_hup_type_t type) {
uint ret = freeswitchPINVOKE.switch_core_session_hupall_matching_var_ans(var_name, var_val, (int)cause, (int)type);
return ret;
}
public static switch_console_callback_match switch_core_session_findall_matching_var(string var_name, string var_val) {
@@ -8694,8 +8695,8 @@ class freeswitchPINVOKE {
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_hupall")]
public static extern void switch_core_session_hupall(int jarg1);
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_hupall_matching_var")]
public static extern void switch_core_session_hupall_matching_var(string jarg1, string jarg2, int jarg3);
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_hupall_matching_var_ans")]
public static extern uint switch_core_session_hupall_matching_var_ans(string jarg1, string jarg2, int jarg3, int jarg4);
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_findall_matching_var")]
public static extern IntPtr switch_core_session_findall_matching_var(string jarg1, string jarg2);
@@ -28851,6 +28852,23 @@ public class switch_hold_record_t : IDisposable {
namespace FreeSWITCH.Native {
public enum switch_hup_type_t {
SHT_NONE = 0,
SHT_UNANSWERED = (1 << 0),
SHT_ANSWERED = (1 << 1)
}
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.1
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
namespace FreeSWITCH.Native {
using System;
using System.Runtime.InteropServices;