[asterisk-commits] qwell: trunk r71069 - in /trunk: ./ apps/ main/ res/

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Jun 22 10:03:32 2007
New Revision: 71069

URL: http://svn.digium.com/view/asterisk?view=rev&rev=71069
Log:
Merged revisions 71068 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r71068 | qwell | 2007-06-22 10:00:30 -0500 (Fri, 22 Jun 2007) | 12 lines

Merged revisions 71065 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r71065 | qwell | 2007-06-22 09:52:18 -0500 (Fri, 22 Jun 2007) | 4 lines

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

Issue 10035

........

................

Modified:
    trunk/   (props changed)
    trunk/apps/app_speech_utils.c
    trunk/main/file.c
    trunk/res/res_agi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_speech_utils.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_speech_utils.c?view=diff&rev=71069&r1=71068&r2=71069
==============================================================================
--- trunk/apps/app_speech_utils.c (original)
+++ trunk/apps/app_speech_utils.c Fri Jun 22 10:03:32 2007
@@ -533,8 +533,7 @@
 	if (ast_applystream(chan, fs))
 		return -1;
 	
-	if (ast_playstream(fs))
-		return -1;
+	ast_playstream(fs);
 
         return 0;
 }

Modified: trunk/main/file.c
URL: http://svn.digium.com/view/asterisk/trunk/main/file.c?view=diff&rev=71069&r1=71068&r2=71069
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Fri Jun 22 10:03:32 2007
@@ -794,10 +794,9 @@
 			return -1;
 		if (vfs && ast_applystream(chan, vfs))
 			return -1;
-		if (ast_playstream(fs))
-			return -1;
-		if (vfs && ast_playstream(vfs))
-			return -1;
+		ast_playstream(fs);
+		if (vfs)
+			ast_playstream(vfs);
 		if (option_verbose > 2)
 			ast_verbose(VERBOSE_PREFIX_3 "<%s> Playing '%s.%s' (language '%s')\n", chan->name, filename, ast_getformatname(chan->writeformat), preflang ? preflang : "default");
 

Modified: trunk/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_agi.c?view=diff&rev=71069&r1=71068&r2=71069
==============================================================================
--- trunk/res/res_agi.c (original)
+++ trunk/res/res_agi.c Fri Jun 22 10:03:32 2007
@@ -602,14 +602,10 @@
 	res = ast_applystream(chan, fs);
 	if (vfs)
 		vres = ast_applystream(chan, vfs);
-	res = ast_playstream(fs);
+	ast_playstream(fs);
 	if (vfs)
-		vres = ast_playstream(vfs);
+		ast_playstream(vfs);
 	
-	if (res) {
-		fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset);
-		return (res >= 0) ? RESULT_SHOWUSAGE : RESULT_FAILURE;
-	}
 	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
 	 * the end of the stream, return that amount, else check for the amount */
@@ -666,16 +662,10 @@
 	res = ast_applystream(chan, fs);
 	if (vfs)
 		vres = ast_applystream(chan, vfs);
-	res = ast_playstream(fs);
+	ast_playstream(fs);
 	if (vfs)
-		vres = ast_playstream(vfs);
-	if (res) {
-		fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset);
-		if (res >= 0)
-			return RESULT_SHOWUSAGE;
-		else
-			return RESULT_FAILURE;
-	}
+		ast_playstream(vfs);
+
 	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
 	 * the end of the stream, return that amount, else check for the amount */