Skip to content

F
freeswitch
提交 8ed2b073 authored 作者: Brian West's avatar Brian West
浏览文件
操作

Merge pull request #126 in FS/freeswitch from… 

Merge pull request #126 in FS/freeswitch from ~HRISTO/freeswitch:timezone-all-mod_say-modules to master

* commit 'a8c5a0c8':
  add timezone support to mod_say_{de,es,ja,nl,th,zh}
上级 b367f521 a8c5a0c8
隐藏空白字符变更
内嵌 并排
正在显示 包含 84 行增加 和 6 行删除
src/mod/say/mod_say_de/mod_say_de.c
浏览文件 @ 8ed2b073
......@@ -226,6 +226,8 @@ static switch_status_t de_say_time(switch_core_session_t *session, char *tosay,
switch_time_t target = 0;
switch_time_exp_t tm;
uint8_t say_date = 0, say_time = 0;
switch_channel_t *channel = switch_core_session_get_channel(session);
const char *tz = switch_channel_get_variable(channel, "timezone");
if (say_args->type == SST_TIME_MEASUREMENT) {
int64_t hours = 0;
......@@ -314,7 +316,18 @@ static switch_status_t de_say_time(switch_core_session_t *session, char *tosay,
} else {
target = switch_micro_time_now();
}
switch_time_exp_lt(&tm, target);
if (tz) {
int check = atoi(tz);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Timezone is [%s]\n", tz);
if (check) {
switch_time_exp_tz(&tm, target, check);
} else {
switch_time_exp_tz_name(tz, &tm, target);
}
} else {
switch_time_exp_lt(&tm, target);
}
switch (say_args->type) {
case SST_CURRENT_DATE_TIME:
......
src/mod/say/mod_say_es/mod_say_es.c
浏览文件 @ 8ed2b073
......@@ -220,6 +220,8 @@ static switch_status_t es_say_time(switch_core_session_t *session, char *tosay,
switch_time_t target = 0;
switch_time_exp_t tm;
uint8_t say_date = 0, say_time = 0;
switch_channel_t *channel = switch_core_session_get_channel(session);
const char *tz = switch_channel_get_variable(channel, "timezone");
if (say_args->type == SST_TIME_MEASUREMENT) {
int64_t hours = 0;
......@@ -304,7 +306,18 @@ static switch_status_t es_say_time(switch_core_session_t *session, char *tosay,
} else {
target = switch_micro_time_now();
}
switch_time_exp_lt(&tm, target);
if (tz) {
int check = atoi(tz);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Timezone is [%s]\n", tz);
if (check) {
switch_time_exp_tz(&tm, target, check);
} else {
switch_time_exp_tz_name(tz, &tm, target);
}
} else {
switch_time_exp_lt(&tm, target);
}
switch (say_args->type) {
case SST_CURRENT_DATE_TIME:
......
src/mod/say/mod_say_ja/mod_say_ja.c
浏览文件 @ 8ed2b073
......@@ -248,6 +248,8 @@ static switch_status_t ja_say_time(switch_core_session_t *session, char *tosay,
switch_time_exp_t tm;
uint8_t say_date = 0;
uint8_t say_time = 0;
switch_channel_t *channel = switch_core_session_get_channel(session);
const char *tz = switch_channel_get_variable(channel, "timezone");
int mod_min;
char buffer[3];
......@@ -322,7 +324,18 @@ static switch_status_t ja_say_time(switch_core_session_t *session, char *tosay,
target = switch_time_make(t, 0);
else
target = switch_micro_time_now();
switch_time_exp_lt(&tm, target);
if (tz) {
int check = atoi(tz);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Timezone is [%s]\n", tz);
if (check) {
switch_time_exp_tz(&tm, target, check);
} else {
switch_time_exp_tz_name(tz, &tm, target);
}
} else {
switch_time_exp_lt(&tm, target);
}
switch (say_args->type) {
case SST_CURRENT_DATE_TIME:
......
src/mod/say/mod_say_nl/mod_say_nl.c
浏览文件 @ 8ed2b073
......@@ -178,6 +178,8 @@ static switch_status_t nl_say_time(switch_core_session_t *session, char *tosay,
switch_time_t target = 0;
switch_time_exp_t tm;
uint8_t say_date = 0, say_time = 0;
switch_channel_t *channel = switch_core_session_get_channel(session);
const char *tz = switch_channel_get_variable(channel, "timezone");
if (say_args->type == SST_TIME_MEASUREMENT) {
int64_t hours = 0;
......@@ -262,7 +264,18 @@ static switch_status_t nl_say_time(switch_core_session_t *session, char *tosay,
} else {
target = switch_micro_time_now();
}
switch_time_exp_lt(&tm, target);
if (tz) {
int check = atoi(tz);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Timezone is [%s]\n", tz);
if (check) {
switch_time_exp_tz(&tm, target, check);
} else {
switch_time_exp_tz_name(tz, &tm, target);
}
} else {
switch_time_exp_lt(&tm, target);
}
switch (say_args->type) {
case SST_CURRENT_DATE_TIME:
......
src/mod/say/mod_say_th/mod_say_th.c
浏览文件 @ 8ed2b073
......@@ -234,6 +234,8 @@ static switch_status_t th_say_time(switch_core_session_t *session, char *tosay,
int32_t t;
switch_time_t target = 0;
switch_time_exp_t tm;
switch_channel_t *channel = switch_core_session_get_channel(session);
const char *tz = switch_channel_get_variable(channel, "timezone");
#if 0
switch_time_t this_morning;
switch_time_exp_t tm2;
......@@ -323,7 +325,18 @@ static switch_status_t th_say_time(switch_core_session_t *session, char *tosay,
target = switch_time_make(t, 0);
else
target = switch_micro_time_now();
switch_time_exp_lt(&tm, target);
if (tz) {
int check = atoi(tz);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Timezone is [%s]\n", tz);
if (check) {
switch_time_exp_tz(&tm, target, check);
} else {
switch_time_exp_tz_name(tz, &tm, target);
}
} else {
switch_time_exp_lt(&tm, target);
}
switch (say_args->type) {
case SST_CURRENT_DATE_TIME:
......
src/mod/say/mod_say_zh/mod_say_zh.c
浏览文件 @ 8ed2b073
......@@ -198,6 +198,8 @@ static switch_status_t zh_say_time(switch_core_session_t *session, char *tosay,
int32_t t;
switch_time_t target = 0;
switch_time_exp_t tm;
switch_channel_t *channel = switch_core_session_get_channel(session);
const char *tz = switch_channel_get_variable(channel, "timezone");
#if 0
switch_time_t this_morning;
switch_time_exp_t tm2;
......@@ -287,7 +289,18 @@ static switch_status_t zh_say_time(switch_core_session_t *session, char *tosay,
target = switch_time_make(t, 0);
else
target = switch_micro_time_now();
switch_time_exp_lt(&tm, target);
if (tz) {
int check = atoi(tz);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Timezone is [%s]\n", tz);
if (check) {
switch_time_exp_tz(&tm, target, check);
} else {
switch_time_exp_tz_name(tz, &tm, target);
}
} else {
switch_time_exp_lt(&tm, target);
}
switch (say_args->type) {
case SST_CURRENT_DATE_TIME:
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论