Author: ctrix Date: Thu Jan 22 18:25:31 2009 New Revision: 11447 Log: More fixes for osx (not working yet) Modified: freeswitch/branches/ctrix/mod_airpe/Makefile freeswitch/branches/ctrix/mod_airpe/airpe_if_osx.c Modified: freeswitch/branches/ctrix/mod_airpe/Makefile ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/Makefile (original) +++ freeswitch/branches/ctrix/mod_airpe/Makefile Thu Jan 22 18:25:31 2009 @@ -3,10 +3,16 @@ MODNAME=mod_airpe LOCAL_CFLAGS= -#LOCAL_LDFLAGS=-lX11 LOCAL_OBJS=airpe_if_common.o airpe_api.o airpe_apps.o airpe_if_x11.o airpe_if_osx.o airpe_if_win32.o LOCAL_SOURCES=airpe_if_common.c airpe_api.c airpe_apps.c airpe_if_x11.c airpe_if_osx.c airpe_if_win32.c +#--------------------------------- LINUX +LOCAL_LDFLAGS=-lX11 + +#--------------------------------- OSX +#LOCAL_LDFLAGS=-framework Skype -framework CoreFoundation + + include ../../../../build/modmake.rules Modified: freeswitch/branches/ctrix/mod_airpe/airpe_if_osx.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/airpe_if_osx.c (original) +++ freeswitch/branches/ctrix/mod_airpe/airpe_if_osx.c Thu Jan 22 18:25:31 2009 @@ -1,7 +1,7 @@ #include "mod_airpe.h" -#if defined(DARWIN) +#if defined (MACOSX) || defined(DARWIN) #include "osx_framework/SkypeAPI-Carbon.h" @@ -63,25 +63,26 @@ THREADS *****************************************************************************/ void IncomingMessage(CFStringRef aNotificationString) { - char *string; ADEBUG("Incoming message"); - airpe_manage_skype_msg( airpe, string); +// char *string; +// airpe_manage_skype_msg( airpe, string); } void *SWITCH_THREAD_FUNC airpe_skype_thread(switch_thread_t * thread, void *obj) { airpe_interface_t *airpe = NULL; struct SkypeDelegate *del; + CFStringRef cfs; assert(obj); - airpe = obj; - del = &airpe->skype_window->delegate; + cfs = CFStringCreateWithCString(NULL, "airpe", 5); - del->clientApplicationName="airpe"; + del = &airpe->skype_window->delegate; + del->clientApplicationName=cfs; del->SkypeNotificationReceived=IncomingMessage; SetSkypeDelegate(del); ConnectToSkype(); @@ -93,6 +94,8 @@ DisconnectFromSkype(); RemoveSkypeDelegate(); + CFRelease(cfs); + return NULL; }