Author: gmaruzz Date: Sat Dec 13 11:46:57 2008 New Revision: 10753 Log: skypiax: cleaning, restructuring Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Sat Dec 13 11:46:57 2008 @@ -2,7 +2,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown); -//SWITCH_MODULE_RUNTIME_FUNCTION(mod_skypiax_runtime); SWITCH_MODULE_DEFINITION(mod_skypiax, mod_skypiax_load, mod_skypiax_shutdown, NULL); //mod_skypiax_runtime); static struct { @@ -31,10 +30,6 @@ switch_endpoint_interface_t *skypiax_endpoint_interface; switch_memory_pool_t *skypiax_module_pool = NULL; int running = 1; -switch_core_session_t *global_session = NULL; -#ifdef WIN32 -HWND win32_hInit_MainWindowHandle; -#endif /* WIN32 */ /*************************************************/ /*************************************************/ /*************************************************/ @@ -905,7 +900,7 @@ if(globals.SKYPIAX_INTERFACES[interface_id].skypiax_do_skype_thread_thread){ #ifdef WIN32 - if (SendMessage(win32_hInit_MainWindowHandle, WM_DESTROY, 0, 0) == FALSE) { // let's the do_skype_thread die + if (SendMessage(p->AsteriskHandlesAst.win32_hInit_MainWindowHandle, WM_DESTROY, 0, 0) == FALSE) { // let's the do_skype_thread die ERRORA("WHY FALSE HERE? %d\n", SKYPIAX_P_LOG, GetLastError()); } #else Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Sat Dec 13 11:46:57 2008 @@ -2,16 +2,21 @@ extern switch_memory_pool_t *skypiax_module_pool; extern int option_debug; -extern switch_core_session_t *global_session; extern switch_endpoint_interface_t *skypiax_endpoint_interface; extern int running; -#ifdef WIN32 -extern HWND win32_hInit_MainWindowHandle; -#endif /* WIN32 */ + + + /**********************************************************/ /**********************************************************/ /**********************************************************/ + + +switch_core_session_t *global_session = NULL; + + #ifdef WIN32 +HWND win32_hInit_MainWindowHandle; struct AsteriskHandles *win32_AsteriskHandlesSkype; HINSTANCE win32_hInit_ProcessHandle; char win32_acInit_WindowClassName[128]; @@ -26,13 +31,13 @@ static XErrorHandler old_handler = 0; static int xerror = 0; #endif /* WIN32 */ + + + /**********************************************************/ /**********************************************************/ /**********************************************************/ #define SAMPLES_PER_FRAME 160 -#define SAMPLES_PER_FRAME 160 -#define SAMPLES_PER_FRAME 160 - static void *SWITCH_THREAD_FUNC skypiax_do_tcp_srv_thread(switch_thread_t * thread, void *obj)