[svn-commits] jdixon: branch jdixon/chan_usbradio-1.4 r140019 - /team/jdixon/chan_usbradio-...

[SVN commits to the Digium repositories]

Author: jdixon
Date: Tue Aug 26 02:22:25 2008
New Revision: 140019

URL: http://svn.digium.com/view/asterisk?view=rev&rev=140019
Log:
Un-did a couple of "fixes" from the last release where I went
a little overboard with them

Modified:
    team/jdixon/chan_usbradio-1.4/apps/app_rpt.c

Modified: team/jdixon/chan_usbradio-1.4/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/apps/app_rpt.c?view=diff&rev=140019&r1=140018&r2=140019
==============================================================================
--- team/jdixon/chan_usbradio-1.4/apps/app_rpt.c (original)
+++ team/jdixon/chan_usbradio-1.4/apps/app_rpt.c Tue Aug 26 02:22:25 2008
@@ -21,7 +21,7 @@
 /*! \file
  *
  * \brief Radio Repeater / Remote Base program 
- *  version 0.132 8/26/08 2055 EDT
+ *  version 0.133 8/26/08 2055 EDT
  * 
  * \author Jim Dixon, WB6NIL <jim at lambdatel.com>
  *
@@ -11910,14 +11910,10 @@
 					l->retxtimer = 0;
 					if (l->chan && l->phonemode == 0) 
 					{
-						if (strncasecmp(myrpt->txchannel->name,
-							"Zap/Pseudo",10))
-						{
-						    if (l->lasttx)
+						if (l->lasttx)
 							ast_indicate(l->chan,AST_CONTROL_RADIO_KEY);
-						    else
+						else
 							ast_indicate(l->chan,AST_CONTROL_RADIO_UNKEY);
-						}
 					}
 				}
 				if ((l->rerxtimer += elap) >= (REDUNDANT_TX_TIME * 5))
@@ -12585,18 +12581,13 @@
 					myrpt->exttx) || remrx) && l->mode;
 				if (l->phonemode == 0 && l->chan && (l->lasttx != totx))
 				{
-					if (strncasecmp(myrpt->txchannel->name,
-							"Zap/Pseudo",10))
+					if (totx)
 					{
-					    if (totx)
-					    {
 						ast_indicate(l->chan,AST_CONTROL_RADIO_KEY);
-					    }
-					    else
-					    {
+					}
+					else
+					{
 						ast_indicate(l->chan,AST_CONTROL_RADIO_UNKEY);
-					    }
-
 					}
 					if (myrpt->p.archivedir)
 					{