mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-02-09 17:26:03 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8033 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
5777371e66
commit
b591cb7d5b
@ -165,7 +165,11 @@ static switch_status_t caller_read_frame_callback(switch_core_session_t *session
|
|||||||
{
|
{
|
||||||
fifo_chime_data_t *cd = (fifo_chime_data_t *) user_data;
|
fifo_chime_data_t *cd = (fifo_chime_data_t *) user_data;
|
||||||
|
|
||||||
if (cd && cd->total && switch_timestamp(NULL) >= cd->next) {
|
if (!cd) {
|
||||||
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cd->total && switch_timestamp(NULL) >= cd->next) {
|
||||||
if (cd->index == MAX_CHIME || cd->index == cd->total || !cd->list[cd->index]) {
|
if (cd->index == MAX_CHIME || cd->index == cd->total || !cd->list[cd->index]) {
|
||||||
cd->index = 0;
|
cd->index = 0;
|
||||||
}
|
}
|
||||||
@ -361,7 +365,7 @@ SWITCH_STANDARD_APP(fifo_function)
|
|||||||
arg_fifo_name = argv[0];
|
arg_fifo_name = argv[0];
|
||||||
arg_inout = argv[1];
|
arg_inout = argv[1];
|
||||||
|
|
||||||
if (!arg_fifo_name && arg_inout) {
|
if (!(arg_fifo_name && arg_inout)) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -693,6 +697,7 @@ SWITCH_STANDARD_APP(fifo_function)
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (x = 0; x < custom_pop; x++) {
|
for (x = 0; x < custom_pop; x++) {
|
||||||
|
switch_assert(pop_list[x]);
|
||||||
int temp = atoi(pop_list[x]);
|
int temp = atoi(pop_list[x]);
|
||||||
if (temp > -1 && temp < MAX_PRI) {
|
if (temp > -1 && temp < MAX_PRI) {
|
||||||
pop_array[x] = temp;
|
pop_array[x] = temp;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user