September 2006 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r2727 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: docelmo Date: Sun Sep 17 18:06:47 2006 New Revision: 2727 Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile Log: Enable threads on Python Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile Sun Sep 17 18:06:47 2006 @@ -6,7 +6,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PYMOD).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads --enable-shared + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads %.o: %.c $(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@

1 0

[commit] r2726 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: docelmo Date: Sun Sep 17 18:03:24 2006 New Revision: 2726 Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile Log: Enable threads on Python Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile Sun Sep 17 18:03:24 2006 @@ -6,7 +6,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PYMOD).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads --enable-shared %.o: %.c $(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@

1 0

[commit] r2725 - in freeswitch/trunk/src/mod: endpoints/mod_sofia timers/mod_softtimer
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: anthm Date: Sun Sep 17 17:57:20 2006 New Revision: 2725 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Log: experimental tweaks Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sun Sep 17 17:57:20 2006 @@ -812,9 +812,9 @@ size_t bytes = 0, samples = 0, frames = 0, ms = 0; switch_channel_t *channel = NULL; int payload = 0; - switch_time_t now, started = switch_time_now(), last_act = switch_time_now(); - unsigned int elapsed; - uint32_t hard_timeout = 60000 * 3; + //switch_time_t now, started = switch_time_now(), last_act = switch_time_now(); + //unsigned int elapsed; + //uint32_t hard_timeout = 60000 * 3; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -835,10 +835,12 @@ ms = tech_pvt->read_codec.implementation->microseconds_per_frame; if (tech_pvt->last_read) { +#if 0 elapsed = (unsigned int)((switch_time_now() - tech_pvt->last_read) / 1000); if (elapsed > 60000) { return SWITCH_STATUS_TIMEOUT; } +#endif } if (switch_test_flag(tech_pvt, TFLAG_IO)) { @@ -853,7 +855,7 @@ while (!switch_test_flag(tech_pvt, TFLAG_BYE) && switch_test_flag(tech_pvt, TFLAG_IO) && tech_pvt->read_frame.datalen == 0) { - now = switch_time_now(); + //now = switch_time_now(); tech_pvt->read_frame.flags = SFF_NONE; status = switch_rtp_zerocopy_read_frame(tech_pvt->rtp_session, &tech_pvt->read_frame); @@ -865,7 +867,7 @@ payload = tech_pvt->read_frame.payload; - +#if 0 elapsed = (unsigned int)((switch_time_now() - started) / 1000); if (timeout > -1) { @@ -878,7 +880,7 @@ if (elapsed >= hard_timeout) { return SWITCH_STATUS_BREAK; } - +#endif if (switch_rtp_has_dtmf(tech_pvt->rtp_session)) { char dtmf[128]; switch_rtp_dequeue_dtmf(tech_pvt->rtp_session, dtmf, sizeof(dtmf)); Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Sun Sep 17 17:57:20 2006 @@ -197,7 +197,8 @@ while (switch_time_now() < reference) { //switch_yield((reference - now) - 1000); - switch_yield(globals.timer_microseconds >> 1); + //switch_yield(globals.timer_microseconds >> 1); + switch_yield(1000); } current_ms += globals.timer_milliseconds;

1 0

[commit] r2724 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: brian Date: Sun Sep 17 17:28:31 2006 New Revision: 2724 Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Log: Ok small nitpicks for OS X.... Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile Sun Sep 17 17:28:31 2006 @@ -1,13 +1,13 @@ -LCFLAGS=-fPIC -DZTS -DPTHREADS -Xlinker -export-dynamic +LCFLAGS=-fPIC -DZTS -DPTHREADS -Xlinker CFLAGS += -fPIC -I$(PREFIX)/include/python2.4/ PYMOD=freeswitch -LDFLAGS=-lpython2.4 -Xlinker -export-dynamic -L$(PREFIX)/lib/python2.4/config/ +LDFLAGS=-lpython2.4 -Xlinker -L$(PREFIX)/lib/python2.4/config/ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PYMOD).$(DYNAMIC_LIB_EXTEN) depends: MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) - + %.o: %.c $(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@ @@ -39,4 +39,4 @@ install: #cp -f py_$(PYMOD).$(DYNAMIC_LIB_EXTEN) $(MDIR) cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod - + Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Sun Sep 17 17:28:31 2006 @@ -29,6 +29,8 @@ * */ +#include <Python.h> + #ifndef _REENTRANT #define _REENTRANT #endif @@ -36,8 +38,6 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif - -#include <Python.h> #include <switch.h>

1 0

[commit] r2723 - in freeswitch/trunk/src/mod/languages: mod_python mod_ruby
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: docelmo Date: Sun Sep 17 17:15:08 2006 New Revision: 2723 Modified: freeswitch/trunk/src/mod/languages/mod_python/switch_swig.c freeswitch/trunk/src/mod/languages/mod_ruby/switch_swig.c Log: Update to swig files Modified: freeswitch/trunk/src/mod/languages/mod_python/switch_swig.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/switch_swig.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/switch_swig.c Sun Sep 17 17:15:08 2006 @@ -257,6 +257,7 @@ switch_core_session_t *peer_session; unsigned int timelimit = 60; char *var; + switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; caller_channel = switch_core_session_get_channel(session); assert(caller_channel != NULL); @@ -265,7 +266,7 @@ timelimit = atoi(var); } - if (switch_ivr_originate(session, &peer_session, bridgeto, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_ivr_originate(session, &peer_session, &cause, bridgeto, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n"); switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL); return; Modified: freeswitch/trunk/src/mod/languages/mod_ruby/switch_swig.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_ruby/switch_swig.c (original) +++ freeswitch/trunk/src/mod/languages/mod_ruby/switch_swig.c Sun Sep 17 17:15:08 2006 @@ -257,6 +257,7 @@ switch_core_session_t *peer_session; unsigned int timelimit = 60; char *var; + switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; caller_channel = switch_core_session_get_channel(session); assert(caller_channel != NULL); @@ -265,7 +266,7 @@ timelimit = atoi(var); } - if (switch_ivr_originate(session, &peer_session, bridgeto, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_ivr_originate(session, &peer_session, &cause, bridgeto, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n"); switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL); return;

1 0

[commit] r2722 - in freeswitch/trunk: . src/include
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: anthm Date: Sun Sep 17 14:44:53 2006 New Revision: 2722 Modified: freeswitch/trunk/configure freeswitch/trunk/configure.in freeswitch/trunk/src/include/switch_am_config.h.in freeswitch/trunk/src/include/switch_utils.h Log: use usleep when possible, ./configure && make sure when you update Modified: freeswitch/trunk/configure ============================================================================== --- freeswitch/trunk/configure (original) +++ freeswitch/trunk/configure Sun Sep 17 14:44:53 2006 @@ -20843,7 +20843,8 @@ -for ac_func in gethostname vasprintf mmap mlock mlockall + +for ac_func in gethostname vasprintf mmap mlock mlockall usleep do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Sun Sep 17 14:44:53 2006 @@ -34,7 +34,7 @@ AC_FUNC_MALLOC AC_TYPE_SIGNAL AC_FUNC_STRFTIME -AC_CHECK_FUNCS([gethostname vasprintf mmap mlock mlockall]) +AC_CHECK_FUNCS([gethostname vasprintf mmap mlock mlockall usleep]) AC_C_BIGENDIAN(AC_DEFINE([__BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([__BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian])) AC_DEFINE([__LITTLE_ENDIAN],1234,[for the places where it is not defined]) Modified: freeswitch/trunk/src/include/switch_am_config.h.in ============================================================================== --- freeswitch/trunk/src/include/switch_am_config.h.in (original) +++ freeswitch/trunk/src/include/switch_am_config.h.in Sun Sep 17 14:44:53 2006 @@ -64,6 +64,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the `usleep' function. */ +#undef HAVE_USLEEP + /* Define to 1 if you have the `vasprintf' function. */ #undef HAVE_VASPRINTF Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Sun Sep 17 14:44:53 2006 @@ -166,7 +166,11 @@ /*! \brief Wait a desired number of microseconds and yield the CPU */ +#ifdef HAVE_USLEEP +#define switch_yield(ms) usleep(ms); +#else #define switch_yield(ms) apr_sleep(ms * 10); //apr_thread_yield(); +#endif /*! \brief Declares a function designed to set a dymaic global string

1 0

[commit] r2721 - in freeswitch/trunk/src: . mod/languages/mod_php
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: anthm Date: Sun Sep 17 14:03:32 2006 New Revision: 2721 Modified: freeswitch/trunk/src/mod/languages/mod_php/Makefile freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_rtp.c Log: trying paul's patch Modified: freeswitch/trunk/src/mod/languages/mod_php/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_php/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_php/Makefile Sun Sep 17 14:03:32 2006 @@ -6,7 +6,7 @@ CFLAGS += `$(PCFG) --includes` -g3 -fno-strict-aliasing MDIR += `$(PCFG) --extension-dir` PHPMOD=freeswitch -PHPLDFLAGS = `$(PCFG) --ldflags` -lcrypt -lresolv -lm -ldl -lnsl -lxml2 -lz -lphp5 +PHPLDFLAGS = `$(PCFG) --ldflags` -lm -ldl -lxml2 -lz -lphp5 MOD_CFLAGS += -fPIC all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PHPMOD).$(DYNAMIC_LIB_EXTEN) Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sun Sep 17 14:03:32 2006 @@ -141,6 +141,11 @@ /* The main runtime obj we keep this hidden for ourselves */ static struct switch_core_runtime runtime; +/* Mutex and conditional for sql lite */ +static switch_mutex_t *SWITCH_SQL_MUTEX; +static switch_thread_cond_t *SWITCH_SQL_CONDITIONAL; + + static void db_pick_path(char *dbname, char *buf, switch_size_t size) { @@ -3208,20 +3213,23 @@ uint8_t trans = 0; switch_time_t last_commit = switch_time_now(); uint32_t freq = 1000, target = 1000, diff = 0; + + //if these are null we have big problems + assert(SWITCH_SQL_MUTEX != NULL); + assert(SWITCH_SQL_CONDITIONAL != NULL); if (!runtime.event_db) { runtime.event_db = switch_core_db_handle(); } switch_queue_create(&runtime.sql_queue, SWITCH_SQL_QUEUE_LEN, runtime.memory_pool); + + switch_mutex_lock(SWITCH_SQL_MUTEX); for(;;) { - uint32_t work = 0; - if (switch_queue_trypop(runtime.sql_queue, &pop) == SWITCH_STATUS_SUCCESS) { char *sql = (char *) pop; if (sql) { - work++; if (itterations == 0) { char *isql = "begin transaction CORE1;"; if (switch_core_db_persistant_execute(runtime.event_db, isql, 25) != SWITCH_STATUS_SUCCESS) { @@ -3241,6 +3249,15 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "SQL thread ending\n"); break; } + } else { + //Are we currently in a transaction, wait accordingly + if(trans) { + //we need to finish a transaction in a bit, wait around until we have more work or that time comes + switch_thread_cond_timedwait(SWITCH_SQL_CONDITIONAL, SWITCH_SQL_MUTEX, (freq * 1000) + last_commit - switch_time_now()); + } else { + //wait until we have more work + switch_thread_cond_wait(SWITCH_SQL_CONDITIONAL, SWITCH_SQL_MUTEX); + } } if (diff < freq) { @@ -3249,7 +3266,6 @@ if (trans && (itterations == target || diff >= freq)) { char *sql = "end transaction CORE1"; - work++; if (switch_core_db_persistant_execute(runtime.event_db, sql, 25) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SQL exec error! [%s]\n", sql); } @@ -3258,9 +3274,7 @@ trans = 0; diff = 0; } - if (!work) { - switch_yield(1000); - } + } return NULL; } @@ -3273,6 +3287,10 @@ assert(runtime.memory_pool != NULL); + //create the mutex and conditional + switch_mutex_init(&SWITCH_SQL_MUTEX, SWITCH_MUTEX_NESTED, runtime.memory_pool); + switch_thread_cond_create(&SWITCH_SQL_CONDITIONAL, runtime.memory_pool); + switch_threadattr_create(&thd_attr, runtime.memory_pool); switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); @@ -3380,6 +3398,16 @@ if (sql) { switch_queue_push(runtime.sql_queue, sql); + + //See if we need to wake up the sql thread + if(switch_mutex_trylock(SWITCH_SQL_MUTEX) == SWITCH_STATUS_SUCCESS) { + //wake up the SQL thread + switch_thread_cond_signal(SWITCH_SQL_CONDITIONAL); + + //give up our lock + switch_mutex_unlock(SWITCH_SQL_MUTEX); + } + sql = NULL; } } @@ -3686,6 +3714,15 @@ switch_event_shutdown(); switch_queue_push(runtime.sql_queue, NULL); + //See if we need to wake up the sql thread + if(switch_mutex_trylock(SWITCH_SQL_MUTEX) == SWITCH_STATUS_SUCCESS) { + //wake up the SQL thread + switch_thread_cond_signal(SWITCH_SQL_CONDITIONAL); + + //give up our lock + switch_mutex_unlock(SWITCH_SQL_MUTEX); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Waiting for unfinished SQL transactions\n"); while (switch_queue_size(runtime.sql_queue) > 0) { switch_yield(10000); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Sun Sep 17 14:03:32 2006 @@ -35,6 +35,9 @@ static switch_event_node_t *EVENT_NODES[SWITCH_EVENT_ALL + 1] = { NULL }; static switch_mutex_t *BLOCK = NULL; static switch_mutex_t *POOL_LOCK = NULL; +static switch_mutex_t *EVENT_QUEUE_MUTEX = NULL; +static switch_mutex_t *EVENT_QUEUE_HAVEMORE_MUTEX = NULL; +static switch_thread_cond_t *EVENT_QUEUE_CONDITIONAL = NULL; static switch_memory_pool_t *RUNTIME_POOL = NULL; //static switch_memory_pool_t *APOOL = NULL; //static switch_memory_pool_t *BPOOL = NULL; @@ -44,6 +47,7 @@ static switch_hash_t *CUSTOM_HASH = NULL; static int THREAD_RUNNING = 0; +static int EVENT_QUEUE_HAVEMORE = 0; #if 0 static void *locked_alloc(switch_size_t len) @@ -174,25 +178,56 @@ assert(obj == NULL); assert(POOL_LOCK != NULL); assert(RUNTIME_POOL != NULL); + assert(EVENT_QUEUE_MUTEX != NULL); + assert(EVENT_QUEUE_HAVEMORE_MUTEX != NULL); + assert(EVENT_QUEUE_CONDITIONAL != NULL); THREAD_RUNNING = 1; queues[0] = EVENT_QUEUE[SWITCH_PRIORITY_HIGH]; queues[1] = EVENT_QUEUE[SWITCH_PRIORITY_NORMAL]; queues[2] = EVENT_QUEUE[SWITCH_PRIORITY_LOW]; + + switch_mutex_lock(EVENT_QUEUE_MUTEX); for(;;) { int any; + len[1] = switch_queue_size(EVENT_QUEUE[SWITCH_PRIORITY_NORMAL]); len[2] = switch_queue_size(EVENT_QUEUE[SWITCH_PRIORITY_LOW]); len[0] = switch_queue_size(EVENT_QUEUE[SWITCH_PRIORITY_HIGH]); any = len[1] + len[2] + len[0]; + if (!any) { - if (THREAD_RUNNING != 1) { - break; + //lock on havemore so we are the only ones poking at it while we check it + //see if we saw anything in the queues or have a check again flag + switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX); + if(!EVENT_QUEUE_HAVEMORE) { + //See if we need to quit + if (THREAD_RUNNING != 1) { + //give up our lock + switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); + + //Game over + break; + } + + //give up our lock + switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); + + //wait until someone tells us we have something to do + switch_thread_cond_wait(EVENT_QUEUE_CONDITIONAL, EVENT_QUEUE_MUTEX); + } else { + //Caught a race, one of the queues was updated after we looked at it + //reset our flag + EVENT_QUEUE_HAVEMORE = 0; + + //Give up our lock + switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); } - switch_yield(1000); + + //go grab some events continue; } @@ -304,6 +339,27 @@ if (THREAD_RUNNING > 0) { THREAD_RUNNING = -1; + //Lock on havemore to make sure he event thread, if currently running + // doesn't check the HAVEMORE flag before we set it + switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX); + //See if the event thread is sitting + if(switch_mutex_trylock(EVENT_QUEUE_MUTEX) == SWITCH_STATUS_SUCCESS) { + //we don't need havemore anymore, the thread was sitting already + switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); + + //wake up the event thread + switch_thread_cond_signal(EVENT_QUEUE_CONDITIONAL); + + //give up our lock + switch_mutex_unlock(EVENT_QUEUE_MUTEX); + } else { // it wasn't waiting which means we might have updated a queue it already looked at + //set a flag so it knows to read the queues again + EVENT_QUEUE_HAVEMORE = 1; + + //variable updated, give up the mutex + switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); + } + while (x < 100 && THREAD_RUNNING) { switch_yield(1000); if (THREAD_RUNNING == last) { @@ -344,6 +400,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activate Eventing Engine.\n"); switch_mutex_init(&BLOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL); switch_mutex_init(&POOL_LOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL); + switch_mutex_init(&EVENT_QUEUE_MUTEX, SWITCH_MUTEX_NESTED, RUNTIME_POOL); + switch_mutex_init(&EVENT_QUEUE_HAVEMORE_MUTEX, SWITCH_MUTEX_NESTED, RUNTIME_POOL); + switch_thread_cond_create(&EVENT_QUEUE_CONDITIONAL, RUNTIME_POOL); switch_core_hash_init(&CUSTOM_HASH, RUNTIME_POOL); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_thread_create(&thread, thd_attr, switch_event_thread, NULL, RUNTIME_POOL); @@ -662,6 +721,10 @@ assert(BLOCK != NULL); assert(RUNTIME_POOL != NULL); + assert(EVENT_QUEUE_HAVEMORE_MUTEX != NULL); + assert(EVENT_QUEUE_MUTEX != NULL); + assert(EVENT_QUEUE_CONDITIONAL != NULL); + assert(RUNTIME_POOL != NULL); if (THREAD_RUNNING <= 0) { /* sorry we're closed */ @@ -690,6 +753,29 @@ } switch_queue_push(EVENT_QUEUE[(*event)->priority], *event); + + //Lock on havemore to make sure he event thread, if currently running + // doesn't check the HAVEMORE flag before we set it + switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX); + //See if the event thread is sitting + if(switch_mutex_trylock(EVENT_QUEUE_MUTEX) == SWITCH_STATUS_SUCCESS) { + //we don't need havemore anymore, the thread was sitting already + switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); + + //wake up the event thread + switch_thread_cond_signal(EVENT_QUEUE_CONDITIONAL); + + //give up our lock + switch_mutex_unlock(EVENT_QUEUE_MUTEX); + } else { // it wasn't waiting which means we might have updated a queue it already looked at + //set a flag so it knows to read the queues again + EVENT_QUEUE_HAVEMORE = 1; + + //variable updated, give up the mutex + switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); + } + + *event = NULL; return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sun Sep 17 14:03:32 2006 @@ -483,12 +483,14 @@ timer_name = "soft"; } - if (switch_core_timer_init(&rtp_session->timer, timer_name, ms_per_packet / 1000, packet_size, rtp_session->pool) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting timer [%s] %d bytes per %dms\n", timer_name, packet_size, ms_per_packet); - } else { - memset(&rtp_session->timer, 0, sizeof(rtp_session->timer)); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error starting timer [%s], async RTP disabled\n", timer_name); - switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_USE_TIMER); + if (timer_name) { + if (switch_core_timer_init(&rtp_session->timer, timer_name, ms_per_packet / 1000, packet_size, rtp_session->pool) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting timer [%s] %d bytes per %dms\n", timer_name, packet_size, ms_per_packet); + } else { + memset(&rtp_session->timer, 0, sizeof(rtp_session->timer)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error starting timer [%s], async RTP disabled\n", timer_name); + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_USE_TIMER); + } } rtp_session->ready++;

1 0

[commit] r2720 - in freeswitch/trunk/src/dotnet: . Marshaling Marshaling/Types Modules Switch Types
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: james Date: Sat Sep 16 23:30:31 2006 New Revision: 2720 Modified: freeswitch/trunk/src/dotnet/Makefile freeswitch/trunk/src/dotnet/Marshaling/BufferMarshaler.cs freeswitch/trunk/src/dotnet/Marshaling/CallerExtensionMarshaler.cs freeswitch/trunk/src/dotnet/Marshaling/CallerProfileMarshaler.cs freeswitch/trunk/src/dotnet/Marshaling/ChannelMarshaler.cs freeswitch/trunk/src/dotnet/Marshaling/ChannelTimetableMarshaler.cs freeswitch/trunk/src/dotnet/Marshaling/CoreSessionMarshaler.cs freeswitch/trunk/src/dotnet/Marshaling/EventMarshaler.cs freeswitch/trunk/src/dotnet/Marshaling/FileHandleMarshaler.cs freeswitch/trunk/src/dotnet/Marshaling/MemoryPoolMarshaler.cs freeswitch/trunk/src/dotnet/Marshaling/StreamHandleMarshaler.cs freeswitch/trunk/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/ApplicationInterfaceMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/BufferMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/CallerExtensionMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/CallerProfileMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelFlagMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelStateMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelTimetableMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/CodecImplementationMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/CodecInterfaceMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/CodecMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/CodecTypeMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/CoreSessionMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/EventMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/FileHandleMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/FrameMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/IOEventHooksMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/LoadableModuleMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs freeswitch/trunk/src/dotnet/Marshaling/Types/TypesMarshal.cs freeswitch/trunk/src/dotnet/Module.cs freeswitch/trunk/src/dotnet/Modules/Api.cs freeswitch/trunk/src/dotnet/Modules/Application.cs freeswitch/trunk/src/dotnet/Switch/CallerProfile.cs freeswitch/trunk/src/dotnet/Switch/Channel.cs freeswitch/trunk/src/dotnet/Switch/Console.cs freeswitch/trunk/src/dotnet/Switch/CoreSession.cs freeswitch/trunk/src/dotnet/Switch/Ivr.cs freeswitch/trunk/src/dotnet/Switch/LoadableModule.cs freeswitch/trunk/src/dotnet/Switch/StreamHandle.cs freeswitch/trunk/src/dotnet/Types/ApplicationFunction.cs freeswitch/trunk/src/dotnet/Types/ApplicationInterface.cs freeswitch/trunk/src/dotnet/Types/Buffer.cs freeswitch/trunk/src/dotnet/Types/CallCause.cs freeswitch/trunk/src/dotnet/Types/CallerExtension.cs freeswitch/trunk/src/dotnet/Types/CallerProfile.cs freeswitch/trunk/src/dotnet/Types/Channel.cs freeswitch/trunk/src/dotnet/Types/ChannelFlag.cs freeswitch/trunk/src/dotnet/Types/ChannelState.cs freeswitch/trunk/src/dotnet/Types/ChannelTimetable.cs freeswitch/trunk/src/dotnet/Types/CoreSession.cs freeswitch/trunk/src/dotnet/Types/DtmfCallbackFunction.cs freeswitch/trunk/src/dotnet/Types/Event.cs freeswitch/trunk/src/dotnet/Types/FileHandle.cs freeswitch/trunk/src/dotnet/Types/InputCallbackFunction.cs freeswitch/trunk/src/dotnet/Types/InputType.cs freeswitch/trunk/src/dotnet/Types/LoadableModule.cs freeswitch/trunk/src/dotnet/Types/LoadableModuleInterface.cs freeswitch/trunk/src/dotnet/Types/MemoryPool.cs freeswitch/trunk/src/dotnet/Types/Module.cs freeswitch/trunk/src/dotnet/Types/ModuleInterfaces.cs freeswitch/trunk/src/dotnet/Types/Status.cs freeswitch/trunk/src/dotnet/Types/StreamHandle.cs freeswitch/trunk/src/dotnet/Types/TextChannel.cs Log: Changed namespace. Modified: freeswitch/trunk/src/dotnet/Makefile ============================================================================== --- freeswitch/trunk/src/dotnet/Makefile (original) +++ freeswitch/trunk/src/dotnet/Makefile Sat Sep 16 23:30:31 2006 @@ -1,8 +1,8 @@ all: $(MODNAME).so $(MODNAME).so: - gmcs -debug -unsafe -t:library -keyfile:public.snk \ - -out:Freeswitch.dll -reference:Mono.Posix.dll \ + /usr/local/freeswitch/bin/gmcs -debug -unsafe -t:library -keyfile:public.snk \ + -out:FreeSwitch.dll -reference:Mono.Posix.dll \ Properties/AssemblyInfo.cs \ Marshaling/Types/ApiInterfaceMarshal.cs \ Marshaling/Types/ApplicationInterfaceMarshal.cs \ @@ -24,6 +24,7 @@ Marshaling/Types/IOEventHooksMarshal.cs \ Marshaling/Types/LoadableModuleInterfaceMarshal.cs \ Marshaling/Types/LoadableModuleMarshal.cs \ + Marshaling/Types/StreamHandleMarshal.cs \ Marshaling/Types/TypesMarshal.cs \ Marshaling/BufferMarshaler.cs \ Marshaling/CallerExtensionMarshaler.cs \ @@ -57,6 +58,8 @@ Types/ChannelTimetable.cs \ Types/CoreSession.cs \ Types/DtmfCallbackFunction.cs \ + Types/InputCallbackFunction.cs \ + Types/InputType.cs \ Types/Event.cs \ Types/FileHandle.cs \ Types/LoadableModule.cs \ @@ -67,12 +70,10 @@ Types/StreamHandle.cs \ Types/TextChannel.cs \ Common.cs \ - Core.cs \ - Ivr.cs \ Module.cs \ clean: rm -fr *.dll install: - cp -f Freeswitch.dll /usr/local/freeswitch/lib/ + cp -f FreeSwitch.dll /usr/local/freeswitch/lib/ Modified: freeswitch/trunk/src/dotnet/Marshaling/BufferMarshaler.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/BufferMarshaler.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/BufferMarshaler.cs Sat Sep 16 23:30:31 2006 @@ -31,10 +31,10 @@ */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling.Types; -using FreeSwitch.NET.Types; +using FreeSwitch.Marshaling.Types; +using FreeSwitch.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.Marshaling { class BufferMarshaler : ICustomMarshaler { @@ -60,14 +60,14 @@ public IntPtr MarshalManagedToNative(object obj) { - FreeSwitch.NET.Types.Buffer buffer = (FreeSwitch.NET.Types.Buffer)obj; + FreeSwitch.Types.Buffer buffer = (FreeSwitch.Types.Buffer)obj; return buffer.marshaledObject.Handle; } public object MarshalNativeToManaged(IntPtr bufferPtr) { - FreeSwitch.NET.Types.Buffer buffer = new FreeSwitch.NET.Types.Buffer(); + FreeSwitch.Types.Buffer buffer = new FreeSwitch.Types.Buffer(); BufferMarshal bufferMarshal = new BufferMarshal(); Marshal.PtrToStructure(bufferPtr, bufferMarshal); Modified: freeswitch/trunk/src/dotnet/Marshaling/CallerExtensionMarshaler.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/CallerExtensionMarshaler.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/CallerExtensionMarshaler.cs Sat Sep 16 23:30:31 2006 @@ -1,40 +1,40 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * CallerExtensionMarshaler.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * CallerExtensionMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.Marshaling { class CallerExtensionMarshaler : ICustomMarshaler { Modified: freeswitch/trunk/src/dotnet/Marshaling/CallerProfileMarshaler.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/CallerProfileMarshaler.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/CallerProfileMarshaler.cs Sat Sep 16 23:30:31 2006 @@ -1,40 +1,40 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * CallerProfileMarshaler.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * CallerProfileMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.Marshaling { class CallerProfileMarshaler : ICustomMarshaler { Modified: freeswitch/trunk/src/dotnet/Marshaling/ChannelMarshaler.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/ChannelMarshaler.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/ChannelMarshaler.cs Sat Sep 16 23:30:31 2006 @@ -1,40 +1,40 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * ChannelMarshaler.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * ChannelMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.Marshaling { class ChannelMarshaler : ICustomMarshaler { Modified: freeswitch/trunk/src/dotnet/Marshaling/ChannelTimetableMarshaler.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/ChannelTimetableMarshaler.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/ChannelTimetableMarshaler.cs Sat Sep 16 23:30:31 2006 @@ -1,40 +1,40 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * ChannelTimetableMarshaler.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * ChannelTimetableMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.Marshaling { class ChannelTimetableMarshaler : ICustomMarshaler { Modified: freeswitch/trunk/src/dotnet/Marshaling/CoreSessionMarshaler.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/CoreSessionMarshaler.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/CoreSessionMarshaler.cs Sat Sep 16 23:30:31 2006 @@ -1,40 +1,40 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * CoreSessionMarshaler.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * CoreSessionMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.Marshaling { class CoreSessionMarshaler : ICustomMarshaler { Modified: freeswitch/trunk/src/dotnet/Marshaling/EventMarshaler.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/EventMarshaler.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/EventMarshaler.cs Sat Sep 16 23:30:31 2006 @@ -1,41 +1,41 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * EventMarshaler.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * EventMarshaler.cs -- + * */ using System; using System.Collections; -using FreeSwitch.NET.Marshaling.Types; -using FreeSwitch.NET.Types; +using FreeSwitch.Marshaling.Types; +using FreeSwitch.Types; using System.Runtime.InteropServices; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.Marshaling { class EventMarshaler : ICustomMarshaler { Modified: freeswitch/trunk/src/dotnet/Marshaling/FileHandleMarshaler.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/FileHandleMarshaler.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/FileHandleMarshaler.cs Sat Sep 16 23:30:31 2006 @@ -1,40 +1,40 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * FileHandleMarshaler.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * FileHandleMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.Marshaling { class FileHandleMarshaler : ICustomMarshaler { Modified: freeswitch/trunk/src/dotnet/Marshaling/MemoryPoolMarshaler.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/MemoryPoolMarshaler.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/MemoryPoolMarshaler.cs Sat Sep 16 23:30:31 2006 @@ -1,40 +1,40 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * MemoryPoolMarshaler.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * MemoryPoolMarshaler.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.Marshaling { class MemoryPoolMarshaler : ICustomMarshaler { Modified: freeswitch/trunk/src/dotnet/Marshaling/StreamHandleMarshaler.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/StreamHandleMarshaler.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/StreamHandleMarshaler.cs Sat Sep 16 23:30:31 2006 @@ -31,11 +31,11 @@ */ using System; using System.Collections; -using FreeSwitch.NET.Marshaling.Types; -using FreeSwitch.NET.Types; +using FreeSwitch.Marshaling.Types; +using FreeSwitch.Types; using System.Runtime.InteropServices; -namespace FreeSwitch.NET.Marshaling +namespace FreeSwitch.Marshaling { class StreamHandleMarshaler : ICustomMarshaler { Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,21 +28,21 @@ * * ApiInterfaceMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class ApiInterfaceMarshal - { - //[MarshalAs(UnmanagedType.LPStr)] - internal IntPtr interface_name; - //[MarshalAs(UnmanagedType.LPStr)] - internal IntPtr desc; - internal ApiFunction function; - internal IntPtr next; - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class ApiInterfaceMarshal + { + //[MarshalAs(UnmanagedType.LPStr)] + internal IntPtr interface_name; + //[MarshalAs(UnmanagedType.LPStr)] + internal IntPtr desc; + internal ApiFunction function; + internal IntPtr next; + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/ApplicationInterfaceMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/ApplicationInterfaceMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/ApplicationInterfaceMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,25 +28,25 @@ * * ApplicationInterfaceMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class ApplicationInterfaceMarshal - { - // [MarshalAs(UnmanagedType.LPStr)] - internal IntPtr interface_name; - internal ApplicationFunction application_function; - // [MarshalAs(UnmanagedType.LPStr)] - internal IntPtr long_desc; - //[MarshalAs(UnmanagedType.LPStr)] - internal IntPtr short_desc; - //[MarshalAs(UnmanagedType.LPStr)] - internal IntPtr syntax; - internal IntPtr next; - } + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class ApplicationInterfaceMarshal + { + // [MarshalAs(UnmanagedType.LPStr)] + internal IntPtr interface_name; + internal ApplicationFunction application_function; + // [MarshalAs(UnmanagedType.LPStr)] + internal IntPtr long_desc; + //[MarshalAs(UnmanagedType.LPStr)] + internal IntPtr short_desc; + //[MarshalAs(UnmanagedType.LPStr)] + internal IntPtr syntax; + internal IntPtr next; + } } \ No newline at end of file Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/BufferMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/BufferMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/BufferMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,19 +28,19 @@ * * BufferMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class BufferMarshal - { - [MarshalAs(UnmanagedType.LPStr)] - internal string data; - internal int used; - internal int datalen; - internal UInt32 id; - } -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class BufferMarshal + { + [MarshalAs(UnmanagedType.LPStr)] + internal string data; + internal int used; + internal int datalen; + internal UInt32 id; + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/CallerExtensionMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/CallerExtensionMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/CallerExtensionMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,19 +28,19 @@ * * CallerExtensionMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class CallerExtensionMarshal - { - internal IntPtr extension_name; - internal IntPtr extension_number; - internal IntPtr current_application; - internal IntPtr last_application; - internal IntPtr applications; - } -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class CallerExtensionMarshal + { + internal IntPtr extension_name; + internal IntPtr extension_number; + internal IntPtr current_application; + internal IntPtr last_application; + internal IntPtr applications; + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/CallerProfileMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/CallerProfileMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/CallerProfileMarshal.cs Sat Sep 16 23:30:31 2006 @@ -1,38 +1,38 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * CallerProfileMarshal.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * CallerProfileMarshal.cs -- + * */ using System; using System.Runtime.InteropServices; -namespace FreeSwitch.NET.Marshaling.Types +namespace FreeSwitch.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class CallerProfileMarshal Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelFlagMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelFlagMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelFlagMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,19 +28,19 @@ * * ChannelFlagMarshal.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Marshaling.Types -{ - internal enum ChannelFlagMarshal - { - CF_SEND_AUDIO, - CF_RECV_AUDIO, - CF_ANSWERED, - CF_OUTBOUND, - CF_EARLY_MEDIA, - CF_ORIGINATOR, - CF_TRANSFER - } -} + */ +using System; + +namespace FreeSwitch.Marshaling.Types +{ + internal enum ChannelFlagMarshal + { + CF_SEND_AUDIO, + CF_RECV_AUDIO, + CF_ANSWERED, + CF_OUTBOUND, + CF_EARLY_MEDIA, + CF_ORIGINATOR, + CF_TRANSFER + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelMarshal.cs Sat Sep 16 23:30:31 2006 @@ -1,39 +1,39 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * ChannelMarshal.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * ChannelMarshal.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; +using FreeSwitch.Types; -namespace FreeSwitch.NET.Marshaling.Types +namespace FreeSwitch.Marshaling.Types { [StructLayout(LayoutKind.Sequential)] internal class ChannelMarshal Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelStateMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelStateMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelStateMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,20 +28,20 @@ * * ChannelStateMarshal.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Marshaling.Types -{ - internal enum ChannelStateMarshal - { - CS_NEW, - CS_INIT, - CS_RING, - CS_TRANSMIT, - CS_EXECUTE, - CS_LOOPBACK, - CS_HANGUP, - CS_DONE - } -} + */ +using System; + +namespace FreeSwitch.Marshaling.Types +{ + internal enum ChannelStateMarshal + { + CS_NEW, + CS_INIT, + CS_RING, + CS_TRANSMIT, + CS_EXECUTE, + CS_LOOPBACK, + CS_HANGUP, + CS_DONE + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelTimetableMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelTimetableMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/ChannelTimetableMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,17 +28,17 @@ * * ChannelTimetableMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class ChannelTimetableMarshal - { - internal Int64 created; - internal Int64 answered; - internal Int64 hungup; - } -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class ChannelTimetableMarshal + { + internal Int64 created; + internal Int64 answered; + internal Int64 hungup; + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/CodecImplementationMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/CodecImplementationMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/CodecImplementationMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,27 +28,27 @@ * * CodecImplementationMarshal.cs -- * - */ -using System; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - internal class CodecImplementationMarshal - { - internal UInt32 samples_per_seconds; - internal int bits_per_second; - internal int microseconds_per_frame; - internal UInt32 samples_per_frame; - internal UInt32 bytes_per_frame; - internal UInt32 encoded_bytes_per_frame; - internal Byte number_of_channels; - internal int pref_frames_per_packet; - internal int max_frames_per_packet; - //internal CodecInitMarshal init; - //internal CodecEncodeMarshal encode; - //internal CodecDecode decode; - //internal CodecDestroy destroy; - internal IntPtr next; - } -} + */ +using System; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + internal class CodecImplementationMarshal + { + internal UInt32 samples_per_seconds; + internal int bits_per_second; + internal int microseconds_per_frame; + internal UInt32 samples_per_frame; + internal UInt32 bytes_per_frame; + internal UInt32 encoded_bytes_per_frame; + internal Byte number_of_channels; + internal int pref_frames_per_packet; + internal int max_frames_per_packet; + //internal CodecInitMarshal init; + //internal CodecEncodeMarshal encode; + //internal CodecDecode decode; + //internal CodecDestroy destroy; + internal IntPtr next; + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/CodecInterfaceMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/CodecInterfaceMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/CodecInterfaceMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,36 +28,36 @@ * * CodecInterfaceMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class CodecInterfaceMarshal - { - [MarshalAs(UnmanagedType.LPStr)] - internal string interface_name; - /* - internal CodecImplementation application_function; - [MarshalAs(UnmanagedType.LPStr)] - internal string long_desc; - [MarshalAs(UnmanagedType.LPStr)] - internal string short_desc; - [MarshalAs(UnmanagedType.LPStr)] - internal string syntax; - internal IntPtr next; -} - - + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class CodecInterfaceMarshal + { + [MarshalAs(UnmanagedType.LPStr)] + internal string interface_name; + /* + internal CodecImplementation application_function; + [MarshalAs(UnmanagedType.LPStr)] + internal string long_desc; + [MarshalAs(UnmanagedType.LPStr)] + internal string short_desc; + [MarshalAs(UnmanagedType.LPStr)] + internal string syntax; + internal IntPtr next; +} + + struct switch_codec_interface { ! the name of the interface const char *interface_name; ! a list of codec implementations related to the codec const switch_codec_implementation_t *implementations; const struct switch_codec_interface *next; -};*/ - } +};*/ + } } \ No newline at end of file Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/CodecMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/CodecMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/CodecMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,19 +28,19 @@ * * CodecMarshal.cs -- * - */ -using System; -using System.Text; - -namespace FreeSwitch.NET.Marshaling.Types -{ - internal class CodecMarshal - { - internal IntPtr codec_interface; - internal IntPtr implementation; - //internal CodecSettingsMarshal codec_settings; - internal UInt32 flags; - //internal MemoryPoolMarshal memory_pool; - internal IntPtr private_info; - } -} + */ +using System; +using System.Text; + +namespace FreeSwitch.Marshaling.Types +{ + internal class CodecMarshal + { + internal IntPtr codec_interface; + internal IntPtr implementation; + //internal CodecSettingsMarshal codec_settings; + internal UInt32 flags; + //internal MemoryPoolMarshal memory_pool; + internal IntPtr private_info; + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/CodecTypeMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/CodecTypeMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/CodecTypeMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,16 +28,16 @@ * * CodecTypeMarshal.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Marshaling.Types -{ - internal enum CodecTypesMarshal - { - SWITCH_CODEC_TYPE_AUDIO, - SWITCH_CODEC_TYPE_VIDEO, - SWITCH_CODEC_TYPE_T38, - SWITCH_CODEC_TYPE_APP - } -} + */ +using System; + +namespace FreeSwitch.Marshaling.Types +{ + internal enum CodecTypesMarshal + { + SWITCH_CODEC_TYPE_AUDIO, + SWITCH_CODEC_TYPE_VIDEO, + SWITCH_CODEC_TYPE_T38, + SWITCH_CODEC_TYPE_APP + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/CoreSessionMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/CoreSessionMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/CoreSessionMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,41 +28,41 @@ * * CoreSessionMarshal.cs -- * - */ -using System; -using System.Text; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential, Pack=1)] - internal class CoreSessionMarshal - { - internal UInt32 id; - [MarshalAs(UnmanagedType.ByValArray, SizeConst=80)] - internal byte[] name; - internal int thread_running; - internal IntPtr pool; - internal IntPtr channel; - internal IntPtr thread; - internal IntPtr endpoint_interface; - internal IOEventHooksMarshal event_hooks; - internal IntPtr read_codec; - internal IntPtr write_codec; - internal IntPtr raw_write_buffer; - internal FrameMarshal raw_write_frame; - internal FrameMarshal enc_write_frame; - [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] - internal byte[] raw_write_buf; - [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] - internal byte[] enc_write_buf; - internal IntPtr raw_read_buffer; - internal FrameMarshal raw_read_frame; - internal FrameMarshal enc_read_frame; - [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] - internal byte[] raw_read_buf; - [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] - internal byte[] enc_read_buf; + */ +using System; +using System.Text; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential, Pack=1)] + internal class CoreSessionMarshal + { + internal UInt32 id; + [MarshalAs(UnmanagedType.ByValArray, SizeConst=80)] + internal byte[] name; + internal int thread_running; + internal IntPtr pool; + internal IntPtr channel; + internal IntPtr thread; + internal IntPtr endpoint_interface; + internal IOEventHooksMarshal event_hooks; + internal IntPtr read_codec; + internal IntPtr write_codec; + internal IntPtr raw_write_buffer; + internal FrameMarshal raw_write_frame; + internal FrameMarshal enc_write_frame; + [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] + internal byte[] raw_write_buf; + [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] + internal byte[] enc_write_buf; + internal IntPtr raw_read_buffer; + internal FrameMarshal raw_read_frame; + internal FrameMarshal enc_read_frame; + [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] + internal byte[] raw_read_buf; + [MarshalAs(UnmanagedType.ByValArray, SizeConst=2048)] + internal byte[] enc_read_buf; internal IntPtr read_resampler; internal IntPtr write_resampler; internal IntPtr mutex; @@ -73,8 +73,8 @@ internal int stream_count; /* 36 + 1 char string, but need to grab 40 bytes */ [MarshalAs(UnmanagedType.ByValArray, SizeConst=40)] - internal byte[] uuid_str; + internal byte[] uuid_str; internal IntPtr private_info; internal IntPtr event_queue; - } -} + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/EventMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/EventMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/EventMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,32 +28,32 @@ * * EventMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class EventMarshal - { - internal EventType event_id; - internal Priority priority; - internal IntPtr owner; - internal IntPtr subclass; - internal IntPtr headers; - internal IntPtr body; - internal IntPtr bind_user_data; - internal IntPtr event_user_data; - internal IntPtr next; - } - - [StructLayout(LayoutKind.Sequential)] - internal class EventHeaderMarshal - { - internal string name; - internal string value; - internal IntPtr next; - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class EventMarshal + { + internal EventType event_id; + internal Priority priority; + internal IntPtr owner; + internal IntPtr subclass; + internal IntPtr headers; + internal IntPtr body; + internal IntPtr bind_user_data; + internal IntPtr event_user_data; + internal IntPtr next; + } + + [StructLayout(LayoutKind.Sequential)] + internal class EventHeaderMarshal + { + internal string name; + internal string value; + internal IntPtr next; + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/FileHandleMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/FileHandleMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/FileHandleMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,30 +28,30 @@ * * FileHandleMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class FileHandleMarshal - { - internal IntPtr file_interface; - internal UInt32 flags; - internal IntPtr fd; - internal uint samples; - internal UInt32 samplerate; - internal Byte channels; - internal uint format; - internal uint sections; - internal int seekable; - internal uint sample_count; - internal int speed; - internal IntPtr memory_pool; - internal IntPtr private_info; - internal Int64 pos; - internal IntPtr audio_buffer; - } - -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class FileHandleMarshal + { + internal IntPtr file_interface; + internal UInt32 flags; + internal IntPtr fd; + internal uint samples; + internal UInt32 samplerate; + internal Byte channels; + internal uint format; + internal uint sections; + internal int seekable; + internal uint sample_count; + internal int speed; + internal IntPtr memory_pool; + internal IntPtr private_info; + internal Int64 pos; + internal IntPtr audio_buffer; + } + +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/FrameMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/FrameMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/FrameMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,27 +28,27 @@ * * FrameMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class FrameMarshal - { - internal IntPtr codec; - internal IntPtr source; - internal IntPtr packet; - internal UInt32 packetlen; - internal IntPtr data; - internal UInt32 datalen; - internal UInt32 buflen; - internal UInt32 samples; - internal UInt32 rate; - internal byte payload; - internal UInt32 timestamp; - internal byte flags; - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class FrameMarshal + { + internal IntPtr codec; + internal IntPtr source; + internal IntPtr packet; + internal UInt32 packetlen; + internal IntPtr data; + internal UInt32 datalen; + internal UInt32 buflen; + internal UInt32 samples; + internal UInt32 rate; + internal byte payload; + internal UInt32 timestamp; + internal byte flags; + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/IOEventHooksMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/IOEventHooksMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/IOEventHooksMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,24 +28,24 @@ * * IOEventHooksMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class IOEventHooksMarshal - { - internal IntPtr outgoing_channel; - internal IntPtr answer_channel; - internal IntPtr receive_message; - internal IntPtr receive_event; - internal IntPtr read_frame; - internal IntPtr write_frame; - internal IntPtr kill_channel; - internal IntPtr waitfor_read; - internal IntPtr waitfor_write; - internal IntPtr send_dtmf; - } -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class IOEventHooksMarshal + { + internal IntPtr outgoing_channel; + internal IntPtr answer_channel; + internal IntPtr receive_message; + internal IntPtr receive_event; + internal IntPtr read_frame; + internal IntPtr write_frame; + internal IntPtr kill_channel; + internal IntPtr waitfor_read; + internal IntPtr waitfor_write; + internal IntPtr send_dtmf; + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,25 +28,25 @@ * * LoadableModuleInterfaceMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class LoadableModuleInterfaceMarshal - { - internal IntPtr module_name; - internal IntPtr endpoint_interface; - internal IntPtr timer_interface; - internal IntPtr dialplan_interface; - internal IntPtr codec_interface; - internal IntPtr application_interface; - internal IntPtr api_interface; - internal IntPtr file_interface; - internal IntPtr speech_interface; - internal IntPtr directory_interface; - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class LoadableModuleInterfaceMarshal + { + internal IntPtr module_name; + internal IntPtr endpoint_interface; + internal IntPtr timer_interface; + internal IntPtr dialplan_interface; + internal IntPtr codec_interface; + internal IntPtr application_interface; + internal IntPtr api_interface; + internal IntPtr file_interface; + internal IntPtr speech_interface; + internal IntPtr directory_interface; + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/LoadableModuleMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/LoadableModuleMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/LoadableModuleMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,27 +28,27 @@ * * LoadableModuleMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - - - [StructLayout(LayoutKind.Sequential)] - public class LoadableModuleMarshal - { - public IntPtr filename; - public IntPtr module_interface; - public IntPtr lib; - public ModuleLoad module_load; - public ModuleReload module_reload; - public ModulePause module_pause; - public ModuleResume module_resume; - public ModuleStatus module_status; - public ModuleRuntime module_runtime; - public ModuleShutdown module_shutdown; - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + + + [StructLayout(LayoutKind.Sequential)] + public class LoadableModuleMarshal + { + public IntPtr filename; + public IntPtr module_interface; + public IntPtr lib; + public ModuleLoad module_load; + public ModuleReload module_reload; + public ModulePause module_pause; + public ModuleResume module_resume; + public ModuleStatus module_status; + public ModuleRuntime module_runtime; + public ModuleShutdown module_shutdown; + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,21 +28,21 @@ * * StreamHandleMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - [StructLayout(LayoutKind.Sequential)] - internal class StreamHandleMarshal - { - internal IntPtr write_function; - internal IntPtr data; - internal IntPtr end; - internal int data_size; - internal int data_len; - internal IntPtr _event; - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class StreamHandleMarshal + { + internal IntPtr write_function; + internal IntPtr data; + internal IntPtr end; + internal int data_size; + internal int data_len; + internal IntPtr _event; + } +} Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/TypesMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/TypesMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/TypesMarshal.cs Sat Sep 16 23:30:31 2006 @@ -28,18 +28,18 @@ * * TypesMarshal.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; - -namespace FreeSwitch.NET.Marshaling.Types -{ - public delegate - Status DtmfCallbackFunctionMarshal( - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CoreSessionMarshaler))] - CoreSession session, - string dtmf, - IntPtr buf, - uint buflen); -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Types; + +namespace FreeSwitch.Marshaling.Types +{ + public delegate + Status DtmfCallbackFunctionMarshal( + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CoreSessionMarshaler))] + CoreSession session, + string dtmf, + IntPtr buf, + uint buflen); +} Modified: freeswitch/trunk/src/dotnet/Module.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Module.cs (original) +++ freeswitch/trunk/src/dotnet/Module.cs Sat Sep 16 23:30:31 2006 @@ -1,50 +1,50 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * Module.cs -- - * - */ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * Module.cs -- + * + */ using System; using System.Collections; using System.Reflection; using System.Runtime.InteropServices; using System.Text; using FreeSwitch.NET; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Modules; -using FreeSwitch.NET.Marshaling.Types; - -namespace FreeSwitch.NET -{ +using FreeSwitch.Types; +using FreeSwitch.Modules; +using FreeSwitch.Marshaling.Types; + +namespace FreeSwitch.NET +{ /// <summary> /// Base class for all Freeswitch.NET modules - /// </summary> - /// <example> + /// </summary> + /// <example> /// public class Example : Module /// { /// public Example() @@ -54,9 +54,9 @@ /// /// Register(); /// } - /// } - /// </example> - public class Module + /// } + /// </example> + public class Module { private LoadableModuleInterfaceMarshal module_interface = new LoadableModuleInterfaceMarshal(); private LoadableModuleMarshal module = new LoadableModuleMarshal(); @@ -71,19 +71,19 @@ /// <summary> /// Module constructor /// </summary> - public Module() + public Module() { - Console.WriteLine("*** Creating new module object"); - - load = new ModuleLoad(Load); - } - + Console.WriteLine("*** Creating new module object"); + + load = new ModuleLoad(Load); + } + /// <summary> /// Implementation of ModuleLoad Delegate /// </summary> /// <param name="module"></param> /// <param name="name"></param> - /// <returns></returns> + /// <returns></returns> public Status Load(ref IntPtr module, string name) { /* Allocate some unmanaged mem for the ModuleInterface */ @@ -110,13 +110,13 @@ Marshal.StructureToPtr(module_interface, module, true); return Status.Success; - } - + } + /// <summary> /// AddApiInterface /// </summary> - /// <param name="apiInterface"></param> - public void AddApiInterface(Api apiInterface) + /// <param name="apiInterface"></param> + public void AddApiInterface(Api apiInterface) { /* Create a new ApiInterface type and allocate unmanaged mem */ ApiInterfaceMarshal apiInterfaceMarshal = new ApiInterfaceMarshal(); @@ -185,21 +185,21 @@ /* Finally, add our new interface to the array */ applicationInterfaces.Add(applicationInterface); - } - + } + /// <summary> /// Register - /// </summary> - public void Register() + /// </summary> + public void Register() { module.module_load = new ModuleLoad(Load); - Switch.switch_loadable_module_build_dynamic(filename, - module.module_load, - module.module_runtime, - module.module_shutdown); + Switch.switch_loadable_module_build_dynamic(filename, + module.module_load, + module.module_runtime, + module.module_shutdown); } - - } -} + + } +} Modified: freeswitch/trunk/src/dotnet/Modules/Api.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Modules/Api.cs (original) +++ freeswitch/trunk/src/dotnet/Modules/Api.cs Sat Sep 16 23:30:31 2006 @@ -1,41 +1,41 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * Api.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * Api.cs -- + * */ using System; using System.Collections; using System.Text; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; +using FreeSwitch.Types; -namespace FreeSwitch.NET.Modules +namespace FreeSwitch.Modules { public class Api { Modified: freeswitch/trunk/src/dotnet/Modules/Application.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Modules/Application.cs (original) +++ freeswitch/trunk/src/dotnet/Modules/Application.cs Sat Sep 16 23:30:31 2006 @@ -1,43 +1,43 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * Application.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * Application.cs -- + * */ using System; using System.Collections; using System.Text; using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Marshaling; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Modules +namespace FreeSwitch.Modules { public class Application { Modified: freeswitch/trunk/src/dotnet/Switch/CallerProfile.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Switch/CallerProfile.cs (original) +++ freeswitch/trunk/src/dotnet/Switch/CallerProfile.cs Sat Sep 16 23:30:31 2006 @@ -1,42 +1,42 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * CallerProfile.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * CallerProfile.cs -- + * */ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET +namespace FreeSwitch { public partial class Switch { Modified: freeswitch/trunk/src/dotnet/Switch/Channel.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Switch/Channel.cs (original) +++ freeswitch/trunk/src/dotnet/Switch/Channel.cs Sat Sep 16 23:30:31 2006 @@ -1,41 +1,41 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * Channel.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * Channel.cs -- + * */ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling; +using FreeSwitch.Types; +using FreeSwitch.Marshaling; -namespace FreeSwitch.NET +namespace FreeSwitch { public partial class Switch { @@ -60,14 +60,14 @@ [DllImport("freeswitch")] public extern static - ChannelState switch_channel_perform_hangup( - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ChannelMarshaler))] - Channel channel, - [MarshalAs(UnmanagedType.LPStr)] - string file, - [MarshalAs(UnmanagedType.LPStr)] - string func, - int line, + ChannelState switch_channel_perform_hangup( + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ChannelMarshaler))] + Channel channel, + [MarshalAs(UnmanagedType.LPStr)] + string file, + [MarshalAs(UnmanagedType.LPStr)] + string func, + int line, CallCause hangup_cause); [DllImport("freeswitch")] Modified: freeswitch/trunk/src/dotnet/Switch/Console.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Switch/Console.cs (original) +++ freeswitch/trunk/src/dotnet/Switch/Console.cs Sat Sep 16 23:30:31 2006 @@ -34,7 +34,7 @@ using System.Diagnostics; using System.Text; -namespace FreeSwitch.NET +namespace FreeSwitch { public partial class Switch { Modified: freeswitch/trunk/src/dotnet/Switch/CoreSession.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Switch/CoreSession.cs (original) +++ freeswitch/trunk/src/dotnet/Switch/CoreSession.cs Sat Sep 16 23:30:31 2006 @@ -1,41 +1,41 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * CoreSession.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * CoreSession.cs -- + * */ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling; +using FreeSwitch.Types; +using FreeSwitch.Marshaling; -namespace FreeSwitch.NET +namespace FreeSwitch { public partial class Switch { Modified: freeswitch/trunk/src/dotnet/Switch/Ivr.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Switch/Ivr.cs (original) +++ freeswitch/trunk/src/dotnet/Switch/Ivr.cs Sat Sep 16 23:30:31 2006 @@ -1,42 +1,42 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * Ivr.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * Ivr.cs -- + * */ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET +namespace FreeSwitch { public partial class Switch { Modified: freeswitch/trunk/src/dotnet/Switch/LoadableModule.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Switch/LoadableModule.cs (original) +++ freeswitch/trunk/src/dotnet/Switch/LoadableModule.cs Sat Sep 16 23:30:31 2006 @@ -1,40 +1,40 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * LoadableModule.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * LoadableModule.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET +namespace FreeSwitch { /* * SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(char *dir, char *fname) Modified: freeswitch/trunk/src/dotnet/Switch/StreamHandle.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Switch/StreamHandle.cs (original) +++ freeswitch/trunk/src/dotnet/Switch/StreamHandle.cs Sat Sep 16 23:30:31 2006 @@ -1,40 +1,40 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * LoadableModule.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * LoadableModule.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Types; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET +namespace FreeSwitch { /* * SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(char *dir, char *fname) Modified: freeswitch/trunk/src/dotnet/Types/ApplicationFunction.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/ApplicationFunction.cs (original) +++ freeswitch/trunk/src/dotnet/Types/ApplicationFunction.cs Sat Sep 16 23:30:31 2006 @@ -28,10 +28,10 @@ * * ApplicationFunction.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - -} + */ +using System; + +namespace FreeSwitch.Types +{ + +} Modified: freeswitch/trunk/src/dotnet/Types/ApplicationInterface.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/ApplicationInterface.cs (original) +++ freeswitch/trunk/src/dotnet/Types/ApplicationInterface.cs Sat Sep 16 23:30:31 2006 @@ -34,7 +34,7 @@ using System.Runtime.InteropServices; using System.Text; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.Types { /* public class ApplicationInterface Modified: freeswitch/trunk/src/dotnet/Types/Buffer.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/Buffer.cs (original) +++ freeswitch/trunk/src/dotnet/Types/Buffer.cs Sat Sep 16 23:30:31 2006 @@ -28,29 +28,29 @@ * * Buffer.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Types -{ - public class Buffer - { - internal HandleRef marshaledObject; - - public string Data - { - get { throw new NotImplementedException(); } - } - - public int Used - { - get { throw new NotImplementedException(); } - } - - public int Length - { - get { throw new NotImplementedException(); } - } - } -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Types +{ + public class Buffer + { + internal HandleRef marshaledObject; + + public string Data + { + get { throw new NotImplementedException(); } + } + + public int Used + { + get { throw new NotImplementedException(); } + } + + public int Length + { + get { throw new NotImplementedException(); } + } + } +} Modified: freeswitch/trunk/src/dotnet/Types/CallCause.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/CallCause.cs (original) +++ freeswitch/trunk/src/dotnet/Types/CallCause.cs Sat Sep 16 23:30:31 2006 @@ -1,37 +1,37 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * CallCause.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * CallCause.cs -- + * */ using System; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.Types { public enum CallCause { Modified: freeswitch/trunk/src/dotnet/Types/CallerExtension.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/CallerExtension.cs (original) +++ freeswitch/trunk/src/dotnet/Types/CallerExtension.cs Sat Sep 16 23:30:31 2006 @@ -1,39 +1,39 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * CallerExtension.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * CallerExtension.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.Types { public class CallerExtension { Modified: freeswitch/trunk/src/dotnet/Types/CallerProfile.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/CallerProfile.cs (original) +++ freeswitch/trunk/src/dotnet/Types/CallerProfile.cs Sat Sep 16 23:30:31 2006 @@ -1,39 +1,39 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * CallerProfile.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * CallerProfile.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.Types { public class CallerProfile { Modified: freeswitch/trunk/src/dotnet/Types/Channel.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/Channel.cs (original) +++ freeswitch/trunk/src/dotnet/Types/Channel.cs Sat Sep 16 23:30:31 2006 @@ -1,63 +1,63 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * Channel.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * Channel.cs -- + * */ using System; using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.Types { /* - * char *name; - switch_buffer_t *dtmf_buffer; - switch_mutex_t *dtmf_mutex; - switch_mutex_t *flag_mutex; - switch_mutex_t *profile_mutex; - switch_core_session_t *session; - switch_channel_state_t state; - uint32_t flags; - switch_caller_profile_t *caller_profile; - switch_caller_profile_t *originator_caller_profile; - switch_caller_profile_t *originatee_caller_profile; - switch_caller_extension_t *caller_extension; - const switch_state_handler_table_t *state_handlers[SWITCH_MAX_STATE_HANDLERS]; - int state_handler_index; - switch_hash_t *variables; - switch_channel_timetable_t *times; - void *private_info; - switch_call_cause_t hangup_cause; - int freq; - int bits; - int channels; - int ms; + * char *name; + switch_buffer_t *dtmf_buffer; + switch_mutex_t *dtmf_mutex; + switch_mutex_t *flag_mutex; + switch_mutex_t *profile_mutex; + switch_core_session_t *session; + switch_channel_state_t state; + uint32_t flags; + switch_caller_profile_t *caller_profile; + switch_caller_profile_t *originator_caller_profile; + switch_caller_profile_t *originatee_caller_profile; + switch_caller_extension_t *caller_extension; + const switch_state_handler_table_t *state_handlers[SWITCH_MAX_STATE_HANDLERS]; + int state_handler_index; + switch_hash_t *variables; + switch_channel_timetable_t *times; + void *private_info; + switch_call_cause_t hangup_cause; + int freq; + int bits; + int channels; + int ms; int kbps; */ public class Channel Modified: freeswitch/trunk/src/dotnet/Types/ChannelFlag.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/ChannelFlag.cs (original) +++ freeswitch/trunk/src/dotnet/Types/ChannelFlag.cs Sat Sep 16 23:30:31 2006 @@ -28,19 +28,19 @@ * * ChannelFlag.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - public enum ChannelFlag - { - CF_SEND_AUDIO, - CF_RECV_AUDIO, - CF_ANSWERED, - CF_OUTBOUND, - CF_EARLY_MEDIA, - CF_ORIGINATOR, - CF_TRANSFER - } -} + */ +using System; + +namespace FreeSwitch.Types +{ + public enum ChannelFlag + { + CF_SEND_AUDIO, + CF_RECV_AUDIO, + CF_ANSWERED, + CF_OUTBOUND, + CF_EARLY_MEDIA, + CF_ORIGINATOR, + CF_TRANSFER + } +} Modified: freeswitch/trunk/src/dotnet/Types/ChannelState.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/ChannelState.cs (original) +++ freeswitch/trunk/src/dotnet/Types/ChannelState.cs Sat Sep 16 23:30:31 2006 @@ -28,20 +28,20 @@ * * ChannelState.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - public enum ChannelState - { - CS_NEW, - CS_INIT, - CS_RING, - CS_TRANSMIT, - CS_EXECUTE, - CS_LOOPBACK, - CS_HANGUP, - CS_DONE - } -} + */ +using System; + +namespace FreeSwitch.Types +{ + public enum ChannelState + { + CS_NEW, + CS_INIT, + CS_RING, + CS_TRANSMIT, + CS_EXECUTE, + CS_LOOPBACK, + CS_HANGUP, + CS_DONE + } +} Modified: freeswitch/trunk/src/dotnet/Types/ChannelTimetable.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/ChannelTimetable.cs (original) +++ freeswitch/trunk/src/dotnet/Types/ChannelTimetable.cs Sat Sep 16 23:30:31 2006 @@ -28,29 +28,29 @@ * * ChannelTimetable.cs -- * - */ -using System; -using System.Runtime.InteropServices; - -namespace FreeSwitch.NET.Types -{ - public class ChannelTimetable - { - internal HandleRef marshaledObject; - - public Int64 Created - { - get { throw new NotImplementedException(); } - } - - public Int64 Answered - { - get { throw new NotImplementedException(); } - } - - public Int64 Hungup - { - get { throw new NotImplementedException(); } - } - } -} + */ +using System; +using System.Runtime.InteropServices; + +namespace FreeSwitch.Types +{ + public class ChannelTimetable + { + internal HandleRef marshaledObject; + + public Int64 Created + { + get { throw new NotImplementedException(); } + } + + public Int64 Answered + { + get { throw new NotImplementedException(); } + } + + public Int64 Hungup + { + get { throw new NotImplementedException(); } + } + } +} Modified: freeswitch/trunk/src/dotnet/Types/CoreSession.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/CoreSession.cs (original) +++ freeswitch/trunk/src/dotnet/Types/CoreSession.cs Sat Sep 16 23:30:31 2006 @@ -1,80 +1,80 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * CoreSession.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * CoreSession.cs -- + * */ using System; using System.Collections; using System.Runtime.InteropServices; using System.Text; -using FreeSwitch.NET.Marshaling.Types; +using FreeSwitch.Marshaling.Types; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.Types { /* - * uint32_t id; - char name[80]; - int thread_running; - switch_memory_pool_t *pool; - switch_channel_t *channel; - switch_thread_t *thread; - const switch_endpoint_interface_t *endpoint_interface; - switch_io_event_hooks_t event_hooks; - switch_codec_t *read_codec; - switch_codec_t *write_codec; - - switch_buffer_t *raw_write_buffer; - switch_frame_t raw_write_frame; - switch_frame_t enc_write_frame; - uint8_t raw_write_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; - uint8_t enc_write_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; - - switch_buffer_t *raw_read_buffer; - switch_frame_t raw_read_frame; - switch_frame_t enc_read_frame; - uint8_t raw_read_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; - uint8_t enc_read_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; - - - switch_audio_resampler_t *read_resampler; - switch_audio_resampler_t *write_resampler; - - switch_mutex_t *mutex; - switch_thread_cond_t *cond; - - switch_thread_rwlock_t *rwlock; - - void *streams[SWITCH_MAX_STREAMS]; - int stream_count; - - char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; - void *private_info; + * uint32_t id; + char name[80]; + int thread_running; + switch_memory_pool_t *pool; + switch_channel_t *channel; + switch_thread_t *thread; + const switch_endpoint_interface_t *endpoint_interface; + switch_io_event_hooks_t event_hooks; + switch_codec_t *read_codec; + switch_codec_t *write_codec; + + switch_buffer_t *raw_write_buffer; + switch_frame_t raw_write_frame; + switch_frame_t enc_write_frame; + uint8_t raw_write_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; + uint8_t enc_write_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; + + switch_buffer_t *raw_read_buffer; + switch_frame_t raw_read_frame; + switch_frame_t enc_read_frame; + uint8_t raw_read_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; + uint8_t enc_read_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; + + + switch_audio_resampler_t *read_resampler; + switch_audio_resampler_t *write_resampler; + + switch_mutex_t *mutex; + switch_thread_cond_t *cond; + + switch_thread_rwlock_t *rwlock; + + void *streams[SWITCH_MAX_STREAMS]; + int stream_count; + + char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; + void *private_info; switch_queue_t *event_queue; */ public class CoreSession Modified: freeswitch/trunk/src/dotnet/Types/DtmfCallbackFunction.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/DtmfCallbackFunction.cs (original) +++ freeswitch/trunk/src/dotnet/Types/DtmfCallbackFunction.cs Sat Sep 16 23:30:31 2006 @@ -28,10 +28,10 @@ * * DtmfCallbackFunction.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - public delegate Status DtmfCallbackFunction(CoreSession session, string dtmf); -} + */ +using System; + +namespace FreeSwitch.Types +{ + public delegate Status DtmfCallbackFunction(CoreSession session, string dtmf); +} Modified: freeswitch/trunk/src/dotnet/Types/Event.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/Event.cs (original) +++ freeswitch/trunk/src/dotnet/Types/Event.cs Sat Sep 16 23:30:31 2006 @@ -1,40 +1,40 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * Event.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * Event.cs -- + * */ using System; using System.Collections; using System.Text; using System.Runtime.InteropServices; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.Types { public enum Priority { Modified: freeswitch/trunk/src/dotnet/Types/FileHandle.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/FileHandle.cs (original) +++ freeswitch/trunk/src/dotnet/Types/FileHandle.cs Sat Sep 16 23:30:31 2006 @@ -28,15 +28,15 @@ * * FileHandle.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling.Types; - -namespace FreeSwitch.NET.Types -{ - public class FileHandle - { - internal HandleRef marshaledObject; - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Marshaling.Types; + +namespace FreeSwitch.Types +{ + public class FileHandle + { + internal HandleRef marshaledObject; + } +} Modified: freeswitch/trunk/src/dotnet/Types/InputCallbackFunction.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/InputCallbackFunction.cs (original) +++ freeswitch/trunk/src/dotnet/Types/InputCallbackFunction.cs Sat Sep 16 23:30:31 2006 @@ -28,20 +28,20 @@ * * DtmfCallbackFunction.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling; - -namespace FreeSwitch.NET.Types -{ - public delegate Status InputCallbackFunction( - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StreamHandleMarshaler))] - CoreSession session, - [MarshalAs(UnmanagedType.LPStr)] - string input, - InputType inputType, - [MarshalAs(UnmanagedType.LPStr)] - string buffer, - int bufferLength); -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Marshaling; + +namespace FreeSwitch.Types +{ + public delegate Status InputCallbackFunction( + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StreamHandleMarshaler))] + CoreSession session, + [MarshalAs(UnmanagedType.LPStr)] + string input, + InputType inputType, + [MarshalAs(UnmanagedType.LPStr)] + string buffer, + int bufferLength); +} Modified: freeswitch/trunk/src/dotnet/Types/InputType.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/InputType.cs (original) +++ freeswitch/trunk/src/dotnet/Types/InputType.cs Sat Sep 16 23:30:31 2006 @@ -28,14 +28,14 @@ * * ChannelState.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - public enum InputType - { + */ +using System; + +namespace FreeSwitch.Types +{ + public enum InputType + { INPUT_TYPE_DTMF, INPUT_TYPE_EVENT - } -} + } +} Modified: freeswitch/trunk/src/dotnet/Types/LoadableModule.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/LoadableModule.cs (original) +++ freeswitch/trunk/src/dotnet/Types/LoadableModule.cs Sat Sep 16 23:30:31 2006 @@ -1,38 +1,38 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * James Martelletti <james(a)nerdc0re.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * James Martelletti <james(a)nerdc0re.com> - * - * - * Channel.cs -- - * +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * Channel.cs -- + * */ using System; using System.Runtime.InteropServices; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.Types { public class LoadableModule { Modified: freeswitch/trunk/src/dotnet/Types/LoadableModuleInterface.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/LoadableModuleInterface.cs (original) +++ freeswitch/trunk/src/dotnet/Types/LoadableModuleInterface.cs Sat Sep 16 23:30:31 2006 @@ -28,34 +28,34 @@ * * LoadableModuleInterfaces.cs -- * - */ -using System; -using System.Collections; -using System.Runtime.InteropServices; -using System.Text; -using FreeSwitch.NET.Marshaling; - -namespace FreeSwitch.NET.Types -{ - public delegate Status WriteFunction( - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StreamHandleMarshaler))] - StreamHandle streamHandle, - [MarshalAs(UnmanagedType.LPStr)] - string fmt); - - //public delegate void ModuleLoad(); - - public class LoadableModuleInterface - { - private string module_name; - //private EndpointInterface endpoint_interface; - //private TimerInterface timer_interface; - //private DialplanInterface dialplan_interface; - //private CodecInterface codec_interface; - //private ApplicationInterface application_interface; - //private ApiInterface api_interface; - //private FileInterface file_interface; - //private SpeechInterface speech_interface; - //private DirectoryInterface directory_interface; - } + */ +using System; +using System.Collections; +using System.Runtime.InteropServices; +using System.Text; +using FreeSwitch.Marshaling; + +namespace FreeSwitch.Types +{ + public delegate Status WriteFunction( + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StreamHandleMarshaler))] + StreamHandle streamHandle, + [MarshalAs(UnmanagedType.LPStr)] + string fmt); + + //public delegate void ModuleLoad(); + + public class LoadableModuleInterface + { + private string module_name; + //private EndpointInterface endpoint_interface; + //private TimerInterface timer_interface; + //private DialplanInterface dialplan_interface; + //private CodecInterface codec_interface; + //private ApplicationInterface application_interface; + //private ApiInterface api_interface; + //private FileInterface file_interface; + //private SpeechInterface speech_interface; + //private DirectoryInterface directory_interface; + } } Modified: freeswitch/trunk/src/dotnet/Types/MemoryPool.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/MemoryPool.cs (original) +++ freeswitch/trunk/src/dotnet/Types/MemoryPool.cs Sat Sep 16 23:30:31 2006 @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.Types { public class MemoryPool { Modified: freeswitch/trunk/src/dotnet/Types/Module.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/Module.cs (original) +++ freeswitch/trunk/src/dotnet/Types/Module.cs Sat Sep 16 23:30:31 2006 @@ -28,32 +28,32 @@ * * Module.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling; - -namespace FreeSwitch.NET.Types -{ - public delegate Status ModuleReload(); - public delegate bool ModulePause(); - public delegate bool ModuleResume(); - public delegate bool ModuleStatus(); - public delegate Status ModuleRuntime(); - public delegate bool ModuleShutdown(); - public delegate Status ModuleLoad(ref IntPtr module, string name); - - public delegate void - ApplicationFunction( - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CoreSessionMarshaler))] - CoreSession session, - [MarshalAs(UnmanagedType.LPStr)] - string data); - - public delegate Status - ApiFunction( - [MarshalAs(UnmanagedType.LPStr)] - string command, - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(StreamHandleMarshaler))] - StreamHandle streamHandle); -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Marshaling; + +namespace FreeSwitch.Types +{ + public delegate Status ModuleReload(); + public delegate bool ModulePause(); + public delegate bool ModuleResume(); + public delegate bool ModuleStatus(); + public delegate Status ModuleRuntime(); + public delegate bool ModuleShutdown(); + public delegate Status ModuleLoad(ref IntPtr module, string name); + + public delegate void + ApplicationFunction( + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CoreSessionMarshaler))] + CoreSession session, + [MarshalAs(UnmanagedType.LPStr)] + string data); + + public delegate Status + ApiFunction( + [MarshalAs(UnmanagedType.LPStr)] + string command, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(StreamHandleMarshaler))] + StreamHandle streamHandle); +} Modified: freeswitch/trunk/src/dotnet/Types/ModuleInterfaces.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/ModuleInterfaces.cs (original) +++ freeswitch/trunk/src/dotnet/Types/ModuleInterfaces.cs Sat Sep 16 23:30:31 2006 @@ -34,7 +34,7 @@ using System.Runtime.InteropServices; using System.Text; -namespace FreeSwitch.NET.Types +namespace FreeSwitch.Types { /* public class ApplicationInterface @@ -44,26 +44,26 @@ private string long_desc; private string short_desc; private string syntax; - //const struct switch_application_interface *next; - - public string InterfaceName - { - get { return interface_name; } - } - - public ApplicationFunction ApplicationFunction - { - get { return application_function; } - } - - public string LongDesc - { - get { return long_desc; } - } - - public string ShortDesc - { - get { return short_desc; } + //const struct switch_application_interface *next; + + public string InterfaceName + { + get { return interface_name; } + } + + public ApplicationFunction ApplicationFunction + { + get { return application_function; } + } + + public string LongDesc + { + get { return long_desc; } + } + + public string ShortDesc + { + get { return short_desc; } } }*/ } Modified: freeswitch/trunk/src/dotnet/Types/Status.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/Status.cs (original) +++ freeswitch/trunk/src/dotnet/Types/Status.cs Sat Sep 16 23:30:31 2006 @@ -28,24 +28,24 @@ * * Status.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - public enum Status - { - Success, - False, - Timeout, - Restart, - Terminate, - NotImplemented, - MemoryError, - NoOp, - Resample, - GeneralError, - InUse, - Break - } -} + */ +using System; + +namespace FreeSwitch.Types +{ + public enum Status + { + Success, + False, + Timeout, + Restart, + Terminate, + NotImplemented, + MemoryError, + NoOp, + Resample, + GeneralError, + InUse, + Break + } +} Modified: freeswitch/trunk/src/dotnet/Types/StreamHandle.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/StreamHandle.cs (original) +++ freeswitch/trunk/src/dotnet/Types/StreamHandle.cs Sat Sep 16 23:30:31 2006 @@ -28,24 +28,24 @@ * * StreamHandle.cs -- * - */ -using System; -using System.Runtime.InteropServices; -using FreeSwitch.NET.Marshaling.Types; - -namespace FreeSwitch.NET.Types -{ - public class StreamHandle - { - internal HandleRef marshaledObject; - internal WriteFunction writeFunction; - - public void Write(string data) - { - StreamHandleMarshal streamHandleMarshal = (StreamHandleMarshal)marshaledObject.Wrapper; - WriteFunction writeFunction = (WriteFunction)Marshal.GetDelegateForFunctionPointer(streamHandleMarshal.write_function, typeof(WriteFunction)); - - writeFunction(this, data); - } - } -} + */ +using System; +using System.Runtime.InteropServices; +using FreeSwitch.Marshaling.Types; + +namespace FreeSwitch.Types +{ + public class StreamHandle + { + internal HandleRef marshaledObject; + internal WriteFunction writeFunction; + + public void Write(string data) + { + StreamHandleMarshal streamHandleMarshal = (StreamHandleMarshal)marshaledObject.Wrapper; + WriteFunction writeFunction = (WriteFunction)Marshal.GetDelegateForFunctionPointer(streamHandleMarshal.write_function, typeof(WriteFunction)); + + writeFunction(this, data); + } + } +} Modified: freeswitch/trunk/src/dotnet/Types/TextChannel.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Types/TextChannel.cs (original) +++ freeswitch/trunk/src/dotnet/Types/TextChannel.cs Sat Sep 16 23:30:31 2006 @@ -28,15 +28,15 @@ * * TextChannel.cs -- * - */ -using System; - -namespace FreeSwitch.NET.Types -{ - public enum TextChannel - { - ChannelIdConsole, - ChannelIdConsoleClean, - ChannelIdEvent - } -} + */ +using System; + +namespace FreeSwitch.Types +{ + public enum TextChannel + { + ChannelIdConsole, + ChannelIdConsoleClean, + ChannelIdEvent + } +}

1 0

[commit] r2719 - freeswitch/trunk
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: mikej Date: Sat Sep 16 23:22:33 2006 New Revision: 2719 Modified: freeswitch/trunk/Freeswitch.sln Log: make sofia build by default in msvc build. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Sat Sep 16 23:22:33 2006 @@ -901,6 +901,7 @@ {204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.Build.0 = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Debug|Win32.ActiveCfg = Debug|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.ActiveCfg = Release|Win32 + {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.Build.0 = Release|Win32 {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Debug|Win32.ActiveCfg = Debug|Win32 {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Debug|Win32.Build.0 = Debug|Win32 {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Release|Win32.ActiveCfg = Release|Win32

1 0

[commit] r2718 - freeswitch/trunk/src/mod/languages/mod_php
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: brian Date: Sat Sep 16 21:35:17 2006 New Revision: 2718 Added: freeswitch/trunk/src/mod/languages/mod_php/mod_php.c - copied unchanged from r2717, /freeswitch/trunk/src/mod/languages/mod_php/mod_freehp.c Removed: freeswitch/trunk/src/mod/languages/mod_php/mod_freehp.c Log:

1 0