[svn-commits] russell: branch group/newcdr r196552 - in /team/group/newcdr: channels/ main/...

[SVN commits to the Digium repositories]

Author: russell
Date: Sat May 23 11:21:53 2009
New Revision: 196552

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=196552
Log:
Make this branch compile.

Modified:
    team/group/newcdr/channels/chan_dahdi.c
    team/group/newcdr/channels/chan_misdn.c
    team/group/newcdr/main/pbx.c
    team/group/newcdr/res/ais/evt.c

Modified: team/group/newcdr/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/channels/chan_dahdi.c?view=diff&rev=196552&r1=196551&r2=196552
==============================================================================
--- team/group/newcdr/channels/chan_dahdi.c (original)
+++ team/group/newcdr/channels/chan_dahdi.c Sat May 23 11:21:53 2009
@@ -1794,7 +1794,7 @@
 	}
 	if (!p->mfcr2_accept_on_offer) {
 		/* The user wants us to start the PBX thread right away without accepting the call first */
-		c = dahdi_new(p, AST_STATE_RING, 1, SUB_REAL, DAHDI_LAW_ALAW, 0);
+		c = dahdi_new(p, AST_STATE_RING, 1, SUB_REAL, DAHDI_LAW_ALAW, 0, NULL);
 		if (c) {
 			dahdi_r2_update_monitor_count(p->mfcr2, 0);
 			/* Done here, don't disable reading now since we still need to generate MF tones to accept
@@ -1845,7 +1845,7 @@
 			}
 			return;
 		}
-		c = dahdi_new(p, AST_STATE_RING, 1, SUB_REAL, DAHDI_LAW_ALAW, 0);
+		c = dahdi_new(p, AST_STATE_RING, 1, SUB_REAL, DAHDI_LAW_ALAW, 0, NULL);
 		if (c) {
 			dahdi_r2_update_monitor_count(p->mfcr2, 0);
 			/* chan_dahdi will take care of reading from now on in the PBX thread, tell the

Modified: team/group/newcdr/channels/chan_misdn.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/channels/chan_misdn.c?view=diff&rev=196552&r1=196551&r2=196552
==============================================================================
--- team/group/newcdr/channels/chan_misdn.c (original)
+++ team/group/newcdr/channels/chan_misdn.c Sat May 23 11:21:53 2009
@@ -8441,7 +8441,7 @@
 	/* Create a channel to notify with */
 	snprintf(id_str, sizeof(id_str), "%ld", record_id);
 	chan = ast_channel_alloc(0, AST_STATE_DOWN, id_str, NULL, NULL,
-		notify->exten, notify->context, 0,
+		notify->exten, notify->context, NULL, 0,
 		"mISDN-CC/%ld-%X", record_id, (unsigned) ++sequence);
 	if (!chan) {
 		ast_log(LOG_ERROR, "Unable to allocate channel!\n");

Modified: team/group/newcdr/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/main/pbx.c?view=diff&rev=196552&r1=196551&r2=196552
==============================================================================
--- team/group/newcdr/main/pbx.c (original)
+++ team/group/newcdr/main/pbx.c Sat May 23 11:21:53 2009
@@ -7909,7 +7909,7 @@
 
 	/* If we are adding a hint evalulate in variables and global variables */
 	if (priority == PRIORITY_HINT && strstr(application, "${") && !strstr(extension, "_")) {
-		struct ast_channel *c = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", extension, con->name, 0, "Bogus/%s", __PRETTY_FUNCTION__);
+		struct ast_channel *c = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", extension, con->name, NULL, 0, "Bogus/%s", __PRETTY_FUNCTION__);
 		pbx_substitute_variables_helper(c, application, expand_buf, sizeof(expand_buf));
 		application = expand_buf;
 		ast_channel_release(c);

Modified: team/group/newcdr/res/ais/evt.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/res/ais/evt.c?view=diff&rev=196552&r1=196551&r2=196552
==============================================================================
--- team/group/newcdr/res/ais/evt.c (original)
+++ team/group/newcdr/res/ais/evt.c Sat May 23 11:21:53 2009
@@ -325,7 +325,7 @@
 
 	publish_event->type = type;
 	ast_log(LOG_DEBUG, "Subscribing to event type %d\n", type);
-	publish_event->sub = ast_event_subscribe(type, ast_event_cb, event_channel,
+	publish_event->sub = ast_event_subscribe(type, ast_event_cb, "AIS", event_channel,
 		AST_EVENT_IE_END);
 	ast_event_dump_cache(publish_event->sub);