提交 71122959 authored 作者: Michael Jerris's avatar Michael Jerris

make stub copies of mod_say_en to use as working copies for dem es, fr, it and nl.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5945 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 5884f348
差异被折叠。
......@@ -54,4 +54,9 @@ xml_int/mod_xml_rpc
#xml_int/mod_xml_curl
xml_int/mod_xml_cdr
say/mod_say_en
#say/mod_say_de
#say/mod_say_es
#say/mod_say_fr
#say/mod_say_it
#say/mod_say_nl
......@@ -40,7 +40,7 @@
* Anthony Minessale II <anthmct@yahoo.com>
* Michael B. Murdock <mike@mmurdock.org>
*
* mod_say_en.c -- Say for English
* mod_say_de.c -- Say for German
*
*/
......@@ -48,14 +48,14 @@
#include <math.h>
#include <ctype.h>
SWITCH_MODULE_LOAD_FUNCTION(mod_say_en_load);
SWITCH_MODULE_DEFINITION(mod_say_en, mod_say_en_load, NULL, NULL);
SWITCH_MODULE_LOAD_FUNCTION(mod_say_de_load);
SWITCH_MODULE_DEFINITION(mod_say_de, mod_say_de_load, NULL, NULL);
#define say_num(num, t) { \
char tmp[80];\
switch_status_t status;\
snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \
if ((status = en_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\
if ((status = de_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\
return status;\
}}\
......@@ -71,7 +71,7 @@ SWITCH_MODULE_DEFINITION(mod_say_en, mod_say_en_load, NULL, NULL);
}}\
static switch_status_t en_spell(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
static switch_status_t de_spell(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
char *p;
......@@ -166,7 +166,7 @@ static char *strip_nonnumerics(char *in, char *out, switch_size_t len)
return ret;
}
static switch_status_t en_say_general_count(switch_core_session_t *session,
static switch_status_t de_say_general_count(switch_core_session_t *session,
char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
switch_channel_t *channel;
......@@ -227,7 +227,7 @@ static switch_status_t en_say_general_count(switch_core_session_t *session,
}
static switch_status_t en_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
static switch_status_t de_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
char *a, *b, *c, *d;
switch_status_t status = SWITCH_STATUS_SUCCESS;
......@@ -270,7 +270,7 @@ static switch_status_t en_ip(switch_core_session_t *session, char *tosay, switch
}
static switch_status_t en_say_time(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
static switch_status_t de_say_time(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
switch_input_args_t *args)
{
int32_t t;
......@@ -417,7 +417,7 @@ static switch_status_t en_say_time(switch_core_session_t *session, char *tosay,
}
static switch_status_t en_say_money(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
static switch_status_t de_say_money(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
switch_input_args_t *args)
{
switch_channel_t *channel;
......@@ -456,7 +456,7 @@ static switch_status_t en_say_money(switch_core_session_t *session, char *tosay,
}
/* Say dollar amount */
en_say_general_count(session, dollars, type, method, args);
de_say_general_count(session, dollars, type, method, args);
if (atoi(dollars) == 1) {
say_file("currency/dollar.wav");
} else {
......@@ -468,7 +468,7 @@ static switch_status_t en_say_money(switch_core_session_t *session, char *tosay,
/* Say cents */
if (cents) {
en_say_general_count(session, cents, type, method, args);
de_say_general_count(session, cents, type, method, args);
if (atoi(cents) == 1) {
say_file("currency/cent.wav");
} else {
......@@ -484,7 +484,7 @@ static switch_status_t en_say_money(switch_core_session_t *session, char *tosay,
static switch_status_t en_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
static switch_status_t de_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
switch_say_callback_t say_cb = NULL;
......@@ -494,23 +494,23 @@ static switch_status_t en_say(switch_core_session_t *session, char *tosay, switc
case SST_ITEMS:
case SST_PERSONS:
case SST_MESSAGES:
say_cb = en_say_general_count;
say_cb = de_say_general_count;
break;
case SST_TIME_MEASUREMENT:
case SST_CURRENT_DATE:
case SST_CURRENT_TIME:
case SST_CURRENT_DATE_TIME:
say_cb = en_say_time;
say_cb = de_say_time;
break;
case SST_IP_ADDRESS:
say_cb = en_ip;
say_cb = de_ip;
break;
case SST_NAME_SPELLED:
case SST_NAME_PHONETIC:
say_cb = en_spell;
say_cb = de_spell;
break;
case SST_CURRENCY:
say_cb = en_say_money;
say_cb = de_say_money;
break;
default:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown Say type=[%d]\n", type);
......@@ -524,14 +524,14 @@ static switch_status_t en_say(switch_core_session_t *session, char *tosay, switc
return SWITCH_STATUS_FALSE;
}
SWITCH_MODULE_LOAD_FUNCTION(mod_say_en_load)
SWITCH_MODULE_LOAD_FUNCTION(mod_say_de_load)
{
switch_say_interface_t *say_interface;
/* connect my internal structure to the blank pointer passed to me */
*module_interface = switch_loadable_module_create_module_interface(pool, modname);
say_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_SAY_INTERFACE);
say_interface->interface_name = "en";
say_interface->say_function = en_say;
say_interface->interface_name = "de";
say_interface->say_function = de_say;
/* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS;
......
......@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="mod_say_en"
ProjectGUID="{988CACF7-3FCB-4992-BE69-77872AE67DC8}"
RootNamespace="mod_say_en"
Name="mod_say_de"
ProjectGUID="{5BC072DB-3826-48EA-AF34-FE32AA01E83B}"
RootNamespace="mod_say_de"
Keyword="Win32Proj"
>
<Platforms>
......@@ -69,7 +69,7 @@
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/mod_say_en.lib"
ImportLibrary="$(OutDir)/mod_say_de.lib"
TargetMachine="1"
/>
<Tool
......@@ -150,7 +150,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/mod_say_en.lib"
ImportLibrary="$(OutDir)/mod_say_de.lib"
TargetMachine="1"
/>
<Tool
......@@ -188,7 +188,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\mod_say_en.c"
RelativePath=".\mod_say_de.c"
>
</File>
</Filter>
......
......@@ -40,7 +40,7 @@
* Anthony Minessale II <anthmct@yahoo.com>
* Michael B. Murdock <mike@mmurdock.org>
*
* mod_say_en.c -- Say for English
* mod_say_es.c -- Say for English
*
*/
......@@ -48,14 +48,14 @@
#include <math.h>
#include <ctype.h>
SWITCH_MODULE_LOAD_FUNCTION(mod_say_en_load);
SWITCH_MODULE_DEFINITION(mod_say_en, mod_say_en_load, NULL, NULL);
SWITCH_MODULE_LOAD_FUNCTION(mod_say_es_load);
SWITCH_MODULE_DEFINITION(mod_say_es, mod_say_es_load, NULL, NULL);
#define say_num(num, t) { \
char tmp[80];\
switch_status_t status;\
snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \
if ((status = en_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\
if ((status = es_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\
return status;\
}}\
......@@ -71,7 +71,7 @@ SWITCH_MODULE_DEFINITION(mod_say_en, mod_say_en_load, NULL, NULL);
}}\
static switch_status_t en_spell(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
static switch_status_t es_spell(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
char *p;
......@@ -166,7 +166,7 @@ static char *strip_nonnumerics(char *in, char *out, switch_size_t len)
return ret;
}
static switch_status_t en_say_general_count(switch_core_session_t *session,
static switch_status_t es_say_general_count(switch_core_session_t *session,
char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
switch_channel_t *channel;
......@@ -227,7 +227,7 @@ static switch_status_t en_say_general_count(switch_core_session_t *session,
}
static switch_status_t en_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
static switch_status_t es_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
char *a, *b, *c, *d;
switch_status_t status = SWITCH_STATUS_SUCCESS;
......@@ -270,7 +270,7 @@ static switch_status_t en_ip(switch_core_session_t *session, char *tosay, switch
}
static switch_status_t en_say_time(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
static switch_status_t es_say_time(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
switch_input_args_t *args)
{
int32_t t;
......@@ -417,7 +417,7 @@ static switch_status_t en_say_time(switch_core_session_t *session, char *tosay,
}
static switch_status_t en_say_money(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
static switch_status_t es_say_money(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
switch_input_args_t *args)
{
switch_channel_t *channel;
......@@ -456,7 +456,7 @@ static switch_status_t en_say_money(switch_core_session_t *session, char *tosay,
}
/* Say dollar amount */
en_say_general_count(session, dollars, type, method, args);
es_say_general_count(session, dollars, type, method, args);
if (atoi(dollars) == 1) {
say_file("currency/dollar.wav");
} else {
......@@ -468,7 +468,7 @@ static switch_status_t en_say_money(switch_core_session_t *session, char *tosay,
/* Say cents */
if (cents) {
en_say_general_count(session, cents, type, method, args);
es_say_general_count(session, cents, type, method, args);
if (atoi(cents) == 1) {
say_file("currency/cent.wav");
} else {
......@@ -484,7 +484,7 @@ static switch_status_t en_say_money(switch_core_session_t *session, char *tosay,
static switch_status_t en_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
static switch_status_t es_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
switch_say_callback_t say_cb = NULL;
......@@ -494,23 +494,23 @@ static switch_status_t en_say(switch_core_session_t *session, char *tosay, switc
case SST_ITEMS:
case SST_PERSONS:
case SST_MESSAGES:
say_cb = en_say_general_count;
say_cb = es_say_general_count;
break;
case SST_TIME_MEASUREMENT:
case SST_CURRENT_DATE:
case SST_CURRENT_TIME:
case SST_CURRENT_DATE_TIME:
say_cb = en_say_time;
say_cb = es_say_time;
break;
case SST_IP_ADDRESS:
say_cb = en_ip;
say_cb = es_ip;
break;
case SST_NAME_SPELLED:
case SST_NAME_PHONETIC:
say_cb = en_spell;
say_cb = es_spell;
break;
case SST_CURRENCY:
say_cb = en_say_money;
say_cb = es_say_money;
break;
default:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown Say type=[%d]\n", type);
......@@ -524,14 +524,14 @@ static switch_status_t en_say(switch_core_session_t *session, char *tosay, switc
return SWITCH_STATUS_FALSE;
}
SWITCH_MODULE_LOAD_FUNCTION(mod_say_en_load)
SWITCH_MODULE_LOAD_FUNCTION(mod_say_es_load)
{
switch_say_interface_t *say_interface;
/* connect my internal structure to the blank pointer passed to me */
*module_interface = switch_loadable_module_create_module_interface(pool, modname);
say_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_SAY_INTERFACE);
say_interface->interface_name = "en";
say_interface->say_function = en_say;
say_interface->interface_name = "es";
say_interface->say_function = es_say;
/* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS;
......
......@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="mod_say_en"
ProjectGUID="{988CACF7-3FCB-4992-BE69-77872AE67DC8}"
RootNamespace="mod_say_en"
Name="mod_say_es"
ProjectGUID="{FA429E98-8B03-45E6-A096-A4BC5E821DE4}"
RootNamespace="mod_say_es"
Keyword="Win32Proj"
>
<Platforms>
......@@ -69,7 +69,7 @@
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/mod_say_en.lib"
ImportLibrary="$(OutDir)/mod_say_es.lib"
TargetMachine="1"
/>
<Tool
......@@ -150,7 +150,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/mod_say_en.lib"
ImportLibrary="$(OutDir)/mod_say_es.lib"
TargetMachine="1"
/>
<Tool
......@@ -188,7 +188,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\mod_say_en.c"
RelativePath=".\mod_say_es.c"
>
</File>
</Filter>
......
......@@ -40,7 +40,7 @@
* Anthony Minessale II <anthmct@yahoo.com>
* Michael B. Murdock <mike@mmurdock.org>
*
* mod_say_en.c -- Say for English
* mod_say_fr.c -- Say for English
*
*/
......@@ -48,14 +48,14 @@
#include <math.h>
#include <ctype.h>
SWITCH_MODULE_LOAD_FUNCTION(mod_say_en_load);
SWITCH_MODULE_DEFINITION(mod_say_en, mod_say_en_load, NULL, NULL);
SWITCH_MODULE_LOAD_FUNCTION(mod_say_fr_load);
SWITCH_MODULE_DEFINITION(mod_say_fr, mod_say_fr_load, NULL, NULL);
#define say_num(num, t) { \
char tmp[80];\
switch_status_t status;\
snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \
if ((status = en_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\
if ((status = fr_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\
return status;\
}}\
......@@ -71,7 +71,7 @@ SWITCH_MODULE_DEFINITION(mod_say_en, mod_say_en_load, NULL, NULL);
}}\
static switch_status_t en_spell(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
static switch_status_t fr_spell(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
char *p;
......@@ -166,7 +166,7 @@ static char *strip_nonnumerics(char *in, char *out, switch_size_t len)
return ret;
}
static switch_status_t en_say_general_count(switch_core_session_t *session,
static switch_status_t fr_say_general_count(switch_core_session_t *session,
char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
switch_channel_t *channel;
......@@ -227,7 +227,7 @@ static switch_status_t en_say_general_count(switch_core_session_t *session,
}
static switch_status_t en_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
static switch_status_t fr_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
char *a, *b, *c, *d;
switch_status_t status = SWITCH_STATUS_SUCCESS;
......@@ -270,7 +270,7 @@ static switch_status_t en_ip(switch_core_session_t *session, char *tosay, switch
}
static switch_status_t en_say_time(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
static switch_status_t fr_say_time(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
switch_input_args_t *args)
{
int32_t t;
......@@ -417,7 +417,7 @@ static switch_status_t en_say_time(switch_core_session_t *session, char *tosay,
}
static switch_status_t en_say_money(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
static switch_status_t fr_say_money(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
switch_input_args_t *args)
{
switch_channel_t *channel;
......@@ -456,7 +456,7 @@ static switch_status_t en_say_money(switch_core_session_t *session, char *tosay,
}
/* Say dollar amount */
en_say_general_count(session, dollars, type, method, args);
fr_say_general_count(session, dollars, type, method, args);
if (atoi(dollars) == 1) {
say_file("currency/dollar.wav");
} else {
......@@ -468,7 +468,7 @@ static switch_status_t en_say_money(switch_core_session_t *session, char *tosay,
/* Say cents */
if (cents) {
en_say_general_count(session, cents, type, method, args);
fr_say_general_count(session, cents, type, method, args);
if (atoi(cents) == 1) {
say_file("currency/cent.wav");
} else {
......@@ -484,7 +484,7 @@ static switch_status_t en_say_money(switch_core_session_t *session, char *tosay,
static switch_status_t en_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
static switch_status_t fr_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
switch_say_callback_t say_cb = NULL;
......@@ -494,23 +494,23 @@ static switch_status_t en_say(switch_core_session_t *session, char *tosay, switc
case SST_ITEMS:
case SST_PERSONS:
case SST_MESSAGES:
say_cb = en_say_general_count;
say_cb = fr_say_general_count;
break;
case SST_TIME_MEASUREMENT:
case SST_CURRENT_DATE:
case SST_CURRENT_TIME:
case SST_CURRENT_DATE_TIME:
say_cb = en_say_time;
say_cb = fr_say_time;
break;
case SST_IP_ADDRESS:
say_cb = en_ip;
say_cb = fr_ip;
break;
case SST_NAME_SPELLED:
case SST_NAME_PHONETIC:
say_cb = en_spell;
say_cb = fr_spell;
break;
case SST_CURRENCY:
say_cb = en_say_money;
say_cb = fr_say_money;
break;
default:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown Say type=[%d]\n", type);
......@@ -524,14 +524,14 @@ static switch_status_t en_say(switch_core_session_t *session, char *tosay, switc
return SWITCH_STATUS_FALSE;
}
SWITCH_MODULE_LOAD_FUNCTION(mod_say_en_load)
SWITCH_MODULE_LOAD_FUNCTION(mod_say_fr_load)
{
switch_say_interface_t *say_interface;
/* connect my internal structure to the blank pointer passed to me */
*module_interface = switch_loadable_module_create_module_interface(pool, modname);
say_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_SAY_INTERFACE);
say_interface->interface_name = "en";
say_interface->say_function = en_say;
say_interface->interface_name = "fr";
say_interface->say_function = fr_say;
/* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS;
......
......@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="mod_say_en"
ProjectGUID="{988CACF7-3FCB-4992-BE69-77872AE67DC8}"
RootNamespace="mod_say_en"
Name="mod_say_fr"
ProjectGUID="{06E3A538-AB32-44F2-B477-755FF9CB5D37}"
RootNamespace="mod_say_fr"
Keyword="Win32Proj"
>
<Platforms>
......@@ -69,7 +69,7 @@
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/mod_say_en.lib"
ImportLibrary="$(OutDir)/mod_say_fr.lib"
TargetMachine="1"
/>
<Tool
......@@ -150,7 +150,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/mod_say_en.lib"
ImportLibrary="$(OutDir)/mod_say_fr.lib"
TargetMachine="1"
/>
<Tool
......@@ -188,7 +188,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\mod_say_en.c"
RelativePath=".\mod_say_fr.c"
>
</File>
</Filter>
......
......@@ -40,7 +40,7 @@
* Anthony Minessale II <anthmct@yahoo.com>
* Michael B. Murdock <mike@mmurdock.org>
*
* mod_say_en.c -- Say for English
* mod_say_it.c -- Say for English
*
*/
......@@ -48,14 +48,14 @@
#include <math.h>
#include <ctype.h>
SWITCH_MODULE_LOAD_FUNCTION(mod_say_en_load);
SWITCH_MODULE_DEFINITION(mod_say_en, mod_say_en_load, NULL, NULL);
SWITCH_MODULE_LOAD_FUNCTION(mod_say_it_load);
SWITCH_MODULE_DEFINITION(mod_say_it, mod_say_it_load, NULL, NULL);
#define say_num(num, t) { \
char tmp[80];\
switch_status_t status;\
snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \
if ((status = en_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\
if ((status = it_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\
return status;\
}}\
......@@ -71,7 +71,7 @@ SWITCH_MODULE_DEFINITION(mod_say_en, mod_say_en_load, NULL, NULL);
}}\
static switch_status_t en_spell(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
static switch_status_t it_spell(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
char *p;
......@@ -166,7 +166,7 @@ static char *strip_nonnumerics(char *in, char *out, switch_size_t len)
return ret;
}
static switch_status_t en_say_general_count(switch_core_session_t *session,
static switch_status_t it_say_general_count(switch_core_session_t *session,
char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
switch_channel_t *channel;
......@@ -227,7 +227,7 @@ static switch_status_t en_say_general_count(switch_core_session_t *session,
}
static switch_status_t en_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
static switch_status_t it_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
char *a, *b, *c, *d;
switch_status_t status = SWITCH_STATUS_SUCCESS;
......@@ -270,7 +270,7 @@ static switch_status_t en_ip(switch_core_session_t *session, char *tosay, switch
}
static switch_status_t en_say_time(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
static switch_status_t it_say_time(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
switch_input_args_t *args)
{
int32_t t;
......@@ -417,7 +417,7 @@ static switch_status_t en_say_time(switch_core_session_t *session, char *tosay,
}
static switch_status_t en_say_money(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
static switch_status_t it_say_money(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
switch_input_args_t *args)
{
switch_channel_t *channel;
......@@ -456,7 +456,7 @@ static switch_status_t en_say_money(switch_core_session_t *session, char *tosay,
}
/* Say dollar amount */
en_say_general_count(session, dollars, type, method, args);
it_say_general_count(session, dollars, type, method, args);
if (atoi(dollars) == 1) {
say_file("currency/dollar.wav");
} else {
......@@ -468,7 +468,7 @@ static switch_status_t en_say_money(switch_core_session_t *session, char *tosay,
/* Say cents */
if (cents) {
en_say_general_count(session, cents, type, method, args);
it_say_general_count(session, cents, type, method, args);
if (atoi(cents) == 1) {
say_file("currency/cent.wav");
} else {
......@@ -484,7 +484,7 @@ static switch_status_t en_say_money(switch_core_session_t *session, char *tosay,
static switch_status_t en_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
static switch_status_t it_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
{
switch_say_callback_t say_cb = NULL;
......@@ -494,23 +494,23 @@ static switch_status_t en_say(switch_core_session_t *session, char *tosay, switc
case SST_ITEMS:
case SST_PERSONS:
case SST_MESSAGES:
say_cb = en_say_general_count;
say_cb = it_say_general_count;
break;
case SST_TIME_MEASUREMENT:
case SST_CURRENT_DATE:
case SST_CURRENT_TIME:
case SST_CURRENT_DATE_TIME:
say_cb = en_say_time;
say_cb = it_say_time;
break;
case SST_IP_ADDRESS:
say_cb = en_ip;
say_cb = it_ip;
break;
case SST_NAME_SPELLED:
case SST_NAME_PHONETIC:
say_cb = en_spell;
say_cb = it_spell;
break;
case SST_CURRENCY:
say_cb = en_say_money;
say_cb = it_say_money;
break;
default:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown Say type=[%d]\n", type);
......@@ -524,14 +524,14 @@ static switch_status_t en_say(switch_core_session_t *session, char *tosay, switc
return SWITCH_STATUS_FALSE;
}
SWITCH_MODULE_LOAD_FUNCTION(mod_say_en_load)
SWITCH_MODULE_LOAD_FUNCTION(mod_say_it_load)
{
switch_say_interface_t *say_interface;
/* connect my internal structure to the blank pointer passed to me */
*module_interface = switch_loadable_module_create_module_interface(pool, modname);
say_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_SAY_INTERFACE);
say_interface->interface_name = "en";
say_interface->say_function = en_say;
say_interface->interface_name = "it";
say_interface->say_function = it_say;
/* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS;
......
......@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="mod_say_en"
ProjectGUID="{988CACF7-3FCB-4992-BE69-77872AE67DC8}"
RootNamespace="mod_say_en"
Name="mod_say_it"
ProjectGUID="{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}"
RootNamespace="mod_say_it"
Keyword="Win32Proj"
>
<Platforms>
......@@ -69,7 +69,7 @@
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/mod_say_en.lib"
ImportLibrary="$(OutDir)/mod_say_it.lib"
TargetMachine="1"
/>
<Tool
......@@ -150,7 +150,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/mod_say_en.lib"
ImportLibrary="$(OutDir)/mod_say_it.lib"
TargetMachine="1"
/>
<Tool
......@@ -188,7 +188,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\mod_say_en.c"
RelativePath=".\mod_say_it.c"
>
</File>
</Filter>
......
差异被折叠。
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="mod_say_en"
ProjectGUID="{988CACF7-3FCB-4992-BE69-77872AE67DC8}"
RootNamespace="mod_say_en"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/mod_say_en.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/mod_say_en.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\mod_say_en.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
差异被折叠。
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="mod_say_nl"
ProjectGUID="{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}"
RootNamespace="mod_say_nl"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/mod_say_nl.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/mod_say_nl.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\mod_say_nl.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
差异被折叠。
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论