Author: gmaruzz Date: Sun Jan 11 08:30:59 2009 New Revision: 11124 Log: skypiax: compile and works on windows Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 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 Sun Jan 11 08:30:59 2009 @@ -563,7 +563,7 @@ { LRESULT lReturnCode; int fIssueDefProc; - //private_t *p = NULL; + private_t *tech_pvt = NULL; lReturnCode = 0; fIssueDefProc = 0; @@ -571,7 +571,7 @@ switch (uiMessage) { case WM_CREATE: tech_pvt = (private_t *) ((LPCREATESTRUCT) ulParam)->lpCreateParams; - SetWindowLong(hWindow, GWL_USERDATA, (LONG) p); + SetWindowLong(hWindow, GWL_USERDATA, (LONG) tech_pvt); DEBUGA_SKYPE("got CREATE\n", SKYPIAX_P_LOG); break; case WM_DESTROY: @@ -597,13 +597,13 @@ } break; default: - if (p && tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach) { + if (tech_pvt && tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach) { if (uiMessage == tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach) { switch (ulParam) { case SKYPECONTROLAPI_ATTACH_SUCCESS: if (!tech_pvt->SkypiaxHandles.api_connected) { - NOTICA("\n\n\tConnected to Skype API!\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("\n\n\tConnected to Skype API!\n", SKYPIAX_P_LOG); tech_pvt->SkypiaxHandles.win32_hGlobal_SkypeAPIWindowHandle = (HWND) uiParam; tech_pvt->SkypiaxHandles.win32_hGlobal_SkypeAPIWindowHandle = tech_pvt->SkypiaxHandles.win32_hGlobal_SkypeAPIWindowHandle; @@ -712,7 +712,7 @@ tech_pvt->SkypiaxHandles.win32_acInit_WindowClassName, "", WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, 128, 128, NULL, 0, tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle, - p); + tech_pvt); return (tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle != NULL ? 1 : 0); } @@ -749,8 +749,8 @@ if (tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach != 0 && tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover != 0) { - if (win32_Initialize_CreateWindowClass(p)) { - if (win32_Initialize_CreateMainWindow(p)) { + if (win32_Initialize_CreateWindowClass(tech_pvt)) { + if (win32_Initialize_CreateMainWindow(tech_pvt)) { if (SendMessage (HWND_BROADCAST, tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover, @@ -767,9 +767,9 @@ } } } - win32_DeInitialize_DestroyMainWindow(p); + win32_DeInitialize_DestroyMainWindow(tech_pvt); } - win32_DeInitialize_DestroyWindowClass(p); + win32_DeInitialize_DestroyWindowClass(tech_pvt); } } @@ -1020,8 +1020,6 @@ ERRORA ("Sending message failed - probably Skype crashed.\n\nPlease shutdown Skypiax (Asterisk), then restart Skype from the menu, then launch Skypiax and try again.\n", SKYPIAX_P_LOG); - tech_pvt->skype = 0; - tech_pvt->skype_thread = NULL; if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); }