[Freeswitch-branches] [commit] r11096 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax

[FreeSWITCH SVN]

Author: gmaruzz
Date: Thu Jan  8 10:18:56 2009
New Revision: 11096

Log:
skypiax: for win32, no more LaunchSkype, use startskype.bat for this. Wait for each interface to have its own API connection active

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	Thu Jan  8 10:18:56 2009
@@ -967,6 +967,9 @@
 
         skypiax_skypeaudio_init(&globals.SKYPIAX_INTERFACES[interface_id]);
 
+
+        while(globals.SKYPIAX_INTERFACES[interface_id].AsteriskHandlesAst.api_connected == 0)
+            switch_sleep(1000);
         NOTICA(
                           "STARTED interface_id=%d\n", SKYPIAX_P_LOG, interface_id);
 

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	Thu Jan  8 10:18:56 2009
@@ -588,6 +588,7 @@
 }
 
 #ifdef WIN32
+#if 0
 int LaunchSkype(struct skypiax_interface *p)
 {
   LPTSTR pszMessage;
@@ -613,6 +614,7 @@
   return 1;
 
 }
+#endif
 
 enum {
   SKYPECONTROLAPI_ATTACH_SUCCESS = 0,   /*  Client is successfully 
@@ -708,9 +710,7 @@
           }
           break;
         case SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION:
-          WARNINGA
-            ("\n\n\tIf I do not (almost) immediately connect to Skype API,\n\tplease give the Skype client authorization to be connected \n\tby Asterisk and to not ask you again.\n\n",
-             SKYPIAX_P_LOG);
+          //WARNINGA ("\n\n\tIf I do not (almost) immediately connect to Skype API,\n\tplease give the Skype client authorization to be connected \n\tby Asterisk and to not ask you again.\n\n", SKYPIAX_P_LOG);
           switch_sleep(5000);
           if (!p->AsteriskHandlesAst.api_connected) {
             SendMessage(HWND_BROADCAST,
@@ -843,7 +843,7 @@
   p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIDiscover =
     RegisterWindowMessage("SkypeControlAPIDiscover");
 
-  LaunchSkype(p);
+  //LaunchSkype(p);
   switch_sleep(2000000);
 
   if (p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIAttach != 0