[svn-commits] jpeeler: branch jpeeler/asterisk-sigwork-trunk r205664 - /team/jpeeler/asteri...

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Thu Jul  9 14:26:48 2009
New Revision: 205664

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=205664
Log:
remote unneeded param to distinctive_ring

Modified:
    team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c
    team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c
    team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.h

Modified: team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c?view=diff&rev=205664&r1=205663&r2=205664
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c Thu Jul  9 14:26:48 2009
@@ -1628,7 +1628,7 @@
 static const char *event2str(int event);
 static int restore_gains(struct dahdi_pvt *p);
 
-static int my_distinctive_ring(struct ast_channel *chan, void *pvt, int idx, int checkaftercid, int *ringdata)
+static int my_distinctive_ring(struct ast_channel *chan, void *pvt, int idx, int *ringdata)
 {
 	unsigned char buf[256];
 	int distMatches;
@@ -1638,12 +1638,16 @@
 	int counter;
 	int i;
 	int res;
+	int checkaftercid = 0;
 
 	struct dahdi_pvt *p = pvt;
 	struct analog_pvt *analog_p = p->sig_pvt;
 
-	if (ringdata == NULL)
+	if (ringdata == NULL) {
 		ringdata = curRingData;
+	} else {
+		checkaftercid = 1;
+	}
 
 	/* We must have a ring by now, so, if configured, lets try to listen for
 	 * distinctive ringing */

Modified: team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c?view=diff&rev=205664&r1=205663&r2=205664
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c Thu Jul  9 14:26:48 2009
@@ -1255,10 +1255,10 @@
 		return -1;
 }
 
-static int analog_distinctive_ring(struct ast_channel *chan, struct analog_pvt *p, int idx, int checkaftercid, int *ringdata)
+static int analog_distinctive_ring(struct ast_channel *chan, struct analog_pvt *p, int idx, int *ringdata)
 {
 	if (p->calls->distinctive_ring) {
-		return p->calls->distinctive_ring(chan, p->chan_pvt, idx, checkaftercid, ringdata);
+		return p->calls->distinctive_ring(chan, p->chan_pvt, idx, ringdata);
 	} else
 		return -1;
 
@@ -1966,7 +1966,7 @@
 							break; /* Got ring */
 					}
 
-					if (analog_distinctive_ring(chan, p, index, 0, NULL))
+					if (analog_distinctive_ring(chan, p, index, NULL))
 						goto quit;
 	
 					if (res < 0) {
@@ -2036,7 +2036,7 @@
 
 				analog_stop_cid_detect(p);
 
-				if (analog_distinctive_ring(chan, p, index, 1, curRingData))
+				if (analog_distinctive_ring(chan, p, index, curRingData))
 					goto quit;
 
 				if (res < 0) {

Modified: team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.h
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.h?view=diff&rev=205664&r1=205663&r2=205664
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.h (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.h Thu Jul  9 14:26:48 2009
@@ -186,7 +186,7 @@
 	void (* const increase_ss_count)(void);
 	void (* const decrease_ss_count)(void);
 
-	int (* const distinctive_ring)(struct ast_channel *chan, void *pvt, int idx, int checkaftercid, int *ringdata);
+	int (* const distinctive_ring)(struct ast_channel *chan, void *pvt, int idx, int *ringdata);
 };