[asterisk-commits] branch oej/test-this-branch r18634 - in /team/oej/test-this-branch: ./ apps/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Sun Apr  9 14:23:49 2006
New Revision: 18634

URL: http://svn.digium.com/view/asterisk?rev=18634&view=rev
Log:
Reset, resolve, go

Modified:
    team/oej/test-this-branch/   (props changed)
    team/oej/test-this-branch/apps/app_voicemail.c
    team/oej/test-this-branch/translate.c

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Apr  9 14:23:49 2006
@@ -1,1 +1,1 @@
-/trunk:1-18527
+/trunk:1-18604

Modified: team/oej/test-this-branch/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/apps/app_voicemail.c?rev=18634&r1=18633&r2=18634&view=diff
==============================================================================
--- team/oej/test-this-branch/apps/app_voicemail.c (original)
+++ team/oej/test-this-branch/apps/app_voicemail.c Sun Apr  9 14:23:49 2006
@@ -1700,9 +1700,8 @@
 		ast_log(LOG_DEBUG, "Attaching file '%s', format '%s', uservm is '%d', global is %d\n", attach, format, attach_user_voicemail, ast_test_flag((&globalflags), VM_ATTACH));
 	/* Make a temporary file instead of piping directly to sendmail, in case the mail
 	   command hangs */
-	p = vm_mkftemp(tmp);
-	if (p == NULL) {
-		ast_log(LOG_WARNING, "Unable to launch '%s'\n", mailcmd);
+	if ((p = vm_mkftemp(tmp)) == NULL) {
+		ast_log(LOG_WARNING, "Unable to launch '%s' (can't create temporary file)\n", mailcmd);
 		return -1;
 	} else {
 		gethostname(host, sizeof(host)-1);
@@ -1821,10 +1820,10 @@
 	char tmp[AST_MAX_FILENAME_LEN] = "/tmp/astmail-XXXXXX";
 	char mailcommand[AST_MAX_SHELL_COMMAND];
 	struct tm tm;
-	FILE *p = vm_mkftemp(tmp);
-
-	if (p == NULL) {
-		ast_log(LOG_WARNING, "Unable to launch '%s'\n", mailcmd);
+	FILE *p;
+
+	if ((p = vm_mkftemp(tmp)) == NULL) {
+		ast_log(LOG_WARNING, "Unable to launch '%s' (can't create temporary file)\n", mailcmd);
 		return -1;
 	} else {
 		gethostname(host, sizeof(host)-1);

Modified: team/oej/test-this-branch/translate.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/translate.c?rev=18634&r1=18633&r2=18634&view=diff
==============================================================================
--- team/oej/test-this-branch/translate.c (original)
+++ team/oej/test-this-branch/translate.c Sun Apr  9 14:23:49 2006
@@ -294,6 +294,7 @@
 	seqno = f->seqno;
 #endif /* AST_JB */
 
+
 	/* XXX hmmm... check this below */
 	if (!ast_tvzero(f->delivery)) {
 		if (!ast_tvzero(path->nextin)) {
@@ -333,6 +334,10 @@
 
 		/* Use next predicted outgoing timestamp */
 		out->delivery = path->nextout;
+		
+		path->nextout = ast_tvadd(path->nextout, ast_samp2tv( out->samples, 8000));
+	} else {
+		out->delivery = ast_tv(0, 0);
 #ifdef AST_JB
 		out->has_timing_info = has_timing_info;
 		if(has_timing_info) {
@@ -341,13 +346,8 @@
 			out->seqno = seqno;
 		}
 #endif /* AST_JB */
-		
-		/* Predict next outgoing timestamp from samples in this
-		   frame. */
-		path->nextout = ast_tvadd(path->nextout, ast_samp2tv( out->samples, 8000));
-	} else {
-		out->delivery = ast_tv(0, 0);
-	}
+	}
+
 	/* Invalidate prediction if we're entering a silence period */
 	if (out->frametype == AST_FRAME_CNG)
 		path->nextout = ast_tv(0, 0);