[asterisk-commits] oej: branch oej/pinequeue-trunk r364009 - in /team/oej/pinequeue-trunk: ./ ap...

[SVN commits to the Asterisk project]

Author: oej
Date: Thu Apr 26 09:30:27 2012
New Revision: 364009

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=364009
Log:
Small fixes

Modified:
    team/oej/pinequeue-trunk/   (props changed)
    team/oej/pinequeue-trunk/apps/app_queue.c
    team/oej/pinequeue-trunk/main/say.c

Propchange: team/oej/pinequeue-trunk/
------------------------------------------------------------------------------
--- automerge (original)
+++ automerge Thu Apr 26 09:30:27 2012
@@ -1,1 +1,1 @@
-*
+Is-there-life-off-net?

Modified: team/oej/pinequeue-trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinequeue-trunk/apps/app_queue.c?view=diff&rev=364009&r1=364008&r2=364009
==============================================================================
--- team/oej/pinequeue-trunk/apps/app_queue.c (original)
+++ team/oej/pinequeue-trunk/apps/app_queue.c Thu Apr 26 09:30:27 2012
@@ -6232,7 +6232,6 @@
 		ast_log(LOG_ERROR, "... no channel to generate frames for!\n");
 		return -1;
 	}
-	
 	state->sample_queue += samples;
 
 	while (state->sample_queue > 0) {
@@ -6336,14 +6335,14 @@
 						ast_moh_start(chan, aqsi->qe->moh, NULL);
 					}
 				}
-				return -1;
+				return 0;
 			}
 		} else {
 			ast_copy_string(playfilename, filename, sizeof(playfilename));
 		}
 	} else {
 		if (ast_strlen_zero(filename)) {
-			return -1;
+			return 0;
 		}
 	}
 
@@ -6353,7 +6352,7 @@
 		struct ast_queue_streamfile_name *fn = ast_calloc(1, sizeof(*fn));
 		fn->filename = ast_strdup(filename);
 		ast_debug(3, "Background prompts: queued sound file %s for playing on chan %s\n", filename, ast_channel_name(chan));
-		
+
 		/* link the struct into the current ast_queue_streamfile_info struct */
 		AST_LIST_INSERT_TAIL(&aqsi->flist, fn, list); 
 		/* in this case, nothing else to do, just insert the new file at the end of the list */

Modified: team/oej/pinequeue-trunk/main/say.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinequeue-trunk/main/say.c?view=diff&rev=364009&r1=364008&r2=364009
==============================================================================
--- team/oej/pinequeue-trunk/main/say.c (original)
+++ team/oej/pinequeue-trunk/main/say.c Thu Apr 26 09:30:27 2012
@@ -408,7 +408,7 @@
 
 /*! wait_file_full: this routine to provide wait_file capability for those with audiofd, ctrlfd  
 */
-static int wait_file_full(struct ast_channel *chan, const char *ints, const char *file, const char *lang, int audiofd, int ctrlfd) 
+static int wait_file_full(struct ast_channel *chan, const char *ints, const char *file, const char *lang, int audiofd, int ctrlfd)
 {
 	int res;
 	struct ast_datastore *datastore;
@@ -416,7 +416,7 @@
 	/* if a datastore is present, we are in the queue app (perhaps others in time)
 	   and don't want to wait around for the sounds to finish playing */
 
-	if ((datastore = ast_channel_datastore_find(chan, ast_prompt_list(), NULL))) { 
+	if ((datastore = ast_channel_datastore_find(chan, ast_prompt_list(), NULL))) {
 		/* app_queue wants to schedule this instead of play & wait */
 		struct ast_queue_streamfile_info *aqsi = datastore->data;
 		if (aqsi) {
@@ -465,7 +465,7 @@
 			return 0;
 		}
 		return 0;
-	} 
+	}
 	/* otherwise, exactly business as usual */
 	if ((res = ast_streamfile(chan, file, lang))) {
 		ast_log(LOG_WARNING, "Unable to play message %s\n", file);
@@ -6812,7 +6812,7 @@
 		if (!res) {
 			res = ast_say_number(chan, tm.tm_min, ints, lang, "f");
 		}
-	} 
+	}
 	if (!res) {
 		res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, "f");
 	}