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

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Jun 18 17:43:48 2009
New Revision: 201825

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201825
Log:
didn't mean to commit this

Modified:
    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/sig_analog.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c?view=diff&rev=201825&r1=201824&r2=201825
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.c Thu Jun 18 17:43:48 2009
@@ -1032,10 +1032,10 @@
 
 	if (!p->subs[ANALOG_SUB_REAL].owner && !p->subs[ANALOG_SUB_CALLWAIT].owner && !p->subs[ANALOG_SUB_THREEWAY].owner) {
 		p->owner = NULL;
-#if 1
+#if 0
 		p->ringt = 0;
 #endif
-#if 1 /* disabled? Since we set it in _call */
+#if 0 /* Since we set it in _call */
 		p->cidrings = 1;
 #endif
 		p->outgoing = 0;
@@ -1105,7 +1105,7 @@
 	case ANALOG_SIG_FXSLS:
 	case ANALOG_SIG_FXSGS:
 	case ANALOG_SIG_FXSKS:
-#if 1
+#if 0
 		p->ringt = 0;
 #endif
 		/* Fall through */
@@ -1784,7 +1784,7 @@
 				memset(exten, 0, sizeof(exten));
 				timeout = analog_firstdigittimeout;
 			} else if (!strcmp(exten, "*0")) {
-#if 0 /*jpeeler */
+#ifdef XXX
 				struct ast_channel *nbridge = p->subs[ANALOG_SUB_THREEWAY].owner;
 				struct dahdi_pvt *pbridge = NULL;
 				  /* set up the private struct of the bridged one, if any */
@@ -2154,7 +2154,7 @@
 
 		ast_setstate(chan, AST_STATE_RING);
 		chan->rings = 1;
-#if 1
+#if 0
 		p->ringt = p->ringt_base;
 #endif
 		res = ast_pbx_run(chan);
@@ -2469,7 +2469,7 @@
 		case ANALOG_SIG_FXSLS:
 		case ANALOG_SIG_FXSGS:
 		case ANALOG_SIG_FXSKS:
-#if 1
+#if 0
 			if (ast->_state == AST_STATE_RING) {
 				p->ringt = p->ringt_base;
 			}
@@ -2515,7 +2515,7 @@
 		case ANALOG_SIG_FXSLS:
 		case ANALOG_SIG_FXSGS:
 		case ANALOG_SIG_FXSKS:
-#if 1
+#if 0
 			if (ast->_state == AST_STATE_RING) {
 				p->ringt = p->ringt_base;
 			}
@@ -3032,7 +3032,7 @@
 		case ANALOG_SIG_FXSLS:
 		case ANALOG_SIG_FXSGS:
 		case ANALOG_SIG_FXSKS:
-#if 1
+#if 0
 				i->ringt = i->ringt_base;
 #endif
 				/* Fall through */

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=201825&r1=201824&r2=201825
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.h (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/sig_analog.h Thu Jun 18 17:43:48 2009
@@ -282,7 +282,7 @@
 
 	int callwaitcas;
 
-#if 1
+#if 0
 	int ringt;
 	int ringt_base;
 #endif