Author: gmaruzz Date: Fri Nov 7 03:01:55 2008 New Revision: 10282 Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Log: skypiax: beginning exchange API msgs with Skype client 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 Fri Nov 7 03:01:55 2008 @@ -2920,7 +2920,7 @@ AsteriskHandlesAst->disp = disp; AsteriskHandlesAst->win = win; - snprintf(buf, SKYPE_X11_BUF_SIZE, "NAME FS_skypiax"); + snprintf(buf, SKYPE_X11_BUF_SIZE, "NAME skypiax"); if (!skypiax_skype_send_message(AsteriskHandlesAst, buf)) { ERRORA @@ -2944,17 +2944,17 @@ } /* perform an events loop */ - //FIXME XEvent an_event; - //FIXME char buf[21]; /* can't be longer */ + XEvent an_event; + char buf[21]; /* can't be longer */ char buffer[17000]; char *b; - //FIXME int i; + int i; b = buffer; -#ifdef LOOPI +#ifndef LOOPI while (1) { - pthread_testcancel(); + //pthread_testcancel(); XNextEvent(disp, &an_event); switch (an_event.type) { case ClientMessage: @@ -2999,7 +2999,7 @@ //p->skype = 0; //p->skype_thread = AST_PTHREADT_NULL; //pthread_cleanup_pop(1); - DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + //DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); #endif /* NOTDEF */ return NULL; @@ -3186,17 +3186,17 @@ module_pool = pool; #ifndef _WINDOWS_ //FIXME - if (!XInitThreads()) - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Not initialized XInitThreads!\n"); - else - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Initialized XInitThreads!\n"); + if (!XInitThreads()) { + ERRORA("Not initialized XInitThreads!\n", SKYPIAX_P_LOG); + } else { + DEBUGA_SKYPE("Initialized XInitThreads!\n", SKYPIAX_P_LOG); + } #endif /* _WINDOWS_ */ load_config(); - DEBUGA_PBX("CIAPALO FUNC\n", SKYPIAX_P_LOG); *module_interface = switch_loadable_module_create_module_interface(pool, modname); skypiax_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);