[asterisk-commits] irroot: branch irroot/distrotech-customers-10 r335508 - in /team/irroot/distr...

[SVN commits to the Asterisk project]

Author: irroot
Date: Tue Sep 13 02:20:29 2011
New Revision: 335508

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335508
Log:
Fix properties, Enable automerge, Merge with parent branch

Modified:
    team/irroot/distrotech-customers-10/   (props changed)
    team/irroot/distrotech-customers-10/apps/app_dial.c
    team/irroot/distrotech-customers-10/main/channel.c

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
--- branch-1.8-blocked (original)
+++ branch-1.8-blocked Tue Sep 13 02:20:29 2011
@@ -1,1 +1,1 @@
-/branches/1.8:299531,313436,317858,317861,321335,321753,322585,323730,328446,329782,330491,330510
+/branches/1.8:299531,313436,317858,317861,321335,321753,322585,323730,328446,329782,330491,330510,335431

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/irroot/distrotech-customers-10/
            ('svn:mergeinfo' removed)

Modified: team/irroot/distrotech-customers-10/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/apps/app_dial.c?view=diff&rev=335508&r1=335507&r2=335508
==============================================================================
--- team/irroot/distrotech-customers-10/apps/app_dial.c (original)
+++ team/irroot/distrotech-customers-10/apps/app_dial.c Tue Sep 13 02:20:29 2011
@@ -1351,7 +1351,7 @@
 				case AST_FRAME_VOICE:
 				case AST_FRAME_IMAGE:
 				case AST_FRAME_TEXT:
-					if (ast_write(in, f)) {
+					if (!ast_test_flag64(outgoing, OPT_RINGBACK | OPT_MUSICBACK) && ast_write(in, f)) {
 						ast_log(LOG_WARNING, "Unable to write frametype: %d\n",
 							f->frametype);
 					}

Modified: team/irroot/distrotech-customers-10/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/main/channel.c?view=diff&rev=335508&r1=335507&r2=335508
==============================================================================
--- team/irroot/distrotech-customers-10/main/channel.c (original)
+++ team/irroot/distrotech-customers-10/main/channel.c Tue Sep 13 02:20:29 2011
@@ -7461,6 +7461,9 @@
 		return -1;
 	}
 
+	caller_warning = ast_test_flag(&config->features_caller, AST_FEATURE_PLAY_WARNING);
+	callee_warning = ast_test_flag(&config->features_callee, AST_FEATURE_PLAY_WARNING);
+
 	if (ast_tvzero(config->start_time)) {
 		config->start_time = ast_tvnow();
 		if (config->start_sound) {
@@ -7483,8 +7486,6 @@
 		config->nexteventts = ast_tvadd(config->feature_start_time, ast_samp2tv(config->feature_timer, 1000));
 	} else if (config->timelimit) {
 		time_left_ms = config->timelimit - ast_tvdiff_ms(ast_tvnow(), config->start_time);
-		caller_warning = ast_test_flag(&config->features_caller, AST_FEATURE_PLAY_WARNING);
-		callee_warning = ast_test_flag(&config->features_callee, AST_FEATURE_PLAY_WARNING);
 		config->nexteventts = ast_tvadd(config->start_time, ast_samp2tv(config->timelimit, 1000));
 		if ((caller_warning || callee_warning) && config->play_warning) {
 			long next_warn = config->play_warning;