[svn-commits] mmichelson: branch group/CCSS r227649 - in /team/group/CCSS: apps/ main/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Nov  4 10:55:23 2009
New Revision: 227649

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=227649
Log:
Fix compilation problems due to codec bit expansion.


Modified:
    team/group/CCSS/apps/app_dial.c
    team/group/CCSS/main/channel.c

Modified: team/group/CCSS/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/apps/app_dial.c?view=diff&rev=227649&r1=227648&r2=227649
==============================================================================
--- team/group/CCSS/apps/app_dial.c (original)
+++ team/group/CCSS/apps/app_dial.c Wed Nov  4 10:55:23 2009
@@ -1004,7 +1004,7 @@
 			if (!ast_strlen_zero(c->call_forward)) {
 				pa->sentringing = 0;
 				if (!ignore_cc && (f = ast_read(c))) {
-					if (f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_CC) {
+					if (f->frametype == AST_FRAME_CONTROL && f->subclass.integer == AST_CONTROL_CC) {
 						/* This channel is forwarding the call, and is capable of CC, so
 						 * be sure to add the new device interface to the list
 						 */

Modified: team/group/CCSS/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/channel.c?view=diff&rev=227649&r1=227648&r2=227649
==============================================================================
--- team/group/CCSS/main/channel.c (original)
+++ team/group/CCSS/main/channel.c Wed Nov  4 10:55:23 2009
@@ -7474,7 +7474,7 @@
 
 int ast_queue_cc_frame(struct ast_channel *chan, const char *monitor_type, enum ast_cc_service_type service)
 {
-	struct ast_frame frame = {.frametype = AST_FRAME_CONTROL, .subclass = AST_CONTROL_CC };
+	struct ast_frame frame = {.frametype = AST_FRAME_CONTROL, .subclass.integer = AST_CONTROL_CC };
 	struct ast_control_cc_payload *payload;
 	char chan_name[AST_CHANNEL_NAME];