From 9a934b2c87914ba669105ee822ef61a990b6a0a6 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sat, 4 Oct 2008 07:05:49 +0000 Subject: [PATCH] a little more cleanup git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9828 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/languages/mod_managed/mod_managed.cpp | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/mod/languages/mod_managed/mod_managed.cpp b/src/mod/languages/mod_managed/mod_managed.cpp index 98e39e4951..1882c196ce 100644 --- a/src/mod/languages/mod_managed/mod_managed.cpp +++ b/src/mod/languages/mod_managed/mod_managed.cpp @@ -63,11 +63,10 @@ SWITCH_STANDARD_APP(managed_app_function); /* Run */ mod_managed_globals globals = { 0 }; -#ifndef _MANAGED - // Sets up delegates (and anything else needed) on the ManagedSession object -// Called via internalcall -SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession * session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) +// Called from ManagedSession.Initialize Managed -> this is Unmanaged code so all pointers are marshalled and prevented from GC +// Exported method. +SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession *session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) { switch_assert(session); if (!session) { @@ -79,6 +78,8 @@ SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession * session, inputFunct session->hangupDelegate = hangupDelegate; } +#ifndef _MANAGED + #ifdef WIN32 #include #endif @@ -262,20 +263,6 @@ switch_status_t findLoader() **********************************************************/ #ifdef _MANAGED -// Sets up delegates (and anything else needed) on the ManagedSession object -// Called from ManagedSession.Initialize Managed -> this is Unmanaged code so all pointers are marshalled and prevented from GC -// Exported method. -SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession *session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) -{ - switch_assert(session); - if (!session) { - return; - } - session->setDTMFCallback(NULL, ""); - session->setHangupHook(NULL); - session->dtmfDelegate = dtmfDelegate; - session->hangupDelegate = hangupDelegate; -} switch_status_t loadRuntime() {