kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few silly usages of ast_playstream() - it only ever returns 0...

Browse Source 
Issue 10035


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@71065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-06-22 14:52:18 +00:00
parent b9000f54b2
commit 01f5e6d56b
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
file.c
View File

@@ -816,10 +816,9 @@ int ast_streamfile(struct ast_channel *chan, const char *filename, const char *p
return -1; return -1;
if (vfs && ast_applystream(chan, vfs)) if (vfs && ast_applystream(chan, vfs))
return -1; return -1;
if (ast_playstream(fs)) ast_playstream(fs);
return -1; if (vfs)
if (vfs && ast_playstream(vfs)) ast_playstream(vfs);
return -1;
#if 1 #if 1
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Playing '%s' (language '%s')\n", filename, preflang ? preflang : "default"); ast_verbose(VERBOSE_PREFIX_3 "Playing '%s' (language '%s')\n", filename, preflang ? preflang : "default");

18
res/res_agi.c
View File

@@ -569,14 +569,7 @@ static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, char
max_length = ast_tellstream(fs); max_length = ast_tellstream(fs);
ast_seekstream(fs, sample_offset, SEEK_SET); ast_seekstream(fs, sample_offset, SEEK_SET);
res = ast_applystream(chan, fs); res = ast_applystream(chan, fs);
res = ast_playstream(fs); ast_playstream(fs);
if (res) {
fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset);
if (res >= 0)
return RESULT_SHOWUSAGE;
else
return RESULT_FAILURE;
}
res = ast_waitstream_full(chan, argv[3], agi->audio, agi->ctrl); res = ast_waitstream_full(chan, argv[3], agi->audio, agi->ctrl);
/* this is to check for if ast_waitstream closed the stream, we probably are at /* this is to check for if ast_waitstream closed the stream, we probably are at
* the end of the stream, return that amount, else check for the amount */ * the end of the stream, return that amount, else check for the amount */
@@ -629,14 +622,7 @@ static int handle_getoption(struct ast_channel *chan, AGI *agi, int argc, char *
max_length = ast_tellstream(fs); max_length = ast_tellstream(fs);
ast_seekstream(fs, sample_offset, SEEK_SET); ast_seekstream(fs, sample_offset, SEEK_SET);
res = ast_applystream(chan, fs); res = ast_applystream(chan, fs);
res = ast_playstream(fs); ast_playstream(fs);
if (res) {
fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset);
if (res >= 0)
return RESULT_SHOWUSAGE;
else
return RESULT_FAILURE;
}
res = ast_waitstream_full(chan, argv[3], agi->audio, agi->ctrl); res = ast_waitstream_full(chan, argv[3], agi->audio, agi->ctrl);
/* this is to check for if ast_waitstream closed the stream, we probably are at /* this is to check for if ast_waitstream closed the stream, we probably are at
* the end of the stream, return that amount, else check for the amount */ * the end of the stream, return that amount, else check for the amount */