more cleanup before I leave LAX
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7394 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
6862f16196
commit
935cbcf937
|
@ -32,6 +32,7 @@
|
||||||
* switch_ivr_play_say.c -- IVR Library (functions to play or say audio)
|
* switch_ivr_play_say.c -- IVR Library (functions to play or say audio)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
|
|
||||||
static char *SAY_METHOD_NAMES[] = {
|
static char *SAY_METHOD_NAMES[] = {
|
||||||
|
@ -64,7 +65,6 @@ static char *SAY_TYPE_NAMES[] = {
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static switch_say_method_t get_say_method_by_name(char *name)
|
static switch_say_method_t get_say_method_by_name(char *name)
|
||||||
{
|
{
|
||||||
int x = 0;
|
int x = 0;
|
||||||
|
@ -89,7 +89,6 @@ static switch_say_type_t get_say_type_by_name(char *name)
|
||||||
return (switch_say_type_t) x;
|
return (switch_say_type_t) x;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *session, const char *macro_name, const char *data, const char *lang,
|
SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *session, const char *macro_name, const char *data, const char *lang,
|
||||||
switch_input_args_t *args)
|
switch_input_args_t *args)
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
* switch_loadable_module.c -- Loadable Modules
|
* switch_loadable_module.c -- Loadable Modules
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
|
|
||||||
/* for apr_pstrcat */
|
/* for apr_pstrcat */
|
||||||
|
|
|
@ -29,10 +29,10 @@
|
||||||
* switch_log.c -- Logging
|
* switch_log.c -- Logging
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
#include "private/switch_core_pvt.h"
|
#include "private/switch_core_pvt.h"
|
||||||
|
|
||||||
|
|
||||||
static const char *LEVELS[] = {
|
static const char *LEVELS[] = {
|
||||||
"CONSOLE",
|
"CONSOLE",
|
||||||
"ALERT",
|
"ALERT",
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
* switch_odbc.c -- ODBC
|
* switch_odbc.c -- ODBC
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
#include <switch_odbc.h>
|
#include <switch_odbc.h>
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
#include <pcre.h>
|
#include <pcre.h>
|
||||||
|
|
||||||
|
|
||||||
SWITCH_DECLARE(switch_regex_t *) switch_regex_compile(const char *pattern,
|
SWITCH_DECLARE(switch_regex_t *) switch_regex_compile(const char *pattern,
|
||||||
int options, const char **errorptr, int *erroroffset,
|
int options, const char **errorptr, int *erroroffset,
|
||||||
const unsigned char *tables)
|
const unsigned char *tables)
|
||||||
|
@ -43,7 +42,6 @@ return pcre_compile(pattern, options, errorptr, erroroffset, tables);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SWITCH_DECLARE(int) switch_regex_copy_substring(const char *subject, int *ovector, int stringcount, int stringnumber, char *buffer, int size)
|
SWITCH_DECLARE(int) switch_regex_copy_substring(const char *subject, int *ovector, int stringcount, int stringnumber, char *buffer, int size)
|
||||||
{
|
{
|
||||||
return pcre_copy_substring(subject, ovector, stringcount, stringnumber, buffer, size);
|
return pcre_copy_substring(subject, ovector, stringcount, stringnumber, buffer, size);
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
* switch_caller.c -- Caller Identification
|
* switch_caller.c -- Caller Identification
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
#include <switch_resample.h>
|
#include <switch_resample.h>
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
|
@ -50,8 +51,6 @@
|
||||||
#define MAX(a,b) ((a) > (b) ? (a) : (b))
|
#define MAX(a,b) ((a) > (b) ? (a) : (b))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
SWITCH_DECLARE(switch_status_t) switch_resample_create(switch_audio_resampler_t **new_resampler,
|
SWITCH_DECLARE(switch_status_t) switch_resample_create(switch_audio_resampler_t **new_resampler,
|
||||||
int from_rate, switch_size_t from_size, int to_rate, uint32_t to_size, switch_memory_pool_t *pool)
|
int from_rate, switch_size_t from_size, int to_rate, uint32_t to_size, switch_memory_pool_t *pool)
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,8 +29,8 @@
|
||||||
* switch_scheduler.c -- Switch Scheduler
|
* switch_scheduler.c -- Switch Scheduler
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include <switch.h>
|
|
||||||
|
|
||||||
|
#include <switch.h>
|
||||||
|
|
||||||
struct switch_scheduler_task_container {
|
struct switch_scheduler_task_container {
|
||||||
switch_scheduler_task_t task;
|
switch_scheduler_task_t task;
|
||||||
|
@ -45,7 +45,6 @@ struct switch_scheduler_task_container {
|
||||||
};
|
};
|
||||||
typedef struct switch_scheduler_task_container switch_scheduler_task_container_t;
|
typedef struct switch_scheduler_task_container switch_scheduler_task_container_t;
|
||||||
|
|
||||||
|
|
||||||
static struct {
|
static struct {
|
||||||
switch_scheduler_task_container_t *task_list;
|
switch_scheduler_task_container_t *task_list;
|
||||||
switch_mutex_t *task_mutex;
|
switch_mutex_t *task_mutex;
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
* switch_stun.c STUN (Simple Traversal of UDP over NAT)
|
* switch_stun.c STUN (Simple Traversal of UDP over NAT)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
#include <switch_stun.h>
|
#include <switch_stun.h>
|
||||||
|
|
||||||
|
|
|
@ -34,8 +34,6 @@
|
||||||
#pragma warning (disable:1418)
|
#pragma warning (disable:1418)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#include <php.h>
|
#include <php.h>
|
||||||
#pragma comment(lib, PHP_LIB)
|
#pragma comment(lib, PHP_LIB)
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
* softtimer.c -- Software Timer Module
|
* softtimer.c -- Software Timer Module
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "private/switch_core_pvt.h"
|
#include "private/switch_core_pvt.h"
|
||||||
|
@ -39,7 +40,6 @@
|
||||||
|
|
||||||
#define MAX_TICK UINT32_MAX - 1024
|
#define MAX_TICK UINT32_MAX - 1024
|
||||||
|
|
||||||
|
|
||||||
static switch_memory_pool_t *module_pool = NULL;
|
static switch_memory_pool_t *module_pool = NULL;
|
||||||
|
|
||||||
static struct {
|
static struct {
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
* switch_utils.c -- Compatability and Helper Code
|
* switch_utils.c -- Compatability and Helper Code
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
Loading…
Reference in New Issue