diff options
Diffstat (limited to 'say.c')
| -rwxr-xr-x | say.c | 36 |
1 files changed, 18 insertions, 18 deletions
@@ -579,7 +579,7 @@ static int ast_say_number_full_en(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -682,7 +682,7 @@ static int ast_say_number_full_da(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -791,14 +791,14 @@ static int ast_say_number_full_de(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); } ast_stopstream(chan); if(!ast_streamfile(chan, fna, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -881,7 +881,7 @@ static int ast_say_number_full_es(struct ast_channel *chan, int num, char *ints, if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -967,7 +967,7 @@ static int ast_say_number_full_fr(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -1113,7 +1113,7 @@ static int ast_say_number_full_it(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -1183,7 +1183,7 @@ static int ast_say_number_full_nl(struct ast_channel *chan, int num, char *ints, if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -1238,7 +1238,7 @@ static void pl_odtworz_plik(struct ast_channel *chan, char *language, int audiof strcat(file_name, fn); ast_log(LOG_DEBUG, "Trying to play: %s\n", file_name); if (!ast_streamfile(chan, file_name, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) ast_waitstream_full(chan, ints, audiofd, ctrlfd); else ast_waitstream(chan, ints); @@ -1566,19 +1566,19 @@ static int ast_say_number_full_pt(struct ast_channel *chan, int num, char *ints, playh = 1; num = num % 1000000; } - if (!res && playh) { - res = wait_file(chan, ints, "digits/pt-e", language); - ast_stopstream(chan); - playh = 0; - } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); } ast_stopstream(chan); } + if (!res && playh) { + res = wait_file(chan, ints, "digits/pt-e", language); + ast_stopstream(chan); + playh = 0; + } } return res; } @@ -1638,7 +1638,7 @@ static int ast_say_number_full_se(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -1699,7 +1699,7 @@ static int ast_say_number_full_tw(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -1808,7 +1808,7 @@ static int ast_say_number_full_cz(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) { + if ((audiofd > -1) && (ctrlfd > -1)) { res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); } else { res = ast_waitstream(chan, ints); |