[asterisk-commits] trunk r21508 - /trunk/apps/app_dial.c

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Wed Apr 19 10:15:03 2006
New Revision: 21508

URL: http://svn.digium.com/view/asterisk?rev=21508&view=rev
Log:
extract a common condition.


Modified:
    trunk/apps/app_dial.c

Modified: trunk/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dial.c?rev=21508&r1=21507&r2=21508&view=diff
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Wed Apr 19 10:15:03 2006
@@ -608,21 +608,21 @@
 					if (option_debug)
 						ast_log(LOG_DEBUG, "Dunno what to do with control type %d\n", f->subclass);
 				}
-			} else if (single && (f->frametype == AST_FRAME_VOICE) && 
-						!(ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK))) {
-				if (ast_write(in, f)) 
-					ast_log(LOG_WARNING, "Unable to forward voice frame\n");
-			} else if (single && (f->frametype == AST_FRAME_IMAGE) && 
-						!(ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK))) {
-				if (ast_write(in, f))
-					ast_log(LOG_WARNING, "Unable to forward image\n");
-			} else if (single && (f->frametype == AST_FRAME_TEXT) && 
-						!(ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK))) {
-				if (ast_write(in, f))
-					ast_log(LOG_WARNING, "Unable to send text\n");
-			} else if (single && (f->frametype == AST_FRAME_HTML) && !ast_test_flag(outgoing, DIAL_NOFORWARDHTML)) {
-				if(ast_channel_sendhtml(in, f->subclass, f->data, f->datalen) == -1)
-					ast_log(LOG_WARNING, "Unable to send URL\n");
+			} else if (single) {
+				/* XXX are we sure the logic is correct ? or we should just switch on f->frametype ? */
+				if (f->frametype == AST_FRAME_VOICE && !ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK)) {
+					if (ast_write(in, f)) 
+						ast_log(LOG_WARNING, "Unable to forward voice frame\n");
+				} else if (f->frametype == AST_FRAME_IMAGE && !ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK)) {
+					if (ast_write(in, f))
+						ast_log(LOG_WARNING, "Unable to forward image\n");
+				} else if (f->frametype == AST_FRAME_TEXT && !ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK)) {
+					if (ast_write(in, f))
+						ast_log(LOG_WARNING, "Unable to send text\n");
+				} else if (f->frametype == AST_FRAME_HTML && !ast_test_flag(outgoing, DIAL_NOFORWARDHTML)) {
+					if (ast_channel_sendhtml(in, f->subclass, f->data, f->datalen) == -1)
+						ast_log(LOG_WARNING, "Unable to send URL\n");
+				}
 			}
 			ast_frfree(f);
 		} /* end for */