[svn-commits] branch group/t38passthrough r31688 - in /team/group/t38passthrough: ./ build_...

[svn-commits at lists.digium.com]

Author: mogorman
Date: Fri Jun  2 13:39:22 2006
New Revision: 31688

URL: http://svn.digium.com/view/asterisk?rev=31688&view=rev
Log:
automerge

Modified:
    team/group/t38passthrough/   (props changed)
    team/group/t38passthrough/CREDITS
    team/group/t38passthrough/build_tools/menuselect_curses.c
    team/group/t38passthrough/res/res_musiconhold.c

Propchange: team/group/t38passthrough/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/group/t38passthrough/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun  2 13:39:22 2006
@@ -1,1 +1,1 @@
-/trunk:1-31551
+/trunk:1-31687

Modified: team/group/t38passthrough/CREDITS
URL: http://svn.digium.com/view/asterisk/team/group/t38passthrough/CREDITS?rev=31688&r1=31687&r2=31688&view=diff
==============================================================================
--- team/group/t38passthrough/CREDITS (original)
+++ team/group/t38passthrough/CREDITS Fri Jun  2 13:39:22 2006
@@ -117,6 +117,10 @@
 Roy Sigurd Karlsbakk - providing funding for generic jitterbuffer development
 	roy at karlsbakk.net, Briiz Telecom AS
 
+Voop A/S, Nuvio Inc and Foniris Telecom A/S - funding for rewrite of SIP transfers
+
+Philippe Sultan - RADIUS CDR module
+	INRIA, http://www.inria.fr/
 
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt

Modified: team/group/t38passthrough/build_tools/menuselect_curses.c
URL: http://svn.digium.com/view/asterisk/team/group/t38passthrough/build_tools/menuselect_curses.c?rev=31688&r1=31687&r2=31688&view=diff
==============================================================================
--- team/group/t38passthrough/build_tools/menuselect_curses.c (original)
+++ team/group/t38passthrough/build_tools/menuselect_curses.c Fri Jun  2 13:39:22 2006
@@ -160,7 +160,7 @@
 	}
 	if (!AST_LIST_EMPTY(&curmem->deps)) {
 		wmove(menu, end - start + 3, max_x / 2 - 16);
-		snprintf(buf, sizeof(buf), "Depends on: ");
+		strcpy(buf, "Depends on: ");
 		AST_LIST_TRAVERSE(&curmem->deps, dep, list) {
 			strncat(buf, dep->name, sizeof(buf) - strlen(buf) - 1);
 			if (AST_LIST_NEXT(dep, list))
@@ -170,7 +170,7 @@
 	}
 	if (!AST_LIST_EMPTY(&curmem->conflicts)) {
 		wmove(menu, end - start + 4, max_x / 2 - 16);
-		snprintf(buf, sizeof(buf), "Conflicts with: ");
+		strcpy(buf, "Conflicts with: ");
 		AST_LIST_TRAVERSE(&curmem->conflicts, con, list) {
 			strncat(buf, con->name, sizeof(buf) - strlen(buf) - 1);
 			if (AST_LIST_NEXT(con, list))

Modified: team/group/t38passthrough/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/team/group/t38passthrough/res/res_musiconhold.c?rev=31688&r1=31687&r2=31688&view=diff
==============================================================================
--- team/group/t38passthrough/res/res_musiconhold.c (original)
+++ team/group/t38passthrough/res/res_musiconhold.c Fri Jun  2 13:39:22 2006
@@ -133,6 +133,7 @@
 	char dir[256];
 	char args[256];
 	char mode[80];
+	/* XXX This means that we are allocating 64KB of memory for every musiconhold class XXX */
 	char filearray[MAX_MOHFILES][MAX_MOHFILE_LEN];
 	unsigned int flags;
 	int total_files;
@@ -226,10 +227,6 @@
 
 	state->pos = state->pos % state->class->total_files;
 	
-	if (ast_set_write_format(chan, AST_FORMAT_SLINEAR)) {
-		ast_log(LOG_WARNING, "Unable to set '%s' to linear format (write)\n", chan->name);
-		return -1;
-	}
 	if (!ast_openstream_full(chan, state->class->filearray[state->pos], chan->language, 1)) {
 		ast_log(LOG_WARNING, "Unable to open file '%s': %s\n", state->class->filearray[state->pos], strerror(errno));
 		state->pos++;
@@ -303,14 +300,8 @@
 
 		state->origwfmt = chan->writeformat;
 
-		if (ast_set_write_format(chan, AST_FORMAT_SLINEAR)) {
-			ast_log(LOG_WARNING, "Unable to set '%s' to linear format (write)\n", chan->name);
-			free(chan->music_state);
-			chan->music_state = NULL;
-		} else {
-			if (option_verbose > 2)
-				ast_verbose(VERBOSE_PREFIX_3 "Started music on hold, class '%s', on %s\n", class->name, chan->name);
-		}
+		if (option_verbose > 2)
+			ast_verbose(VERBOSE_PREFIX_3 "Started music on hold, class '%s', on %s\n", class->name, chan->name);
 	}
 	
 	return chan->music_state;