FS-9924: Removed extra space in source files

This commit is contained in:
Sergey Safarov committed 2017-02-09 23:59:49 -05:00
1 parent 60d4e87487
commit df1ab07ca4
455 files changed
+9699 -9698

No files matched your search

+18 -18
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Michael B. Murdock <mike@mmurdock.org>
* Daniel Swarbrick <daniel.swarbrick@gmail.com>
@@ -102,14 +102,14 @@ static switch_status_t play_group(switch_say_method_t method, switch_say_gender_
say_file("digits/1_n.wav");
} else {
say_file("digits/%d.wav", c);
}
}
say_file("currency/and.wav");
}
if (method == SSM_COUNTED) {
if ( gender == SSG_MASCULINE ) {
say_file("digits/h-%d0_m.wav", b);
say_file("digits/h-%d0_m.wav", b);
} else if ( gender == SSG_NEUTER ) {
say_file("digits/h-%d0_n.wav", b);
say_file("digits/h-%d0_n.wav", b);
} else {
say_file("digits/h-%d0.wav", b);
}
@@ -119,9 +119,9 @@ static switch_status_t play_group(switch_say_method_t method, switch_say_gender_
} else {
if (method == SSM_COUNTED) {
if ( gender == SSG_MASCULINE ) {
say_file("digits/h-%d%d_m.wav", b,c);
say_file("digits/h-%d%d_m.wav", b,c);
} else if ( gender == SSG_NEUTER ) {
say_file("digits/h-%d%d_n.wav", b,c);
say_file("digits/h-%d%d_n.wav", b,c);
} else {
say_file("digits/h-%d%d.wav", b,c);
}
@@ -135,16 +135,16 @@ static switch_status_t play_group(switch_say_method_t method, switch_say_gender_
if (c) {
if (method == SSM_COUNTED) {
if ( gender == SSG_MASCULINE ) {
say_file("digits/h-%d_m.wav", c);
say_file("digits/h-%d_m.wav", c);
} else if ( gender == SSG_NEUTER ) {
say_file("digits/h-%d_n.wav", c);
say_file("digits/h-%d_n.wav", c);
} else {
say_file("digits/h-%d.wav", c);
}
} else {
/*"one" used as an article is feminine or masculine in german, e.g. voicemail-message is feminine
only applies to the likes of 1, 101, 1001 etc.*/
if ( b == 0 && c == 1 && gender == SSG_FEMININE ) {
if ( b == 0 && c == 1 && gender == SSG_FEMININE ) {
say_file("digits/1_f.wav");
} else if ( b == 0 && c == 1 && what ) {
say_file("digits/1_n.wav");
@@ -393,7 +393,7 @@ static switch_status_t de_say_time(switch_core_session_t *session, char *tosay,
if (say_dow) {
say_file("time/day-%d.wav", tm.tm_wday);
}
if (say_month) {
say_file("time/mon-%d.wav", tm.tm_mon);
}
@@ -426,7 +426,7 @@ static switch_status_t de_say_time(switch_core_session_t *session, char *tosay,
}
say_file("time/oclock.wav");
if (tm.tm_min < 10) {
say_file("digits/0.wav");
say_num(tm.tm_min, SSM_PRONOUNCED);
@@ -470,7 +470,7 @@ static switch_status_t de_say_money(switch_core_session_t *session, char *tosay,
dollars++;
}
/* Say dollar amount */
if (atoi(dollars) == 1) {
say_file("digits/1_n.wav");
+18 -18
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Michael B. Murdock <mike@mmurdock.org>
*
@@ -140,7 +140,7 @@ static switch_status_t en_say_general_count(switch_say_file_handle_t *sh, char *
in -= places[(uint32_t) x] * num;
}
}
switch (say_args->method) {
case SSM_PRONOUNCED_YEAR:
@@ -190,7 +190,7 @@ static switch_status_t en_say_time(switch_say_file_handle_t *sh, char *tosay, sw
uint8_t say_date = 0, say_time = 0, say_year = 0, say_month = 0, say_dow = 0, say_day = 0, say_yesterday = 0, say_today = 0;
const char *tz = NULL;
tz = switch_say_file_handle_get_variable(sh, "timezone");
tz = switch_say_file_handle_get_variable(sh, "timezone");
if (say_args->type == SST_TIME_MEASUREMENT) {
@@ -319,8 +319,8 @@ static switch_status_t en_say_time(switch_say_file_handle_t *sh, char *tosay, sw
case SST_SHORT_DATE_TIME:
say_time = 1;
//Time is in the future
if ((tm.tm_year > tm_now.tm_year) ||
(tm.tm_year == tm_now.tm_year && tm.tm_mon > tm_now.tm_mon) ||
if ((tm.tm_year > tm_now.tm_year) ||
(tm.tm_year == tm_now.tm_year && tm.tm_mon > tm_now.tm_mon) ||
(tm.tm_year == tm_now.tm_year && tm.tm_mon == tm_now.tm_mon && tm.tm_mday > tm_now.tm_mday))
{
say_date = 1;
@@ -504,11 +504,11 @@ static switch_status_t en_say_money(switch_say_file_handle_t *sh, char *tosay, s
static switch_status_t say_ip(switch_say_file_handle_t *sh,
char *tosay,
switch_say_args_t *say_args)
{
char *a, *b, *c, *d;
switch_status_t status = SWITCH_STATUS_FALSE;
if (!(a = strdup(tosay))) {
abort();
}
@@ -540,7 +540,7 @@ static switch_status_t say_ip(switch_say_file_handle_t *sh,
say_num(sh, atoi(d), say_args->method);
end:
free(a);
return status;
@@ -636,14 +636,14 @@ static switch_status_t run_callback(switch_new_say_callback_t say_cb, char *tosa
switch_say_file_handle_t *sh;
switch_status_t status = SWITCH_STATUS_FALSE;
switch_event_t *var_event = NULL;
if (session) {
switch_channel_t *channel = switch_core_session_get_channel(session);
switch_channel_get_variables(channel, &var_event);
}
switch_say_file_handle_create(&sh, say_args->ext, &var_event);
status = say_cb(sh, tosay, say_args);
if ((*rstr = switch_say_file_handle_detach_path(sh))) {
@@ -671,7 +671,7 @@ static switch_status_t en_say(switch_core_session_t *session, char *tosay, switc
if (session && string) {
status = switch_ivr_play_file(session, NULL, string, args);
}
switch_safe_free(string);
}
@@ -709,7 +709,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_en_load)
say_interface->interface_name = "en";
say_interface->say_function = en_say;
say_interface->say_string_function = en_say_string;
/* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS;
}
+7 -7
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Michael B. Murdock <mike@mmurdock.org>
* François Delawarde <fdelawarde@wirelessmundi.com>
+18 -18
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Michael B. Murdock <mike@mmurdock.org>
* François Delawarde <fdelawarde@wirelessmundi.com>
@@ -174,7 +174,7 @@ static switch_status_t es_say_general_count(switch_say_file_handle_t *sh, char *
in -= places[(uint32_t) x] * num;
}
}
switch (say_args->method) {
case SSM_PRONOUNCED_YEAR:
@@ -224,7 +224,7 @@ static switch_status_t es_say_time(switch_say_file_handle_t *sh, char *tosay, sw
uint8_t say_date = 0, say_time = 0, say_year = 0, say_month = 0, say_dow = 0, say_day = 0, say_yesterday = 0, say_today = 0;
const char *tz = NULL;
tz = switch_say_file_handle_get_variable(sh, "timezone");
tz = switch_say_file_handle_get_variable(sh, "timezone");
if (say_args->type == SST_TIME_MEASUREMENT) {
int64_t hours = 0;
@@ -341,8 +341,8 @@ static switch_status_t es_say_time(switch_say_file_handle_t *sh, char *tosay, sw
case SST_SHORT_DATE_TIME:
say_time = 1;
//Time is in the future
if ((tm.tm_year > tm_now.tm_year) ||
(tm.tm_year == tm_now.tm_year && tm.tm_mon > tm_now.tm_mon) ||
if ((tm.tm_year > tm_now.tm_year) ||
(tm.tm_year == tm_now.tm_year && tm.tm_mon > tm_now.tm_mon) ||
(tm.tm_year == tm_now.tm_year && tm.tm_mon == tm_now.tm_mon && tm.tm_mday > tm_now.tm_mday))
{
say_date = 1;
@@ -496,11 +496,11 @@ static switch_status_t es_say_money(switch_say_file_handle_t *sh, char *tosay, s
static switch_status_t say_ip(switch_say_file_handle_t *sh,
char *tosay,
switch_say_args_t *say_args)
{
char *a, *b, *c, *d;
switch_status_t status = SWITCH_STATUS_FALSE;
if (!(a = strdup(tosay))) {
abort();
}
@@ -532,7 +532,7 @@ static switch_status_t say_ip(switch_say_file_handle_t *sh,
say_num(sh, atoi(d), say_args->method);
end:
free(a);
return status;
@@ -628,14 +628,14 @@ static switch_status_t run_callback(switch_new_say_callback_t say_cb, char *tosa
switch_say_file_handle_t *sh;
switch_status_t status = SWITCH_STATUS_FALSE;
switch_event_t *var_event = NULL;
if (session) {
switch_channel_t *channel = switch_core_session_get_channel(session);
switch_channel_get_variables(channel, &var_event);
}
switch_say_file_handle_create(&sh, say_args->ext, &var_event);
status = say_cb(sh, tosay, say_args);
if ((*rstr = switch_say_file_handle_detach_path(sh))) {
@@ -663,7 +663,7 @@ static switch_status_t es_say(switch_core_session_t *session, char *tosay, switc
if (session && string) {
status = switch_ivr_play_file(session, NULL, string, args);
}
switch_safe_free(string);
}
@@ -701,7 +701,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_es_ar_load)
say_interface->interface_name = "es_ar";
say_interface->say_function = es_say;
say_interface->say_string_function = es_say_string;
/* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS;
}
+15 -15
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Mahdi Moradi <m.moradi@sepanta.net>
* Babak Yakhchali <b.yakhchali@sepanta.net>
@@ -582,13 +582,13 @@ void gregorian_to_jalali(int *j_y, int *j_m, int *j_d,
int jy, jm, jd;
long g_day_no, j_day_no;
int j_np;
int i;
gy = g_y-1600;
gm = g_m-1;
gd = g_d-1;
g_day_no = 365*gy+(gy+3)/4-(gy+99)/100+(gy+399)/400;
for (i=0;i<gm;++i)
g_day_no += g_days_in_month[i];
@@ -596,20 +596,20 @@ void gregorian_to_jalali(int *j_y, int *j_m, int *j_d,
/* leap and after Feb */
++g_day_no;
g_day_no += gd;
j_day_no = g_day_no-79;
j_np = j_day_no / 12053;
j_day_no %= 12053;
jy = 979+33*j_np+4*(j_day_no/1461);
j_day_no %= 1461;
if (j_day_no >= 366) {
jy += (j_day_no-1)/365;
j_day_no = (j_day_no-1)%365;
}
for (i = 0; i < 11 && j_day_no >= j_days_in_month[i]; ++i) {
j_day_no -= j_days_in_month[i];
}
@@ -651,7 +651,7 @@ void jalali_to_gregorian(int *g_y, int *g_m, int *g_d,
g_day_no--;
gy += 100*(g_day_no/36524); /* 36524 = 365*100 + 100/4 - 100/100 */
g_day_no = g_day_no % 36524;
if (g_day_no >= 365)
g_day_no++;
else
+9 -9
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Michael B. Murdock <mike@mmurdock.org>
* Marc O. Chouinard <mochouinard@moctel.com>
@@ -85,7 +85,7 @@ static switch_status_t play_group(switch_say_method_t method, switch_say_gender_
int ftdNumber = 0;
int itd = (b * 10) + c;
/* Force full 2 digit playback */
/* Force full 2 digit playback */
if (itd <= 19)
ftdNumber = 1;
switch (itd) {
@@ -120,7 +120,7 @@ static switch_status_t play_group(switch_say_method_t method, switch_say_gender_
int fVal = c;
if (ftdNumber == 1)
fVal = itd;
if (method == SSM_COUNTED) {
say_file("digits/h-%d.wav", fVal);
} else {
+87 -87
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2011-2012, Shahar Hadas
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -40,7 +40,7 @@
* the Initial Developers. All Rights Reserved.
*
* Contributor(s):
*
*
* mod_say_he.c -- Say for Hebrew
*
*/
@@ -80,7 +80,7 @@ static switch_status_t play_group(switch_say_method_t method, switch_say_gender_
/* Check for special cases of thousands */
if (range == PGR_THOUSANDS && a == 0) {
/* Check for special cases of 1000, 2000 ... 8000, 9000 */
/* Check for special cases of 1000, 2000 ... 8000, 9000 */
if (b == 0 && c != 0) {
switch_say_file(sh, "digits/%d000", c);
return SWITCH_STATUS_SUCCESS;
@@ -90,16 +90,16 @@ static switch_status_t play_group(switch_say_method_t method, switch_say_gender_
if (b == 1 && c == 0) {
switch_say_file(sh, "digits/10000");
return SWITCH_STATUS_SUCCESS;
}
}
}
/* Check for special case of million */
if (range == PGR_MILLIONS && a == 0 && b == 0 && c == 1) {
switch_say_file(sh, "digits/million");
return SWITCH_STATUS_SUCCESS;
return SWITCH_STATUS_SUCCESS;
}
/* Check for Hebrew SSM_COUNTED special case. Anything above 10 needs to said differently */
/* Check for Hebrew SSM_COUNTED special case. Anything above 10 needs to said differently */
if (method == SSM_COUNTED && range == PGR_HUNDREDS && total <= 10) {
if (b) {
switch_say_file(sh, "digits/h-10%s", gender == SSG_MASCULINE ? "_m" : "");
@@ -111,7 +111,7 @@ static switch_status_t play_group(switch_say_method_t method, switch_say_gender_
/* In Hebrew, hundreds can be said as "<number> hundreds", but the more correct
* form of pronunciation required it to be recorded separately.
* Note that hundreds are always pronounced in SSG_FEMININE form in hebrew, and were recorded as such.
* Note that hundreds are always pronounced in SSG_FEMININE form in hebrew, and were recorded as such.
*/
if (a) {
switch_say_file(sh, "digits/%d00", a);
@@ -129,26 +129,26 @@ static switch_status_t play_group(switch_say_method_t method, switch_say_gender_
case 5:
switch_say_file(sh, "digits/va");
break;
case 2:
case 3:
case 8:
case 9:
case 9:
switch_say_file(sh, "digits/uu");
break;
break;
case 1:
case 4:
case 6:
case 7:
case 7:
switch_say_file(sh, "digits/ve");
break;
break;
default:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "play_group unkonwn digit (%d) Error! (SSG_MASCULINE)\n", c);
break;
}
}
break;
}
}
switch_say_file(sh, "digits/%d%d_m", b, c);
} else {
if ((range == PGR_MILLIONS && a) || (range != PGR_MILLIONS && total > 9)){ /* Check if need to say "and" */
@@ -157,23 +157,23 @@ static switch_status_t play_group(switch_say_method_t method, switch_say_gender_
case 3:
case 7:
case 8:
case 9:
case 9:
switch_say_file(sh, "digits/uu");
break;
break;
case 0:
case 1:
case 4:
case 5:
case 6:
case 6:
switch_say_file(sh, "digits/ve");
break;
break;
default:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "play_group unkonwn digit (%d) Error! (SSG_FEMININE)\n", c);
break;
}
}
break;
}
}
switch_say_file(sh, "digits/%d%d", b, c);
}
c = 0; /* Skip the pronunciation on the c value */
@@ -187,26 +187,26 @@ static switch_status_t play_group(switch_say_method_t method, switch_say_gender_
case 5:
switch_say_file(sh, "digits/va");
break;
case 2:
case 3:
case 8:
case 3:
case 8:
switch_say_file(sh, "digits/uu");
break;
case 1:
case 4:
case 6:
case 7:
case 9:
case 9:
switch_say_file(sh, "digits/ve");
break;
default:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "play_group unkonwn digit (%d) Error! (SSG_MASCULINE)\n", c);
break;
}
}
break;
}
}
switch_say_file(sh, "digits/%d_m", c);
} else {
if ((range == PGR_MILLIONS && (b || a)) || (range != PGR_MILLIONS && total > 9)){ /* Check if need to say "and" */
@@ -215,24 +215,24 @@ static switch_status_t play_group(switch_say_method_t method, switch_say_gender_
case 8:
switch_say_file(sh, "digits/uu");
break;
case 1:
case 3:
case 3:
case 4:
case 5:
case 6:
case 7:
case 9:
case 9:
switch_say_file(sh, "digits/ve");
break;
default:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "play_group unkonwn digit (%d) Error! (SSG_FEMININE)\n", c);
break;
}
}
break;
}
}
switch_say_file(sh, "digits/%d", c);
}
}
}
if (what && (a || b || c)) {
@@ -290,7 +290,7 @@ static switch_status_t he_say_general_count(switch_say_file_handle_t *sh, char *
switch (say_args->method) {
case SSM_COUNTED:
/* TODO add 'ha' (the)? */
case SSM_PRONOUNCED:
case SSM_PRONOUNCED:
if ((status = play_group(SSM_PRONOUNCED, say_args->gender, inCopy, PGR_MILLIONS, places[8], places[7], places[6], "digits/million", sh)) != SWITCH_STATUS_SUCCESS) {
return status;
}
@@ -319,7 +319,7 @@ static switch_status_t he_say_time(switch_say_file_handle_t *sh, char *tosay, sw
uint8_t say_date = 0, say_time = 0, say_year = 0, say_month = 0, say_dow = 0, say_day = 0, say_yesterday = 0, say_today = 0;
const char *tz = NULL;
tz = switch_say_file_handle_get_variable(sh, "timezone");
tz = switch_say_file_handle_get_variable(sh, "timezone");
if (say_args->type == SST_TIME_MEASUREMENT) {
int64_t hours = 0;
@@ -363,7 +363,7 @@ static switch_status_t he_say_time(switch_say_file_handle_t *sh, char *tosay, sw
say_args->gender = SSG_FEMININE;
if (hours) {
if (hours) {
switch_say_file(sh, "time/hour");
say_num(sh, hours, SSM_PRONOUNCED);
} else {
@@ -384,7 +384,7 @@ static switch_status_t he_say_time(switch_say_file_handle_t *sh, char *tosay, sw
switch_say_file(sh, "time/minutes");
}
if (seconds) {
if (seconds) {
if (seconds == 1) {
switch_say_file(sh, "time/second");
say_num(sh, seconds, SSM_PRONOUNCED);
@@ -410,7 +410,7 @@ static switch_status_t he_say_time(switch_say_file_handle_t *sh, char *tosay, sw
if (tz) {
int check = atoi(tz);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Timezone is [%s]\n", tz);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Timezone is [%s]\n", tz);
if (check) {
switch_time_exp_tz(&tm, target, check);
switch_time_exp_tz(&tm_now, target_now, check);
@@ -482,7 +482,7 @@ static switch_status_t he_say_time(switch_say_file_handle_t *sh, char *tosay, sw
if (say_day) {
say_args->gender = SSG_MASCULINE;
say_num(sh, tm.tm_mday, SSM_PRONOUNCED);
}
}
if (say_month) {
switch_say_file(sh, "time/at");
switch_say_file(sh, "time/mon-%d", tm.tm_mon);
@@ -515,7 +515,7 @@ static switch_status_t he_say_time(switch_say_file_handle_t *sh, char *tosay, sw
say_args->gender = SSG_FEMININE;
say_num(sh, hour, SSM_PRONOUNCED);
if (tm.tm_min) {
if (tm.tm_min) {
switch (tm.tm_min) {
case 2:
case 8:
@@ -527,14 +527,14 @@ static switch_status_t he_say_time(switch_say_file_handle_t *sh, char *tosay, sw
case 30:
switch_say_file(sh, "digits/uu");
break;
case 50:
switch_say_file(sh, "digits/va");
break;
default:
switch_say_file(sh, "digits/ve");
break;
break;
}
if (tm.tm_min == 1) {
@@ -542,10 +542,10 @@ static switch_status_t he_say_time(switch_say_file_handle_t *sh, char *tosay, sw
switch_say_file(sh, "digits/1");
} else {
say_num(sh, tm.tm_min, SSM_PRONOUNCED);
switch_say_file(sh, "time/minutes");
}
switch_say_file(sh, "time/minutes");
}
}
switch_say_file(sh, "time/%s", pm ? "p-m" : "a-m");
}
@@ -554,7 +554,7 @@ static switch_status_t he_say_time(switch_say_file_handle_t *sh, char *tosay, sw
static switch_status_t he_say_money(switch_say_file_handle_t *sh, char *tosay, switch_say_args_t *say_args)
{
{
char sbuf[16] = ""; /* enough for 999,999,999,999.99 (w/o the commas or leading $) */
char *currency = NULL;
char *cents = NULL;
@@ -566,7 +566,7 @@ static switch_status_t he_say_money(switch_say_file_handle_t *sh, char *tosay, s
}
currency = sbuf;
if ((cents = strchr(sbuf, '.'))) {
*cents++ = '\0';
if (strlen(cents) > 2) {
@@ -585,31 +585,31 @@ static switch_status_t he_say_money(switch_say_file_handle_t *sh, char *tosay, s
++currency;
}
/* Say shekel amount (Israel currency) */
/* Say shekel amount (Israel currency) */
switch (atoi(currency)) {
case 1:
switch_say_file(sh, "currency/shekel");
switch_say_file(sh, "digits/1_m");
break;
case 2:
/* In the case of 2, because currency, we need a special case of 2 pronunciation */
switch_say_file(sh, "digits/shney");
switch_say_file(sh, "digits/shney");
switch_say_file(sh, "currency/shkalim");
break;
default:
say_args->gender = SSG_MASCULINE;
he_say_general_count(sh, currency, say_args);
switch_say_file(sh, "currency/shkalim");
break;
break;
}
if (cents) {
if (cents) {
/* We need to use the value twice, so speed it up by atoi only once */
icents = atoi(cents);
/* Say "and" */
/* Say "and" */
switch (icents) {
case 2:
case 8:
@@ -621,40 +621,40 @@ static switch_status_t he_say_money(switch_say_file_handle_t *sh, char *tosay, s
case 30:
case 80:
switch_say_file(sh, "digits/uu");
break;
break;
case 50:
switch_say_file(sh, "digits/va");
break;
default:
switch_say_file(sh, "digits/ve");
break;
}
break;
}
/* Say agorot (Israel currency equivalent for "cents") */
switch (icents) {
case 0:
switch_say_file(sh, "digits/0");
switch_say_file(sh, "currency/agorot");
break;
case 1:
switch_say_file(sh, "currency/agora");
switch_say_file(sh, "digits/1");
break;
case 2:
/* In the case of 2, because currency, we need a special case of 2 pronunciation */
switch_say_file(sh, "digits/shtey");
switch_say_file(sh, "digits/shtey");
switch_say_file(sh, "currency/agorot");
break;
default:
say_args->gender = SSG_FEMININE;
he_say_general_count(sh, cents, say_args);
switch_say_file(sh, "currency/agorot");
break;
break;
}
}
@@ -664,11 +664,11 @@ static switch_status_t he_say_money(switch_say_file_handle_t *sh, char *tosay, s
static switch_status_t say_ip(switch_say_file_handle_t *sh,
char *tosay,
switch_say_args_t *say_args)
{
char *a, *b, *c, *d;
switch_status_t status = SWITCH_STATUS_FALSE;
if (!(a = strdup(tosay))) {
abort();
}
@@ -700,7 +700,7 @@ static switch_status_t say_ip(switch_say_file_handle_t *sh,
say_num(sh, atoi(d), say_args->method);
end:
free(a);
return status;
@@ -772,14 +772,14 @@ static switch_status_t run_callback(switch_new_say_callback_t say_cb, char *tosa
switch_say_file_handle_t *sh;
switch_status_t status = SWITCH_STATUS_FALSE;
switch_event_t *var_event = NULL;
if (session) {
switch_channel_t *channel = switch_core_session_get_channel(session);
switch_channel_get_variables(channel, &var_event);
}
switch_say_file_handle_create(&sh, say_args->ext, &var_event);
status = say_cb(sh, tosay, say_args);
if ((*rstr = switch_say_file_handle_detach_path(sh))) {
@@ -808,7 +808,7 @@ static switch_status_t he_say(switch_core_session_t *session, char *tosay, switc
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "** he_say [%s]\n", string);
status = switch_ivr_play_file(session, NULL, string, args);
}
switch_safe_free(string);
}
+108 -108
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,10 +36,10 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Michael B. Murdock <mike@mmurdock.org>
* Tihomir Culjaga <tculjaga@gmail.com>
* Tihomir Culjaga <tculjaga@gmail.com>
*
* mod_say_hr.c -- Say for Croatian
*
@@ -225,13 +225,13 @@ static switch_status_t hr_say_count(switch_core_session_t *session, char* gen,
char tisucu[64] = "";
char tgen[8] = "";
char mgen[8] = "";
int number;
switch_status_t status;
strcpy(tgen, gen);
if (!(tosay = strip_commas(tosay, sbuf, sizeof(sbuf)-1)) || strlen(tosay) > 9) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n");
return SWITCH_STATUS_GENERR;
@@ -256,8 +256,8 @@ static switch_status_t hr_say_count(switch_core_session_t *session, char* gen,
strcpy(milion, "digits/milijun.wav");
else
strcpy(milion, "digits/milijuna.wav");
if (places[4] == 1)
if (places[4] == 1)
{
strcpy(tisucu, "digits/thousands-a.wav");
}
@@ -269,7 +269,7 @@ static switch_status_t hr_say_count(switch_core_session_t *session, char* gen,
strcpy(tisucu, "digits/thousands-a.wav");
strcpy(tgen, "a");
break;
case 5:
case 6:
case 7:
@@ -277,12 +277,12 @@ static switch_status_t hr_say_count(switch_core_session_t *session, char* gen,
case 9:
strcpy(tisucu, "digits/thousands-a.wav");
break;
case 2:
strcpy(tgen, "je");
strcpy(tisucu, "digits/thousands-e.wav");
break;
case 3:
case 4:
strcpy(tisucu, "digits/thousands-e.wav");
@@ -297,7 +297,7 @@ static switch_status_t hr_say_count(switch_core_session_t *session, char* gen,
strcpy(tisucu, "digits/thousands-a.wav");
strcpy(tgen, "a");
break;
case 5:
case 6:
case 7:
@@ -305,12 +305,12 @@ static switch_status_t hr_say_count(switch_core_session_t *session, char* gen,
case 9:
strcpy(tisucu, "digits/thousands-a.wav");
break;
case 2:
strcpy(tisucu, "digits/thousands-e.wav");
strcpy(tgen, "je");
break;
case 3:
case 4:
strcpy(tisucu, "digits/thousands-e.wav");
@@ -318,7 +318,7 @@ static switch_status_t hr_say_count(switch_core_session_t *session, char* gen,
}
}
if ((status =
play_group(SSM_PRONOUNCED, mgen, places[8], places[7], places[6], milion, number, session, args)) != SWITCH_STATUS_SUCCESS) {
return status;
@@ -462,7 +462,7 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
uint8_t say_date = 0, say_time = 0, say_year = 0, say_month = 0, say_dow = 0, say_day = 0, say_yesterday = 0, say_today = 0;
switch_channel_t *channel = switch_core_session_get_channel(session);
const char *tz = switch_channel_get_variable(channel, "timezone");
int sat_desetinka = 0;
int sat_jedinica = 0;
int minuta_desetinka = 0;
@@ -510,14 +510,14 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
}
sat_jedinica = hours % 10;
if (hours > 10)
sat_desetinka = (int) (hours / 10);
if (hours)
if (hours)
{
say_num(hours, SSM_PRONOUNCED, "");
if (sat_desetinka == 0 && sat_jedinica == 0)
{
nop;
@@ -533,13 +533,13 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
case 1:
say_file("time/sat.wav");
break;
case 2:
case 3:
case 4:
say_file("time/sata.wav");
break;
case 0:
case 5:
case 6:
@@ -550,17 +550,17 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
break;
}
}
}
}
minuta_jedinica = minutes % 10;
if (minutes > 10)
minuta_desetinka = (int) (minutes / 10);
if (minutes)
if (minutes)
{
if (minuta_desetinka == 1)
{
say_num(minutes, SSM_PRONOUNCED, "");
@@ -574,18 +574,18 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
say_num(minutes, SSM_PRONOUNCED, "je");
say_file("time/minute.wav");
break;
case 3:
case 4:
say_num(minutes, SSM_PRONOUNCED, "");
say_file("time/minute.wav");
break;
case 1:
say_num(minutes, SSM_PRONOUNCED, "a");
say_file("time/minuta.wav");
break;
case 0:
case 5:
case 6:
@@ -597,14 +597,14 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
break;
}
}
}
}
sekunda_jedinica = seconds % 10;
if (seconds > 10)
sekunda_desetinka = (int) (seconds / 10);
if (seconds)
if (seconds)
{
if (sekunda_desetinka == 1)
{
@@ -619,18 +619,18 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
say_num(seconds, SSM_PRONOUNCED, "a");
say_file("time/sekunda.wav");
break;
case 2:
say_num(seconds, SSM_PRONOUNCED, "je");
say_file("time/sekunde.wav");
break;
case 3:
case 4:
say_num(seconds, SSM_PRONOUNCED, "");
say_file("time/sekunde.wav");
break;
case 0:
case 5:
case 6:
@@ -649,18 +649,18 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
say_num(seconds, SSM_PRONOUNCED, "a");
say_file("time/sekunda.wav");
break;
case 2:
say_num(seconds, SSM_PRONOUNCED, "je");
say_file("time/sekunde.wav");
break;
case 3:
case 4:
say_num(seconds, SSM_PRONOUNCED, "");
say_file("time/sekunde.wav");
break;
case 0:
case 5:
case 6:
@@ -672,7 +672,7 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
break;
}
}
}
}
return SWITCH_STATUS_SUCCESS;
}
@@ -758,15 +758,15 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
if (say_day) {
say_num(tm.tm_mday, SSM_COUNTED, "");
}
if (say_month) {
say_file("time/mon-%d.wav", tm.tm_mon);
}
if (say_year) {
int y = tm.tm_year + 1900;
int tis = 0;
//say_num(tm.tm_year + 1900, SSM_PRONOUNCED, "");
//1 - 99 => h-1a.wav - h-99a.wav
if (y >= 1 && y <= 99)
@@ -795,7 +795,7 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
say_file("digits/thousand-u.wav");
if (0 != (int) ((y - 1000) - ((y - 1000) % 100)))
say_file("digits/h-%da.wav", (int) ((y - 1000) - ((y - 1000) % 100)));
say_file("digits/h-%da.wav", (int) y % 100);
}
//2000 => 2je.wav + thousand-ta.wav
@@ -811,7 +811,7 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
say_file("digits/thousands-e.wav");
if (0 != (int) ((y - 2000) - ((y - 2000) % 100)))
say_file("digits/h-%da.wav", (int) ((y - 2000) - ((y - 2000) % 100)));
say_file("digits/h-%da.wav", (int) y % 100);
}
// 3000 => [3-9].wav + thousand-ta.wav
@@ -828,25 +828,25 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
tis = y - (y % 1000);
if (0 != (int) ((y - tis) - ((y - tis) % 100)))
say_file("digits/h-%da.wav", (int) ((y - tis) - ((y - tis) % 100)));
say_file("digits/h-%da.wav", (int) y % 100);
}
//say_num(tm.tm_year + 1900, SSM_COUNTED, "a");
}
if (say_time)
if (say_time)
{
say_num(tm.tm_hour, SSM_PRONOUNCED, "");
sat_jedinica = tm.tm_hour % 10;
if (tm.tm_hour >= 10)
sat_desetinka = (int) (tm.tm_hour / 10);
if (tm.tm_hour)
if (tm.tm_hour)
{
if (sat_desetinka == 0 && sat_jedinica == 0)
{
@@ -863,13 +863,13 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
case 1:
say_file("time/sat.wav");
break;
case 2:
case 3:
case 4:
say_file("time/sata.wav");
break;
case 0:
case 5:
case 6:
@@ -878,17 +878,17 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
case 9:
say_file("time/sati.wav");
break;
}
}
}
}
minuta_jedinica = tm.tm_min % 10;
if (tm.tm_min >= 10)
minuta_desetinka = (int) (tm.tm_min / 10);
if (tm.tm_min)
if (tm.tm_min)
{
if (minuta_desetinka == 1)
{
@@ -903,18 +903,18 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
say_num(tm.tm_min, SSM_PRONOUNCED, "je");
say_file("time/minute.wav");
break;
case 3:
case 4:
say_num(tm.tm_min, SSM_PRONOUNCED, "");
say_file("time/minute.wav");
break;
case 1:
say_num(tm.tm_min, SSM_PRONOUNCED, "a");
say_file("time/minuta.wav");
break;
case 0:
case 5:
case 6:
@@ -926,14 +926,14 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
break;
}
}
}
}
sekunda_jedinica = tm.tm_sec % 10;
if (tm.tm_sec >= 10)
sekunda_desetinka = (int) (tm.tm_sec / 10);
if (tm.tm_sec)
if (tm.tm_sec)
{
if (sekunda_desetinka == 1)
{
@@ -948,18 +948,18 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
say_num(tm.tm_sec, SSM_PRONOUNCED, "a");
say_file("time/sekunda.wav");
break;
case 2:
say_num(tm.tm_sec, SSM_PRONOUNCED, "je");
say_file("time/sekunde.wav");
break;
case 3:
case 4:
say_num(tm.tm_sec, SSM_PRONOUNCED, "");
say_file("time/sekunde.wav");
break;
case 0:
case 5:
case 6:
@@ -978,18 +978,18 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
say_num(tm.tm_sec, SSM_PRONOUNCED, "a");
say_file("time/sekunda.wav");
break;
case 2:
say_num(tm.tm_sec, SSM_PRONOUNCED, "je");
say_file("time/sekunde.wav");
break;
case 3:
case 4:
say_num(tm.tm_sec, SSM_PRONOUNCED, "");
say_file("time/sekunde.wav");
break;
case 0:
case 5:
case 6:
@@ -1001,7 +1001,7 @@ static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay,
break;
}
}
}
}
}
return SWITCH_STATUS_SUCCESS;
@@ -1013,35 +1013,35 @@ static switch_status_t hr_say_money(switch_core_session_t *session, char *tosay,
char sbuf[16] = "";
char *kuna = NULL;
char *lipa = NULL;
int zadnja_kuna = 0;
int predzadnja_kuna = 0;
int zadnja_lipa = 0;
int predzadnja_lipa = 0;
if (strlen(tosay) > 15 || !(tosay = strip_nonnumerics(tosay, sbuf, sizeof(sbuf)-1)))
if (strlen(tosay) > 15 || !(tosay = strip_nonnumerics(tosay, sbuf, sizeof(sbuf)-1)))
{
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n");
return SWITCH_STATUS_GENERR;
}
kuna = sbuf;
if ((lipa = strchr(sbuf, '.')))
if ((lipa = strchr(sbuf, '.')))
{
*lipa++ = '\0';
if (strlen(lipa) > 2)
if (strlen(lipa) > 2)
{
lipa[2] = '\0';
}
}
if (sbuf[0] == '+')
if (sbuf[0] == '+')
{
kuna++;
}
if (sbuf[0] == '-')
if (sbuf[0] == '-')
{
say_file("currency/negative.wav");
kuna++;
@@ -1049,11 +1049,11 @@ static switch_status_t hr_say_money(switch_core_session_t *session, char *tosay,
if (kuna != NULL && strlen(kuna) > 0)
zadnja_kuna = (int) ((char) *(kuna + strlen(kuna) - 1) - '0');
if (kuna != NULL && strlen(kuna) > 1)
predzadnja_kuna = (int) ((char) *(kuna + strlen(kuna) - 2) - '0');
if (predzadnja_kuna == 1)
{
hr_say_count(session, "", kuna, say_args, args);
@@ -1068,7 +1068,7 @@ static switch_status_t hr_say_money(switch_core_session_t *session, char *tosay,
say_file("currency/kuna.wav");
break;
case 0:
case 0:
case 5:
case 6:
case 7:
@@ -1077,12 +1077,12 @@ static switch_status_t hr_say_money(switch_core_session_t *session, char *tosay,
hr_say_count(session, "", kuna, say_args, args);
say_file("currency/kuna.wav");
break;
case 2:
hr_say_count(session, "je", kuna, say_args, args);
say_file("currency/kune.wav");
break;
case 3:
case 4:
hr_say_count(session, "", kuna, say_args, args);
@@ -1090,26 +1090,26 @@ static switch_status_t hr_say_money(switch_core_session_t *session, char *tosay,
break;
}
}
if (lipa)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "lipa:%s \n", lipa);
else
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "lipa: NULL \n");
if (lipa)
{
/* Say "and" */
say_file("currency/and.wav");
if (lipa != NULL && strlen(lipa) > 0)
zadnja_lipa = (int) ((char) *(lipa + strlen(lipa) - 1) - '0');
if (lipa != NULL && strlen(lipa) > 1)
predzadnja_lipa = (int) ((char) *(lipa + strlen(lipa) - 2) - '0');
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "zadnja_lipa:%d \n", zadnja_lipa);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "predzadnja_lipa:%d \n", predzadnja_lipa);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "zadnja_lipa:%d \n", zadnja_lipa);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "predzadnja_lipa:%d \n", predzadnja_lipa);
if (predzadnja_lipa == 1)
{
hr_say_count(session, "", lipa, say_args, args);
@@ -1124,7 +1124,7 @@ static switch_status_t hr_say_money(switch_core_session_t *session, char *tosay,
say_file("currency/lipa.wav");
break;
case 0:
case 0:
case 5:
case 6:
case 7:
@@ -1133,12 +1133,12 @@ static switch_status_t hr_say_money(switch_core_session_t *session, char *tosay,
hr_say_count(session, "", lipa, say_args, args);
say_file("currency/lipa.wav");
break;
case 2:
hr_say_count(session, "je", lipa, say_args, args);
say_file("currency/lipa.wav");
break;
case 3:
case 4:
hr_say_count(session, "", lipa, say_args, args);
+8 -8
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Michael B. Murdock <mike@mmurdock.org>
*
@@ -231,7 +231,7 @@ static switch_status_t hu_say_time(switch_core_session_t *session, char *tosay,
if (hours) {
say_num(hours, SSM_PRONOUNCED);
say_file("time/hour.wav");
}
}
if (minutes) {
say_num(minutes, SSM_PRONOUNCED);
say_file("time/minute.wav");
+7 -7
View File
@@ -2,23 +2,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -37,7 +37,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Michael B. Murdock <mike@mmurdock.org>
*
+7 -7
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Michael B. Murdock <mike@mmurdock.org>
* Leo Noordergraaf <leo.noordergraaf@deanconnect.nl>
+14 -14
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Michael B. Murdock <mike@mmurdock.org>
* Mariusz Czułada <manieq.net@gmail.com>
@@ -473,11 +473,11 @@ static switch_status_t pl_say_money(switch_say_file_handle_t *sh, char *tosay, s
static switch_status_t pl_say_ip(switch_say_file_handle_t *sh,
char *tosay,
switch_say_args_t *say_args)
{
char *a, *b, *c, *d;
switch_status_t status = SWITCH_STATUS_FALSE;
if (!(a = strdup(tosay))) {
abort();
}
@@ -509,7 +509,7 @@ static switch_status_t pl_say_ip(switch_say_file_handle_t *sh,
say_num(sh, atoi(d), say_args->method, SSG_MASCULINE);
end:
free(a);
return status;
@@ -580,14 +580,14 @@ static switch_status_t run_callback(switch_new_say_callback_t say_cb, char *tosa
switch_say_file_handle_t *sh;
switch_status_t status = SWITCH_STATUS_FALSE;
switch_event_t *var_event = NULL;
if (session) {
switch_channel_t *channel = switch_core_session_get_channel(session);
switch_channel_get_variables(channel, &var_event);
}
switch_say_file_handle_create(&sh, say_args->ext, &var_event);
status = say_cb(sh, tosay, say_args);
if ((*rstr = switch_say_file_handle_detach_path(sh))) {
@@ -615,7 +615,7 @@ static switch_status_t pl_say(switch_core_session_t *session, char *tosay, switc
if (session && string) {
status = switch_ivr_play_file(session, NULL, string, args);
}
switch_safe_free(string);
}
@@ -654,7 +654,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_pl_load)
say_interface->interface_name = "pl";
say_interface->say_function = pl_say;
say_interface->say_string_function = pl_say_string;
/* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS;
}
+8 -8
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Michael B. Murdock <mike@mmurdock.org>
* António Silva <asilva@wirelessmundi.com>
@@ -409,7 +409,7 @@ static switch_status_t pt_say_time(switch_core_session_t *session, char *tosay,
if (tm.tm_min) {
say_file("currency/and.wav");
say_num(tm.tm_min, SSM_PRONOUNCED);
} else {
} else {
say_file("time/oclock.wav");
}
+22 -22
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Michael B. Murdock <mike@mmurdock.org>
* Boris Buklov (BBV) <buklov@mail.ru>
@@ -174,7 +174,7 @@ static switch_status_t ru_say_count(switch_say_file_handle_t *sh, char *tosay, s
}
}
//миллионы
//миллионы
if (places[8] || places[7] || places[6]) {
if ((in_ % 1000000 > 0) && (matrix[cases][gender].all != 1)) { // если поле миллионов есть цифры поизнести как числительое именительного падежа
if ((status = play_group(male, nominativus, places[8], places[7], places[6], million, sh)) != SWITCH_STATUS_SUCCESS) {
@@ -188,7 +188,7 @@ static switch_status_t ru_say_count(switch_say_file_handle_t *sh, char *tosay, s
}
}
}
//тысячи
//тысячи
if (places[5] || places[4] || places[3]) {
if ((in_ % 1000 > 0) && (matrix[cases][gender].all != 1)) { // если поле миллионов есть цифры поизнести как числительое именительного падежа
if ((status = play_group(male, nominativus, places[5], places[4], places[3], thousand, sh)) != SWITCH_STATUS_SUCCESS) {
@@ -313,8 +313,8 @@ static switch_status_t ru_say_money(switch_say_file_handle_t *sh, char *tosay, s
else {
switch_say_file(sh, "currency/%s",matrix_currency[say_opt->currency].first[5]);
}
/* Say kopecks */
ru_say_count(sh, kopecks, matrix_currency[say_opt->currency].second_gender,matrix_currency[say_opt->currency].second_cases);
@@ -348,7 +348,7 @@ static switch_status_t ru_say_time(switch_say_file_handle_t *sh, char *tosay, sw
switch_time_exp_t tm, tm_now;
uint8_t say_date = 0, say_time = 0, say_year = 0, say_month = 0, say_dow = 0, say_day = 0, say_yesterday = 0, say_today = 0;
const char *tz = NULL;
tz = switch_say_file_handle_get_variable(sh, "timezone");
tz = switch_say_file_handle_get_variable(sh, "timezone");
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, " ru_say_time %s type=%d method=%d\n", tosay, say_args->type, say_args->method);
@@ -603,7 +603,7 @@ static switch_new_say_callback_ru_t choose_callback(switch_say_args_t *say_args)
case SST_ITEMS:
case SST_PERSONS:
case SST_MESSAGES:
say_cb = ru_say_general_count;
break;
case SST_TIME_MEASUREMENT:
@@ -640,7 +640,7 @@ static switch_new_say_callback_ru_t choose_callback(switch_say_args_t *say_args)
}
static switch_status_t run_callback(switch_new_say_callback_ru_t say_cb, char *tosay, switch_say_args_t *say_args, switch_core_session_t *session, char **rstr)
@@ -665,7 +665,7 @@ static switch_status_t run_callback(switch_new_say_callback_ru_t say_cb, char *t
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ru_say!!! %s %s %s !\n",gender, cases,currency);
if (cases) {
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ru_say!!! %s!\n", cases);
if ((strcmp(cases,"nominativus")==0) || (strcmp(cases,"именительный")==0)) {
say_opt.cases=(cases_t)0;
}
@@ -690,7 +690,7 @@ static switch_status_t run_callback(switch_new_say_callback_ru_t say_cb, char *t
}
if (gender) {
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ru_say!!! %s!\n", gender);
if ((strcmp(gender,"male")==0) || (strcmp(gender,"мужской")==0)) {
say_opt.gender=(say_gender_t)0;
}
@@ -715,15 +715,15 @@ static switch_status_t run_callback(switch_new_say_callback_ru_t say_cb, char *t
if ((strcmp(gender,"plural_h")==0) || (strcmp(gender,"множественное_порядковый")==0)) {
say_opt.gender=(say_gender_t)7;
}
}
if (currency) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ru_say!!! %s!\n", currency);
if ((strcmp(currency,"ruble")==0) || (strcmp(currency,"рубль")==0)) {
say_opt.currency=(currency_t)0;
// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "rul!!! \n");
}
if ((strcmp(currency,"dollar")==0) || (strcmp(currency,"доллар")==0)) {
// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "dollar!!! !\n");
@@ -731,7 +731,7 @@ static switch_status_t run_callback(switch_new_say_callback_ru_t say_cb, char *t
}
}
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ru_say!!! %s! say_opt.gender=%d say_opt.cases=%d\n", tosay,say_opt.gender,say_opt.cases);
}
switch_say_file_handle_create(&sh, say_args->ext, &var_event);
//запуск ru_ip,ru_say_money ...
@@ -754,9 +754,9 @@ static switch_status_t ru_say(switch_core_session_t *session, char *tosay, switc
switch_new_say_callback_ru_t say_cb = NULL;
char *string = NULL;
switch_status_t status;
status = SWITCH_STATUS_FALSE;
say_cb = choose_callback(say_args);
if (say_cb) {
+10 -10
View File
@@ -12,7 +12,7 @@
//http://ru.wiktionary.org/wiki/%D0%BE%D0%B4%D0%B8%D0%BD
//http://ru.wiktionary.org/wiki/%D0%BF%D0%B5%D1%80%D0%B2%D1%8B%D0%B9
typedef enum {
million,
@@ -58,7 +58,7 @@ typedef enum {
typedef struct {
say_gender_t gender;
cases_t cases;
currency_t currency;
currency_t currency;
} say_opt_t;
@@ -75,7 +75,7 @@ struct say_cur_t {
char *second[6];
say_gender_t second_gender;
cases_t second_cases;
};
// описываем как произносить валяюты от 0 до 5 дальше идёт номер рода и падежа (с нуля)
@@ -94,7 +94,7 @@ struct say_cur_t {
typedef switch_status_t (*switch_new_say_callback_ru_t) (switch_say_file_handle_t *sh, char *tosay, switch_say_args_t *say_args,say_opt_t *say_opt);
//именительный
//именительный
//именительный количественный/числительное
//мужской род родительный падеж
@@ -235,7 +235,7 @@ typedef switch_status_t (*switch_new_say_callback_ru_t) (switch_say_file_handle_
//дательный Кого? Что?
//дательный Кого? Что?
//количественный/числительное
//мужской
#define m_20 {\
@@ -301,7 +301,7 @@ typedef switch_status_t (*switch_new_say_callback_ru_t) (switch_say_file_handle_
//Винительный Кого? animate - одушевлённый
//Винительный Кого? animate - одушевлённый
//количественный/числительное
//мужской
#define m_30 {\
@@ -367,7 +367,7 @@ typedef switch_status_t (*switch_new_say_callback_ru_t) (switch_say_file_handle_
//Винительный Что? inanimate - неодушевлённый
//Винительный Что? inanimate - неодушевлённый
//количественный/числительное
//мужской
#define m_40 {\
@@ -433,7 +433,7 @@ typedef switch_status_t (*switch_new_say_callback_ru_t) (switch_say_file_handle_
//Творительный Кем? Чем?
//Творительный Кем? Чем?
//количественный/числительное
//мужской
#define m_50 {\
@@ -499,7 +499,7 @@ typedef switch_status_t (*switch_new_say_callback_ru_t) (switch_say_file_handle_
//Предложный О ком? О чём?
//Предложный О ком? О чём?
//количественный/числительное
//мужской
#define m_60 {\
@@ -565,7 +565,7 @@ typedef switch_status_t (*switch_new_say_callback_ru_t) (switch_say_file_handle_
//именительный
//именительный
//именительный количественный/числительное
//мужской
#define m_60 {\
+9 -9
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* Michael B. Murdock <mike@mmurdock.org>
* Daniel Swarbrick <daniel.swarbrick@gmail.com>
@@ -71,7 +71,7 @@ SWITCH_MODULE_DEFINITION(mod_say_sv, mod_say_sv_load, NULL, NULL);
static switch_status_t play_group(switch_say_method_t method, switch_say_gender_t gender, int a, int b, int c, char *what, switch_say_file_handle_t *sh)
{
/*swedish makes the distiction between utrum for "one" (en) and neutrum for "one" (ett), e.g. voicemail-message is neutrum but recording is utrum.
/*swedish makes the distiction between utrum for "one" (en) and neutrum for "one" (ett), e.g. voicemail-message is neutrum but recording is utrum.
This only applies to the likes of 1, 101, 1001 etc.
files referenced below:
SSM_COUNTED=r-%d
@@ -309,7 +309,7 @@ static switch_status_t sv_say_time(switch_say_file_handle_t *sh, char *tosay, sw
if (minutes == 0) {
switch_say_file(sh, "time/midnatt");
} else {
switch_say_file(sh, "digits/0");
switch_say_file(sh, "digits/0");
switch_say_file(sh, "time/timmar");
}
}
+8 -8
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,12 +36,12 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* PeteDao <petekay@gmail.com>
* Steve Underwood 0.0.1 <steveu@coppice.org>
* Dome Charoenyost <dome@tel.co.th>
*
*
*
* mod_say_th.c -- Say for Thai
*
+7 -7
View File
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2007-2014, Anthony Minessale II
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Anthony Minessale II <anthm@freeswitch.org>
* PeteDao <petekay@gmail.com>
* Steve Underwood 0.0.1 <steveu@coppice.org>