提交 9a934b2c authored 作者: Michael Jerris's avatar Michael Jerris

a little more cleanup

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9828 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 ed5dddb6
...@@ -63,11 +63,10 @@ SWITCH_STANDARD_APP(managed_app_function); /* Run */ ...@@ -63,11 +63,10 @@ SWITCH_STANDARD_APP(managed_app_function); /* Run */
mod_managed_globals globals = { 0 }; mod_managed_globals globals = { 0 };
#ifndef _MANAGED
// Sets up delegates (and anything else needed) on the ManagedSession object // Sets up delegates (and anything else needed) on the ManagedSession object
// Called via internalcall // Called from ManagedSession.Initialize Managed -> this is Unmanaged code so all pointers are marshalled and prevented from GC
SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession * session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) // Exported method.
SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession *session, inputFunction dtmfDelegate, hangupFunction hangupDelegate)
{ {
switch_assert(session); switch_assert(session);
if (!session) { if (!session) {
...@@ -79,6 +78,8 @@ SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession * session, inputFunct ...@@ -79,6 +78,8 @@ SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession * session, inputFunct
session->hangupDelegate = hangupDelegate; session->hangupDelegate = hangupDelegate;
} }
#ifndef _MANAGED
#ifdef WIN32 #ifdef WIN32
#include <shlobj.h> #include <shlobj.h>
#endif #endif
...@@ -262,20 +263,6 @@ switch_status_t findLoader() ...@@ -262,20 +263,6 @@ switch_status_t findLoader()
**********************************************************/ **********************************************************/
#ifdef _MANAGED #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() switch_status_t loadRuntime()
{ {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论