[svn-commits] jpeeler: branch jpeeler/bug13173 r151323 - /team/jpeeler/bug13173/apps/

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Oct 20 17:50:32 2008
New Revision: 151323

URL: http://svn.digium.com/view/asterisk?view=rev&rev=151323
Log:
Remove debug messages and unnecessary locking. In reference to my previous commit message, the conference part sound needs to played immediately upon hangup in my opinion. Therefore creating another thread and queueing the part sounds would not be ideal.

Modified:
    team/jpeeler/bug13173/apps/app_meetme.c

Modified: team/jpeeler/bug13173/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/bug13173/apps/app_meetme.c?view=diff&rev=151323&r1=151322&r2=151323
==============================================================================
--- team/jpeeler/bug13173/apps/app_meetme.c (original)
+++ team/jpeeler/bug13173/apps/app_meetme.c Mon Oct 20 17:50:32 2008
@@ -1272,9 +1272,8 @@
 	if (conf->announcethread != AST_PTHREADT_NULL) {
 		pthread_cancel(conf->announcethread);
 		pthread_join(conf->announcethread, NULL);
-		ast_clear_flag(conf->chan, AST_FLAG_BLOCKING);
+		ast_clear_flag(conf->chan, AST_FLAG_BLOCKING); /* jpeeler: this doesn't seem ideal */
 		while ((item = AST_LIST_REMOVE_HEAD(&conf->announcelist, list))) {
-	ast_log(LOG_NOTICE, "jpeeler: freeing item path=%s\n", item->namerecloc);
 			free(item);
 		}
 	}
@@ -1421,7 +1420,6 @@
 			pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); 
 			next = AST_LIST_NEXT(current, list);
 			AST_LIST_REMOVE_HEAD(&conf->announcelist, list);
-ast_log(LOG_NOTICE, "jpeeler: freeing item path=%s\n", current->namerecloc);
 			free(current);
 			pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
 		}
@@ -2329,7 +2327,6 @@
 
 	reset_volumes(user);
 
-	AST_LIST_LOCK(&confs);
 	if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN))
 		conf_play(chan, conf, LEAVE);
 
@@ -2339,13 +2336,11 @@
 		ast_copy_string(item->language, chan->language, sizeof(item->language));
 		item->confchan = conf->chan;
 		item->confusers = conf->users;
-ast_log(LOG_NOTICE, "jpeeler: adding item with path=%s\n", item->namerecloc);
 		AST_LIST_LOCK(&conf->announcelist);
 		AST_LIST_INSERT_TAIL(&conf->announcelist, item, list);
 		ast_cond_signal(&conf->announcelist_addition);
 		AST_LIST_UNLOCK(&conf->announcelist);
 	}
-	AST_LIST_UNLOCK(&confs);
 
  outrun:
 	AST_LIST_LOCK(&confs);