[asterisk-commits] oej: branch group/pinequeue r306254 - in /team/group/pinequeue: channels/ main/

[SVN commits to the Asterisk project]

Author: oej
Date: Fri Feb  4 05:14:45 2011
New Revision: 306254

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306254
Log:
Reverting changes to channels and cleaning up say.c

Modified:
    team/group/pinequeue/channels/chan_dahdi.c
    team/group/pinequeue/channels/chan_sip.c
    team/group/pinequeue/main/say.c

Modified: team/group/pinequeue/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pinequeue/channels/chan_dahdi.c?view=diff&rev=306254&r1=306253&r2=306254
==============================================================================
--- team/group/pinequeue/channels/chan_dahdi.c (original)
+++ team/group/pinequeue/channels/chan_dahdi.c Fri Feb  4 05:14:45 2011
@@ -3347,8 +3347,8 @@
 	}
 	if (newslot < 0) {
 		newslot = 0;
-		/* ast_log(LOG_WARNING, "No D-channels available!  Using Primary channel %d as D-channel anyway!\n",
-			pri->dchannels[newslot]); */
+		ast_log(LOG_WARNING, "No D-channels available!  Using Primary channel %d as D-channel anyway!\n",
+			pri->dchannels[newslot]);
 	}
 	if (old && (oldslot != newslot))
 		ast_log(LOG_NOTICE, "Switching from from d-channel %d to channel %d!\n",

Modified: team/group/pinequeue/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pinequeue/channels/chan_sip.c?view=diff&rev=306254&r1=306253&r2=306254
==============================================================================
--- team/group/pinequeue/channels/chan_sip.c (original)
+++ team/group/pinequeue/channels/chan_sip.c Fri Feb  4 05:14:45 2011
@@ -17136,13 +17136,10 @@
 static void ast_quiet_chan(struct ast_channel *chan) 
 {
 	if (chan && chan->_state == AST_STATE_UP) {
-		if (ast_test_flag(chan, AST_FLAG_MOH)) {
-			ast_log(LOG_ERROR,"about to call ast_moh_stop!\n");
+		if (ast_test_flag(chan, AST_FLAG_MOH))
 			ast_moh_stop(chan);
-		} else if (chan->generatordata) {
-			ast_log(LOG_ERROR,"about to call deactivate_generator!\n");
+		else if (chan->generatordata)
 			ast_deactivate_generator(chan);
-		}
 	}
 }
 

Modified: team/group/pinequeue/main/say.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pinequeue/main/say.c?view=diff&rev=306254&r1=306253&r2=306254
==============================================================================
--- team/group/pinequeue/main/say.c (original)
+++ team/group/pinequeue/main/say.c Fri Feb  4 05:14:45 2011
@@ -419,25 +419,23 @@
 				struct ast_queue_streamfile_name *fn = ast_calloc(1, sizeof(*fn));
 				
 				fn->filename = ast_strdup(file);
+				ast_debug(3, "----> Adding file %s to playlist for %s\n", file, chan->name);
 				
 				/* link the struct into the current ast_queue_streamfile_info struct */
 				AST_LIST_INSERT_TAIL(&aqsi->flist, fn, list);
 			} else {
 				/* if not playing, then start playing this file */
 				if (aqsi->ringing) {
-					ast_log(LOG_ERROR, "Stopping Indicate\n");
 					ast_indicate(aqsi->chan,-1);
 				} else {
-					ast_log(LOG_ERROR, "Stopping MOH\n");
 					ast_moh_stop(aqsi->chan);
 				}
 				
-				ast_log(LOG_ERROR, "Stopping Streaming\n");
 				ast_stopstream(aqsi->chan);
 				
 				ast_autoservice_stop(aqsi->chan);
 				
-				ast_log(LOG_ERROR, "Starting to stream %s\n", file);
+				ast_debug(3, "Starting to stream %s\n", file);
 				res = ast_streamfile(aqsi->chan, file, aqsi->chan->language); /* begin the streaming */
 				
 				while (res && !AST_LIST_EMPTY(&aqsi->flist)) {
@@ -447,7 +445,7 @@
 					
 					fn = AST_LIST_REMOVE_HEAD(&aqsi->flist, list);
 					
-					ast_log(LOG_ERROR,"Start streaming file %s\n", fn->filename);
+					ast_debug(3,"Start streaming file %s\n", fn->filename);
 					res = ast_streamfile(aqsi->chan, fn->filename, aqsi->chan->language);
 				}
 				
@@ -456,10 +454,8 @@
 					/* oops, the current file has problems */
 					/* restore the moh */
 					if (aqsi->ringing) {
-						ast_log(LOG_ERROR, "Starting Indicate\n");
 						ast_indicate(aqsi->chan, AST_CONTROL_RINGING);
 					} else {
-						ast_log(LOG_ERROR, "Starting MOH\n");
 						ast_moh_start(aqsi->chan, aqsi->moh, NULL);
 					}
 					AST_LIST_UNLOCK(&aqsi->flist);