a little more cleanup
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9821 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
ca4be1dab8
commit
01a029de99
|
@ -26,30 +26,29 @@
|
||||||
* Michael Giagnocavo <mgg@packetrino.com>
|
* Michael Giagnocavo <mgg@packetrino.com>
|
||||||
* Jeff Lenk <jlenk@frontiernet.net> - Modified class to support Dotnet
|
* Jeff Lenk <jlenk@frontiernet.net> - Modified class to support Dotnet
|
||||||
*
|
*
|
||||||
* freeswitch_cli.cpp -- CLI CoreSession subclasses
|
* freeswitch_managed.cpp -- Managed CoreSession subclasses
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
#include <switch_cpp.h>
|
#include <switch_cpp.h>
|
||||||
#ifndef _MANAGED
|
|
||||||
#include <glib.h>
|
|
||||||
#include <mono/jit/jit.h>
|
|
||||||
#include <mono/metadata/assembly.h>
|
|
||||||
#include <mono/metadata/environment.h>
|
|
||||||
#include <mono/metadata/threads.h>
|
|
||||||
#include <mono/metadata/metadata.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "freeswitch_managed.h"
|
|
||||||
|
|
||||||
#ifdef _MANAGED
|
#ifdef _MANAGED
|
||||||
#define ATTACH_THREADS
|
#define ATTACH_THREADS
|
||||||
#else
|
#else
|
||||||
|
#include <glib.h>
|
||||||
|
#include <mono/metadata/threads.h>
|
||||||
#define ATTACH_THREADS mono_thread_attach(globals.domain);
|
#define ATTACH_THREADS mono_thread_attach(globals.domain);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
|
#define RESULT_FREE(x) CoTaskMemFree(x)
|
||||||
|
#else
|
||||||
|
#define RESULT_FREE(x) g_free(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "freeswitch_managed.h"
|
||||||
|
|
||||||
ManagedSession::ManagedSession():CoreSession()
|
ManagedSession::ManagedSession():CoreSession()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -75,7 +74,6 @@ bool ManagedSession::end_allow_threads()
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ManagedSession::~ManagedSession()
|
ManagedSession::~ManagedSession()
|
||||||
{
|
{
|
||||||
ATTACH_THREADS
|
ATTACH_THREADS
|
||||||
|
@ -112,11 +110,8 @@ switch_status_t ManagedSession::run_dtmf_callback(void *input, switch_input_type
|
||||||
char *result = dtmfDelegate(input, itype);
|
char *result = dtmfDelegate(input, itype);
|
||||||
switch_status_t status = process_callback_result(result);
|
switch_status_t status = process_callback_result(result);
|
||||||
|
|
||||||
#if WIN32
|
RESULT_FREE(result);
|
||||||
CoTaskMemFree(result);
|
|
||||||
#else
|
|
||||||
g_free(result)
|
|
||||||
#endif
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue