[svn-commits] murf: branch murf/bug_7731_trunk r39863 - in /team/murf/bug_7731_trunk: ./ ch...

[svn-commits at lists.digium.com]

Author: murf
Date: Tue Aug 15 13:59:35 2006
New Revision: 39863

URL: http://svn.digium.com/view/asterisk?rev=39863&view=rev
Log:
folded in changes


Modified:
    team/murf/bug_7731_trunk/   (props changed)
    team/murf/bug_7731_trunk/channels/chan_h323.c

Propchange: team/murf/bug_7731_trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 15 13:59:35 2006
@@ -1,1 +1,1 @@
-/trunk:1-39808
+/trunk:1-39862

Modified: team/murf/bug_7731_trunk/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7731_trunk/channels/chan_h323.c?rev=39863&r1=39862&r2=39863&view=diff
==============================================================================
--- team/murf/bug_7731_trunk/channels/chan_h323.c (original)
+++ team/murf/bug_7731_trunk/channels/chan_h323.c Tue Aug 15 13:59:35 2006
@@ -278,10 +278,13 @@
 		pvt->newcontrol = -1;
 	}
 	if (pvt->newdigit >= 0) {
-		struct ast_frame f = {AST_FRAME_DTMF, pvt->newdigit, };
-
-		f.samples = 800;
-		f.src = "UPDATE_INFO";
+		struct ast_frame f = {
+			.frametype = AST_FRAME_DTMF,
+			.subclass = pvt->newdigit,
+			.samples = 800,
+			.src = "UPDATE_INFO",
+		};
+
 		ast_queue_frame(c, &f);
 		pvt->newdigit = -1;
 	}
@@ -1158,9 +1161,13 @@
 		return -1;
 	}
 	if (pvt->owner && !ast_mutex_trylock(&pvt->owner->lock)) {
-		struct ast_frame f = {AST_FRAME_DTMF, digit, };
-		f.samples = 800;
-		f.src = "SEND_DIGIT";
+		struct ast_frame f = {
+			.frametype = AST_FRAME_DTMF,
+			.subclass = digit,
+			.samples = 800,
+			.src = "SEND_DIGIT",
+		};
+
 		res = ast_queue_frame(pvt->owner, &f);
 		ast_mutex_unlock(&pvt->owner->lock);
 	} else {