kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-15 17:27:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

OpenBSD fixes (bug #3120)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4526 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2004-12-22 06:18:32 +00:00
parent 51ea5a2797
commit 3384173257
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
say.c
View File

@@ -682,7 +682,7 @@ static int ast_say_number_full_da(struct ast_channel *chan, int num, char *ints,
} }
if (!res) { if (!res) {
if(!ast_streamfile(chan, fn, language)) { if(!ast_streamfile(chan, fn, language)) {
if (audiofd && ctrlfd) if ((audiofd > -1) && (ctrlfd > -1))
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
else else
res = ast_waitstream(chan, ints); 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 (!res) {
if(!ast_streamfile(chan, fn, language)) { if(!ast_streamfile(chan, fn, language)) {
if (audiofd && ctrlfd) if ((audiofd > -1) && (ctrlfd > -1))
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
else else
res = ast_waitstream(chan, ints); res = ast_waitstream(chan, ints);
} }
ast_stopstream(chan); ast_stopstream(chan);
if(!ast_streamfile(chan, fna, language)) { if(!ast_streamfile(chan, fna, language)) {
if (audiofd && ctrlfd) if ((audiofd > -1) && (ctrlfd > -1))
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
else else
res = ast_waitstream(chan, ints); 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 (!res) {
if(!ast_streamfile(chan, fn, language)) { if(!ast_streamfile(chan, fn, language)) {
if (audiofd && ctrlfd) if ((audiofd > -1) && (ctrlfd > -1))
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
else else
res = ast_waitstream(chan, ints); 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 (!res) {
if(!ast_streamfile(chan, fn, language)) { if(!ast_streamfile(chan, fn, language)) {
if (audiofd && ctrlfd) if ((audiofd > -1) && (ctrlfd > -1))
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
else else
res = ast_waitstream(chan, ints); 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 (!res) {
if(!ast_streamfile(chan, fn, language)) { if(!ast_streamfile(chan, fn, language)) {
if (audiofd && ctrlfd) if ((audiofd > -1) && (ctrlfd > -1))
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
else else
res = ast_waitstream(chan, ints); 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 (!res) {
if(!ast_streamfile(chan, fn, language)) { if(!ast_streamfile(chan, fn, language)) {
if (audiofd && ctrlfd) if ((audiofd > -1) && (ctrlfd > -1))
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
else else
res = ast_waitstream(chan, ints); 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); strcat(file_name, fn);
ast_log(LOG_DEBUG, "Trying to play: %s\n", file_name); ast_log(LOG_DEBUG, "Trying to play: %s\n", file_name);
if (!ast_streamfile(chan, file_name, language)) { if (!ast_streamfile(chan, file_name, language)) {
if (audiofd && ctrlfd) if ((audiofd > -1) && (ctrlfd > -1))
ast_waitstream_full(chan, ints, audiofd, ctrlfd); ast_waitstream_full(chan, ints, audiofd, ctrlfd);
else else
ast_waitstream(chan, ints); ast_waitstream(chan, ints);
@@ -1568,7 +1568,7 @@ static int ast_say_number_full_pt(struct ast_channel *chan, int num, char *ints,
} }
if (!res) { if (!res) {
if(!ast_streamfile(chan, fn, language)) { 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_full(chan, ints, audiofd, ctrlfd); else
res = ast_waitstream(chan, ints); res = ast_waitstream(chan, ints);
} }
@@ -1638,7 +1638,7 @@ static int ast_say_number_full_se(struct ast_channel *chan, int num, char *ints,
} }
if (!res) { if (!res) {
if(!ast_streamfile(chan, fn, language)) { if(!ast_streamfile(chan, fn, language)) {
if (audiofd && ctrlfd) if ((audiofd > -1) && (ctrlfd > -1))
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
else else
res = ast_waitstream(chan, ints); 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 (!res) {
if(!ast_streamfile(chan, fn, language)) { if(!ast_streamfile(chan, fn, language)) {
if (audiofd && ctrlfd) if ((audiofd > -1) && (ctrlfd > -1))
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
else else
res = ast_waitstream(chan, ints); 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 (!res) {
if(!ast_streamfile(chan, fn, language)) { if(!ast_streamfile(chan, fn, language)) {
if (audiofd && ctrlfd) { if ((audiofd > -1) && (ctrlfd > -1)) {
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
} else { } else {
res = ast_waitstream(chan, ints); res = ast_waitstream(chan, ints);