From a7d75db50bca9f508fc2e725eea0b6d04b9df0d1 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 7 Dec 2011 05:15:39 -0600 Subject: [PATCH] revert --- wrong you cant tell if you have modem support unless you include the file --- src/mod/applications/mod_spandsp/mod_spandsp.c | 6 ++---- src/mod/applications/mod_spandsp/mod_spandsp_modem.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mod/applications/mod_spandsp/mod_spandsp.c b/src/mod/applications/mod_spandsp/mod_spandsp.c index 58ce00a92c..a5730a73f7 100644 --- a/src/mod/applications/mod_spandsp/mod_spandsp.c +++ b/src/mod/applications/mod_spandsp/mod_spandsp.c @@ -533,9 +533,9 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_spandsp_init) /* Not such severe to prevent loading */ } - //#if defined(MODEM_SUPPORT) + modem_global_init(module_interface, pool); - //#endif + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mod_spandsp loaded, using spandsp library version [%s]\n", SPANDSP_RELEASE_DATETIME_STRING); return SWITCH_STATUS_SUCCESS; @@ -547,9 +547,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spandsp_shutdown) mod_spandsp_fax_shutdown(); mod_spandsp_dsp_shutdown(); -#if defined(MODEM_SUPPORT) modem_global_shutdown(); -#endif if (spandsp_globals.tones) { switch_core_hash_destroy(&spandsp_globals.tones); diff --git a/src/mod/applications/mod_spandsp/mod_spandsp_modem.h b/src/mod/applications/mod_spandsp/mod_spandsp_modem.h index 1555c9e92b..7e89a9edc7 100644 --- a/src/mod/applications/mod_spandsp/mod_spandsp_modem.h +++ b/src/mod/applications/mod_spandsp/mod_spandsp_modem.h @@ -31,8 +31,8 @@ * */ -#if defined(HAVE_OPENPTY) || defined(HAVE_DEV_PTMX) || defined(HAVE_POSIX_OPENPT) #include "switch_private.h" +#if defined(HAVE_OPENPTY) || defined(HAVE_DEV_PTMX) || defined(HAVE_POSIX_OPENPT) #define MODEM_SUPPORT 1 #if !defined(HAVE_POSIX_OPENPT) && !defined(HAVE_DEV_PTMX) #define USE_OPENPTY 1