[Asterisk-cvs] asterisk/channels/h323 ast_h323.cpp, 1.59, 1.59.2.1 chan_h323.h, 1.27.2.1, 1.27.2.2

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels/h323
In directory mongoose.digium.com:/tmp/cvs-serv10927/channels/h323

Modified Files:
      Tag: v1-0
	ast_h323.cpp chan_h323.h 
Log Message:
fix compilation of chan_h323 (bug 2786,2790,2669)


Index: ast_h323.cpp
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/ast_h323.cpp,v
retrieving revision 1.59
retrieving revision 1.59.2.1
diff -u -d -r1.59 -r1.59.2.1
--- ast_h323.cpp	21 Sep 2004 18:42:37 -0000	1.59
+++ ast_h323.cpp	4 Nov 2004 23:14:26 -0000	1.59.2.1
@@ -722,7 +722,7 @@
 	if (h323debug) {
 		cout << "	-- Sending user input tone (" << tone << ") to remote" << endl;
 	}
-	on_send_digit(GetCallReference(), tone);	
+	on_send_digit(GetCallReference(), tone, (const char *)GetCallToken());	
 	H323Connection::SendUserInputTone(tone, duration);
 }
 
@@ -732,7 +732,7 @@
 		if (h323debug) {
 			cout << "	-- Received user input tone (" << tone << ") from remote" << endl;
 		}
-		on_send_digit(GetCallReference(), tone);
+		on_send_digit(GetCallReference(), tone, (const char *)GetCallToken());	
 	}
 	H323Connection::OnUserInputTone(tone, duration, logicalChannel, rtpTimestamp);
 }
@@ -743,7 +743,7 @@
 		if (h323debug) {
 			cout <<  "	-- Received user input string (" << value << ") from remote." << endl;
 		}
-		on_send_digit(GetCallReference(), value[0]);
+		on_send_digit(GetCallReference(), value[0], (const char *)GetCallToken());
 	}	
 }
 

Index: chan_h323.h
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/chan_h323.h,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -d -r1.27.2.1 -r1.27.2.2
--- chan_h323.h	14 Oct 2004 23:45:09 -0000	1.27.2.1
+++ chan_h323.h	4 Nov 2004 23:14:26 -0000	1.27.2.2
@@ -114,7 +114,7 @@
 
 /* This is a callback prototype function, called pass
    DTMF down the RTP. */
-typedef int (*send_digit_cb)(unsigned, const char *);
+typedef int (*send_digit_cb)(unsigned, char, const char *);
 extern send_digit_cb	on_send_digit; 
 
 /* This is a callback prototype function, called to collect